Mesa (main): mesa/st: increment num_uniforms for hw accel select shaders

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 9ca0c0b4b40831038cac027bd342b2405e0716db
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9ca0c0b4b40831038cac027bd342b2405e0716db

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Thu Jun 16 16:58:37 2022 -0400

mesa/st: increment num_uniforms for hw accel select shaders

this otherwise breaks nir_lower_uniforms_to_ubo() and probably lots
of drivers

Fixes: 9b22ab4167e ("mesa/st: implement hardware accelerated GL_SELECT")

Reviewed-by: Qiang Yu <yuq825 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17092>

---

 src/mesa/state_tracker/st_draw_hw_select.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mesa/state_tracker/st_draw_hw_select.c b/src/mesa/state_tracker/st_draw_hw_select.c
index 5a032da046a..0e6ec5fe360 100644
--- a/src/mesa/state_tracker/st_draw_hw_select.c
+++ b/src/mesa/state_tracker/st_draw_hw_select.c
@@ -612,6 +612,7 @@ hw_select_create_gs(struct st_context *st, union state_key state)
 
    nir_shader *nir = b.shader;
    nir->info.inputs_read = VARYING_BIT_POS;
+   nir->num_uniforms = DIV_ROUND_UP(sizeof(struct geometry_constant), (4 * sizeof(float)));
    nir->info.num_ssbos = 1;
    nir->info.gs.output_primitive = SHADER_PRIM_POINTS;
    nir->info.gs.vertices_out = 1;