st/va: use proper temp pipe_video_buffer template
authorJulien Isorce <j.isorce@samsung.com>
Thu, 2 Jun 2016 14:03:34 +0000 (15:03 +0100)
committerJulien Isorce <j.isorce@samsung.com>
Mon, 13 Jun 2016 08:14:32 +0000 (09:14 +0100)
Instead of changing the format on the existing template
which makes error handling not nice and confuses coverity.

CoverityID: 1337953

Signed-off-by: Julien Isorce <j.isorce@samsung.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
src/gallium/state_trackers/va/image.c

index 92d014c3d44ffce219539043cf8a4078279b687a..1b956e36bc17ddde88165d35bc9b6af8b2d0d68f 100644 (file)
@@ -473,19 +473,19 @@ vlVaPutImage(VADriverContextP ctx, VASurfaceID surface, VAImageID image,
 
    if (format != surf->buffer->buffer_format) {
       struct pipe_video_buffer *tmp_buf;
-      enum pipe_format old_surf_format = surf->templat.buffer_format;
+      struct pipe_video_buffer templat = surf->templat;
 
-      surf->templat.buffer_format = format;
-      tmp_buf = drv->pipe->create_video_buffer(drv->pipe, &surf->templat);
+      templat.buffer_format = format;
+      tmp_buf = drv->pipe->create_video_buffer(drv->pipe, &templat);
 
       if (!tmp_buf) {
-         surf->templat.buffer_format = old_surf_format;
          pipe_mutex_unlock(drv->mutex);
          return VA_STATUS_ERROR_ALLOCATION_FAILED;
       }
 
       surf->buffer->destroy(surf->buffer);
       surf->buffer = tmp_buf;
+      surf->templat.buffer_format = format;
    }
 
    views = surf->buffer->get_sampler_view_planes(surf->buffer);