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

mesa/st/nir: assign driver_location for images

Browse Source 
Signed-off-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Rob Clark
2017-11-03 12:47:51 -04:00
parent ecbe1e976f
commit 0006b860ce
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mesa/state_tracker/st_glsl_to_nir.cpp
View File

@@ -176,6 +176,7 @@ st_nir_assign_uniform_locations(struct gl_program *prog,
{
int max = 0;
int shaderidx = 0;
int imageidx = 0;
nir_foreach_variable(uniform, uniform_list) {
int loc;
@@ -188,10 +189,13 @@ st_nir_assign_uniform_locations(struct gl_program *prog,
uniform->interface_type != NULL)
continue;
if (uniform->type->is_sampler()) {
if (uniform->type->is_sampler() || uniform->type->is_image()) {
unsigned val = 0;
bool found = shader_program->UniformHash->get(val, uniform->name);
loc = shaderidx++;
if (uniform->type->is_sampler())
loc = shaderidx++;
else
loc = imageidx++;
assert(found);
(void) found; /* silence unused var warning */
/* this ensure that nir_lower_samplers looks at the correct