From: Brian Paul <brianp@vmware.com>
Date: Tue, 18 Oct 2016 16:20:55 +0000 (-0600)
Subject: svga: minor code improvements in svga_validate_pipe_sampler_view()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8b731b8b0364a19917a62d69ebd106423555ec27;p=mesa.git

svga: minor code improvements in svga_validate_pipe_sampler_view()

Use the 'texture' local var in more places.
Rename 'pFormat' to 'viewFormat'.

Reviewed-by: Charmaine Lee <charmainel@vmware.com>
---

diff --git a/src/gallium/drivers/svga/svga_state_sampler.c b/src/gallium/drivers/svga/svga_state_sampler.c
index 53bb80f0e5b..445afcc8d28 100644
--- a/src/gallium/drivers/svga/svga_state_sampler.c
+++ b/src/gallium/drivers/svga/svga_state_sampler.c
@@ -135,21 +135,21 @@ svga_validate_pipe_sampler_view(struct svga_context *svga,
       SVGA3dSurfaceFormat format;
       SVGA3dResourceType resourceDim;
       SVGA3dShaderResourceViewDesc viewDesc;
-      enum pipe_format pformat = sv->base.format;
+      enum pipe_format viewFormat = sv->base.format;
 
       /* vgpu10 cannot create a BGRX view for a BGRA resource, so force it to
        * create a BGRA view (and vice versa).
        */
-      if (pformat == PIPE_FORMAT_B8G8R8X8_UNORM &&
-          sv->base.texture->format == PIPE_FORMAT_B8G8R8A8_UNORM) {
-         pformat = PIPE_FORMAT_B8G8R8A8_UNORM;
+      if (viewFormat == PIPE_FORMAT_B8G8R8X8_UNORM &&
+          texture->format == PIPE_FORMAT_B8G8R8A8_UNORM) {
+         viewFormat = PIPE_FORMAT_B8G8R8A8_UNORM;
       }
-      else if (pformat == PIPE_FORMAT_B8G8R8A8_UNORM &&
-          sv->base.texture->format == PIPE_FORMAT_B8G8R8X8_UNORM) {
-         pformat = PIPE_FORMAT_B8G8R8X8_UNORM;
+      else if (viewFormat == PIPE_FORMAT_B8G8R8A8_UNORM &&
+          texture->format == PIPE_FORMAT_B8G8R8X8_UNORM) {
+         viewFormat = PIPE_FORMAT_B8G8R8X8_UNORM;
       }
 
-      format = svga_translate_format(ss, pformat,
+      format = svga_translate_format(ss, viewFormat,
                                      PIPE_BIND_SAMPLER_VIEW);
       assert(format != SVGA3D_FORMAT_INVALID);