From a0b711d8e930bd18c60b95ac4ee900c0df070140 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 18 Oct 2019 19:49:44 -0400 Subject: [PATCH] nir: allow nir_lower_uniforms_to_ubo to be run repeatedly for st/mesa Reviewed-by: Kenneth Graunke --- src/compiler/nir/nir_lower_uniforms_to_ubo.c | 5 ++++- src/compiler/shader_info.h | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/compiler/nir/nir_lower_uniforms_to_ubo.c b/src/compiler/nir/nir_lower_uniforms_to_ubo.c index 2f6b23a248f..7def01aad7e 100644 --- a/src/compiler/nir/nir_lower_uniforms_to_ubo.c +++ b/src/compiler/nir/nir_lower_uniforms_to_ubo.c @@ -43,7 +43,9 @@ lower_instr(nir_intrinsic_instr *instr, nir_builder *b, int multiplier) { b->cursor = nir_before_instr(&instr->instr); - if (instr->intrinsic == nir_intrinsic_load_ubo) { + /* Increase all UBO binding points by 1. */ + if (instr->intrinsic == nir_intrinsic_load_ubo && + !b->shader->info.first_ubo_is_default_ubo) { nir_ssa_def *old_idx = nir_ssa_for_src(b, instr->src[0], 1); nir_ssa_def *new_idx = nir_iadd(b, old_idx, nir_imm_int(b, 1)); nir_instr_rewrite_src(&instr->instr, &instr->src[0], @@ -99,6 +101,7 @@ nir_lower_uniforms_to_ubo(nir_shader *shader, int multiplier) } } + shader->info.first_ubo_is_default_ubo = true; return progress; } diff --git a/src/compiler/shader_info.h b/src/compiler/shader_info.h index 1de583e6010..e8c875f333f 100644 --- a/src/compiler/shader_info.h +++ b/src/compiler/shader_info.h @@ -151,6 +151,9 @@ typedef struct shader_info { /* The size of the gl_CullDistance[] array, if declared. */ unsigned cull_distance_array_size; + /* Whether the first UBO is the default uniform buffer, i.e. uniforms. */ + bool first_ubo_is_default_ubo; + /* Whether or not separate shader objects were used */ bool separate_shader; -- 2.30.2