Mesa (master): i965: Drop unnecessary 'and' with prog->SamplerUnits

[GitLab Mirror]

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

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Sun Feb 10 19:50:37 2019 -0800

i965: Drop unnecessary 'and' with prog->SamplerUnits

textures_used_by_txf is a subset of textures_used which is a subset
of prog->SamplerUnits.  This should do nothing.

Reviewed-by: Eric Anholt <eric at anholt.net>

---

 src/mesa/drivers/dri/i965/brw_draw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
index ec4fe0b096..c3102e3fef 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -447,7 +447,7 @@ mark_textures_used_for_txf(BITSET_WORD *used_for_txf,
    if (!prog)
       return;
 
-   unsigned mask = prog->SamplersUsed & prog->info.textures_used_by_txf;
+   uint32_t mask = prog->info.textures_used_by_txf;
    while (mask) {
       int s = u_bit_scan(&mask);
       BITSET_SET(used_for_txf, prog->SamplerUnits[s]);