From: Brian Paul <brianp@vmware.com>
Date: Tue, 29 Mar 2016 17:43:02 +0000 (-0600)
Subject: tgsi: simplify tgsi_shader_info::is_msaa_sampler checking
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5c85c3be26566711a3bdf27df4f9fb07b126882d;p=mesa.git

tgsi: simplify tgsi_shader_info::is_msaa_sampler checking

We assert that fullinst->Instruction.Texture != 0 above so no need to
check it in the conditional.  We also have the fullinst->Texture.Texture
value in a local variable, so use it.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
---

diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.c b/src/gallium/auxiliary/tgsi/tgsi_scan.c
index 6d4b00d8879..c71c7770bfb 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_scan.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_scan.c
@@ -208,9 +208,8 @@ scan_instruction(struct tgsi_shader_info *info,
          }
 
          /* MSAA samplers */
-         if (fullinst->Instruction.Texture &&
-             (fullinst->Texture.Texture == TGSI_TEXTURE_2D_MSAA ||
-              fullinst->Texture.Texture == TGSI_TEXTURE_2D_ARRAY_MSAA)) {
+         if (target == TGSI_TEXTURE_2D_MSAA ||
+             target == TGSI_TEXTURE_2D_ARRAY_MSAA) {
             info->is_msaa_sampler[src->Register.Index] = TRUE;
          }
       }