diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-02-19 03:55:50 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-02-19 03:55:50 +0000 |
| commit | acacc89db0657abd2031963dc1548e521681f01f (patch) | |
| tree | f0d483b7a1d9357ce750a6a1f36d99ba4ae6a525 /lib/mesa | |
| parent | 37316c70b9a0a8917d9b60f009126222622a91fa (diff) | |
Import Mesa 18.3.4
Diffstat (limited to 'lib/mesa')
| -rw-r--r-- | lib/mesa/src/gallium/drivers/v3d/v3d_resource.c | 2 | ||||
| -rw-r--r-- | lib/mesa/src/gallium/include/state_tracker/drisw_api.h | 2 | ||||
| -rw-r--r-- | lib/mesa/src/gallium/targets/vdpau/meson.build | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/lib/mesa/src/gallium/drivers/v3d/v3d_resource.c b/lib/mesa/src/gallium/drivers/v3d/v3d_resource.c index dd0db8cfd..d13fc6471 100644 --- a/lib/mesa/src/gallium/drivers/v3d/v3d_resource.c +++ b/lib/mesa/src/gallium/drivers/v3d/v3d_resource.c @@ -669,7 +669,7 @@ v3d_resource_create_with_modifiers(struct pipe_screen *pscreen, rsc->tiled = false; } else { fprintf(stderr, "Unsupported modifier requested\n"); - return NULL; + goto fail; } rsc->internal_format = prsc->format; diff --git a/lib/mesa/src/gallium/include/state_tracker/drisw_api.h b/lib/mesa/src/gallium/include/state_tracker/drisw_api.h index e365ab81f..4b5d36c17 100644 --- a/lib/mesa/src/gallium/include/state_tracker/drisw_api.h +++ b/lib/mesa/src/gallium/include/state_tracker/drisw_api.h @@ -20,7 +20,7 @@ struct drisw_loader_funcs void (*put_image2) (struct dri_drawable *dri_drawable, void *data, int x, int y, unsigned width, unsigned height, unsigned stride); void (*put_image_shm) (struct dri_drawable *dri_drawable, - int shmid, char *shmaddr, unsigned offset, + int shmid, char *shmaddr, unsigned offset, unsigned offset_x, int x, int y, unsigned width, unsigned height, unsigned stride); }; diff --git a/lib/mesa/src/gallium/targets/vdpau/meson.build b/lib/mesa/src/gallium/targets/vdpau/meson.build index 005cf6424..22e3f5ffd 100644 --- a/lib/mesa/src/gallium/targets/vdpau/meson.build +++ b/lib/mesa/src/gallium/targets/vdpau/meson.build @@ -54,13 +54,14 @@ libvdpau_gallium = shared_library( dep_thread, driver_r300, driver_r600, driver_radeonsi, driver_nouveau, ], link_depends : vdpau_link_depends, + soversion : '@0@.@1@.0'.format(VDPAU_MAJOR, VDPAU_MINOR), ) foreach d : [[with_gallium_r300, 'r300'], [with_gallium_r600, 'r600'], [with_gallium_radeonsi, 'radeonsi'], [with_gallium_nouveau, 'nouveau']] if d[0] - vdpau_drivers += 'libvdpau_@0@.so.1.0.0'.format(d[1]) + vdpau_drivers += 'libvdpau_@0@.so.@1@.@2@.0'.format(d[1], VDPAU_MAJOR, VDPAU_MINOR) endif endforeach |