Mesa (master): tgsi: simplify tgsi_shader_info::is_msaa_sampler checking

[Brian Paul]

Module: Mesa
Branch: master
Commit: 5c85c3be26566711a3bdf27df4f9fb07b126882d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5c85c3be26566711a3bdf27df4f9fb07b126882d

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Mar 29 11:43:02 2016 -0600

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 at vmware.com>
Reviewed-by: Roland Scheidegger <sroland at vmware.com>

---

 src/gallium/auxiliary/tgsi/tgsi_scan.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.c b/src/gallium/auxiliary/tgsi/tgsi_scan.c
index 6d4b00d..c71c777 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;
          }
       }