diff options
| author | Jason Ekstrand <[email protected]> | 2015-12-27 23:23:05 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-12-27 23:23:05 -0800 |
| commit | ea77b384e8c575922eca1c05398e19fcbfda9b09 (patch) | |
| tree | 4f8659bd8b48af785896daa224f6698a5ee269ec /src/gallium/state_trackers/va/image.c | |
| parent | f948767471ba83427cbcdc244a511fbb954ca9e0 (diff) | |
| parent | 109c348284843054f708f4403260739b7db18275 (diff) | |
Merge remote-tracking branch 'mesa-public/master' into vulkan
This pulls in tessellation and the store_var changes that go with it.
Diffstat (limited to 'src/gallium/state_trackers/va/image.c')
| -rw-r--r-- | src/gallium/state_trackers/va/image.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/va/image.c b/src/gallium/state_trackers/va/image.c index ae07da857e1..ccc263f77a7 100644 --- a/src/gallium/state_trackers/va/image.c +++ b/src/gallium/state_trackers/va/image.c @@ -264,9 +264,8 @@ vlVaDeriveImage(VADriverContextP ctx, VASurfaceID surface, VAImage *image) img->image_id = handle_table_add(drv->htab, img); img_buf->type = VAImageBufferType; - img_buf->size = image->data_size; + img_buf->size = img->data_size; img_buf->num_elements = 1; - img_buf->derived_surface.fence = surf->fence; pipe_resource_reference(&img_buf->derived_surface.resource, surfaces[0]->texture); |