OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: allow nir_lower_uniforms_to_ubo to be run repeatedly

Browse Source 
for st/mesa

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Marek Olšák
2019-10-18 19:49:44 -04:00
parent aa8515463e
commit a0b711d8e9
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/compiler/nir/nir_lower_uniforms_to_ubo.c
View File

@@ -43,7 +43,9 @@ lower_instr(nir_intrinsic_instr *instr, nir_builder *b, int multiplier)
{ {
b->cursor = nir_before_instr(&instr->instr); 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 *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_ssa_def *new_idx = nir_iadd(b, old_idx, nir_imm_int(b, 1));
nir_instr_rewrite_src(&instr->instr, &instr->src[0], 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; return progress;
} }

3
src/compiler/shader_info.h
View File

@@ -151,6 +151,9 @@ typedef struct shader_info {
/* The size of the gl_CullDistance[] array, if declared. */ /* The size of the gl_CullDistance[] array, if declared. */
unsigned cull_distance_array_size; 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 */ /* Whether or not separate shader objects were used */
bool separate_shader; bool separate_shader;