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

glsl/nir_linker: nir_var_mem_image is also a GL uniform

Browse Source 
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4743>
This commit is contained in:
Jason Ekstrand
2021-09-15 14:29:15 -05:00
committed by Marge Bot
parent 94b9f25883
commit c0d8dc13e0
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/glsl/gl_nir_link_uniforms.c
View File

@@ -394,7 +394,8 @@ add_var_use_deref(nir_deref_instr *deref, struct hash_table *live,
if (deref->deref_type != nir_deref_type_var ||
!nir_deref_mode_is_one_of(deref, nir_var_uniform |
nir_var_mem_ubo |
nir_var_mem_ssbo)) {
nir_var_mem_ssbo |
nir_var_mem_image)) {
nir_deref_path_finish(&path);
return;
}

3
src/compiler/glsl/gl_nir_linker.h
View File

@@ -38,7 +38,8 @@ struct gl_nir_linker_options {
#define nir_foreach_gl_uniform_variable(var, shader) \
nir_foreach_variable_with_modes(var, shader, nir_var_uniform | \
nir_var_mem_ubo | \
nir_var_mem_ssbo)
nir_var_mem_ssbo | \
nir_var_mem_image)
bool gl_nir_link_spirv(struct gl_context *ctx,
struct gl_shader_program *prog,