fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

st/glsl_to_nir: Calculate num_uniforms from NumParameterValues

Browse source 
We don't need to determine the number of uniform slots here, it's
already available as prog->Parameters->NumParameterValues.  The way we
previously determined the number of slots was also broken for
PackedDriverUniformStorage, where we would add loc (in dwords) and
type_size() (in vec4s).

Signed-off-by: Kristian H. Kristensen <hoegsberg@chromium.org>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Kristian H. Kristensen 2019-03-26 09:53:38 -07:00
parent dce13e58b0
commit 56b4bc292f
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/mesa/state_tracker/st_glsl_to_nir.cpp
View file

@ -240,9 +240,8 @@ st_nir_lookup_parameter_index(const struct gl_program_parameter_list *params,
static void
st_nir_assign_uniform_locations(struct gl_context *ctx,
struct gl_program *prog,
struct exec_list *uniform_list, unsigned *size)
struct exec_list *uniform_list)
{
int max = 0;
int shaderidx = 0;
int imageidx = 0;
@ -298,9 +297,7 @@ st_nir_assign_uniform_locations(struct gl_context *ctx,
}
uniform->data.driver_location = loc;
max = MAX2(max, loc + type_size(uniform->type));
}
*size = max;
}
void
@ -934,7 +931,10 @@ st_finalize_nir(struct st_context *st, struct gl_program *prog,
st->ctx->Const.Program[nir->info.stage].MaxAtomicBuffers);
st_nir_assign_uniform_locations(st->ctx, prog,
&nir->uniforms, &nir->num_uniforms);
&nir->uniforms);
/* Set num_uniforms in number of attribute slots (vec4s) */
nir->num_uniforms = DIV_ROUND_UP(prog->Parameters->NumParameterValues, 4);
if (st->ctx->Const.PackedDriverUniformStorage) {
NIR_PASS_V(nir, nir_lower_io, nir_var_uniform, st_glsl_type_dword_size,