svga: minor simplification in svga_validate_surface_view()
authorBrian Paul <brianp@vmware.com>
Fri, 16 Sep 2016 21:22:51 +0000 (15:22 -0600)
committerBrian Paul <brianp@vmware.com>
Wed, 21 Sep 2016 18:23:45 +0000 (12:23 -0600)
Get rid of unneeded local var.

Reviewed-by: Charmaine Lee <charmainel@vmware.com>
src/gallium/drivers/svga/svga_surface.c

index 42636bc82febd3aaab81a244bb7cd625fec56095..7cc7ef1b4528c6f52ff1e805f369bf61647a0619 100644 (file)
@@ -405,9 +405,9 @@ svga_validate_surface_view(struct svga_context *svga, struct svga_surface *s)
 {
    enum pipe_error ret = PIPE_OK;
    enum pipe_shader_type shader;
-   struct pipe_surface *surf = NULL;
 
    assert(svga_have_vgpu10(svga));
+   assert(s);
 
    SVGA_STATS_TIME_PUSH(svga_sws(svga),
                         SVGA_STATS_TIME_VALIDATESURFACEVIEW);
@@ -481,12 +481,11 @@ svga_validate_surface_view(struct svga_context *svga, struct svga_surface *s)
          goto done;
       }
    }
-   surf = &s->base;
    
 done:
    SVGA_STATS_TIME_POP(svga_sws(svga));
 
-   return surf;
+   return &s->base;
 }