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

nir: handle nir_var_mem_ubo in nir_clone_uniform_variable

Browse Source 
for UBOs

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25394>
This commit is contained in:
Marek Olšák
2023-04-06 23:34:47 -04:00
committed by Marge Bot
parent b47b8d16d9
commit 348eee9c97
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/nir/nir.h
View File

@@ -4966,7 +4966,7 @@ void nir_link_xfb_varyings(nir_shader *producer, nir_shader *consumer);
bool nir_link_opt_varyings(nir_shader *producer, nir_shader *consumer);
void nir_link_varying_precision(nir_shader *producer, nir_shader *consumer);
nir_variable *nir_clone_uniform_variable(nir_shader *nir,
nir_variable *uniform);
nir_variable *uniform, bool spirv);
nir_deref_instr *nir_clone_deref_instr(struct nir_builder *b,
nir_variable *var,
nir_deref_instr *deref);

10
src/compiler/nir/nir_linking_helpers.c
View File

@@ -1173,12 +1173,14 @@ is_direct_uniform_load(nir_def *def, nir_scalar *s)
* \param uniform The uniform that's declared in another shader.
*/
nir_variable *
nir_clone_uniform_variable(nir_shader *nir, nir_variable *uniform)
nir_clone_uniform_variable(nir_shader *nir, nir_variable *uniform, bool spirv)
{
/* Find if uniform already exists in consumer. */
nir_variable *new_var = NULL;
nir_foreach_uniform_variable(v, nir) {
if (!strcmp(uniform->name, v->name)) {
nir_foreach_variable_with_modes(v, nir, uniform->data.mode) {
if ((spirv && uniform->data.mode & nir_var_mem_ubo &&
v->data.binding == uniform->data.binding) ||
(!spirv && !strcmp(uniform->name, v->name))) {
new_var = v;
break;
}
@@ -1241,7 +1243,7 @@ replace_varying_input_by_uniform_load(nir_shader *shader,
nir_intrinsic_instr *load = nir_instr_as_intrinsic(scalar->def->parent_instr);
nir_deref_instr *deref = nir_src_as_deref(load->src[0]);
nir_variable *uni_var = nir_deref_instr_get_variable(deref);
uni_var = nir_clone_uniform_variable(shader, uni_var);
uni_var = nir_clone_uniform_variable(shader, uni_var, false);
bool progress = false;
nir_foreach_block(block, impl) {