From: Kenneth Graunke <kenneth@whitecape.org>
Date: Fri, 23 Nov 2018 19:47:55 +0000 (-0800)
Subject: iris: Use program's num textures not the state tracker's bound
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=10d04cdaa4ffbf37b5eedab2769074697cb6aff3;p=mesa.git

iris: Use program's num textures not the state tracker's bound

the state tracker might bind more textures than the program is using.
---

diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index a13e6cd0b0e..635d2d60ed6 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -3637,7 +3637,7 @@ iris_populate_binding_table(struct iris_context *ice,
    //assert(prog_data->binding_table.texture_start ==
           //(ice->state.num_textures[stage] ? s : 0xd0d0d0d0));
 
-   for (int i = 0; i < shs->num_textures; i++) {
+   for (int i = 0; i < info->num_textures; i++) {
       struct iris_sampler_view *view = shs->textures[i];
       uint32_t addr = view ? use_sampler_view(batch, view)
                            : use_null_surface(batch, ice);