Mesa (master): gallium/tgsi: remove is_msaa_sampler array from tgsi_shader_info

Timothy Arceri tarceri at kemper.freedesktop.org
Mon Feb 26 00:44:55 UTC 2018


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

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Fri Feb 23 13:46:27 2018 +1100

gallium/tgsi: remove is_msaa_sampler array from tgsi_shader_info

Seems to have not been used since 16be87c90429

Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

---

 src/gallium/auxiliary/tgsi/tgsi_scan.c | 6 ------
 src/gallium/auxiliary/tgsi/tgsi_scan.h | 1 -
 2 files changed, 7 deletions(-)

diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.c b/src/gallium/auxiliary/tgsi/tgsi_scan.c
index 989c57ebee..c35eff25ba 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_scan.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_scan.c
@@ -267,7 +267,6 @@ scan_src_operand(struct tgsi_shader_info *info,
       const unsigned index = src->Register.Index;
 
       assert(fullinst->Instruction.Texture);
-      assert(index < ARRAY_SIZE(info->is_msaa_sampler));
       assert(index < PIPE_MAX_SAMPLERS);
 
       if (is_texture_inst(fullinst->Instruction.Opcode)) {
@@ -286,11 +285,6 @@ scan_src_operand(struct tgsi_shader_info *info,
              */
             assert(info->sampler_targets[index] == target);
          }
-         /* MSAA samplers */
-         if (target == TGSI_TEXTURE_2D_MSAA ||
-             target == TGSI_TEXTURE_2D_ARRAY_MSAA) {
-            info->is_msaa_sampler[src->Register.Index] = TRUE;
-         }
       }
    }
 
diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.h b/src/gallium/auxiliary/tgsi/tgsi_scan.h
index 0f872b0022..1887ff342d 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_scan.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_scan.h
@@ -132,7 +132,6 @@ struct tgsi_shader_info
    boolean writes_viewport_index;
    boolean writes_layer;
    boolean writes_memory; /**< contains stores or atomics to buffers or images */
-   boolean is_msaa_sampler[PIPE_MAX_SAMPLERS];
    boolean uses_doubles; /**< uses any of the double instructions */
    boolean uses_derivatives;
    boolean uses_bindless_samplers;




More information about the mesa-commit mailing list