AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/glsl_to_nir: add support for packed builtin uniforms

Browse Source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Timothy Arceri
2018-03-13 20:50:27 +11:00
parent 57ebab64c0
commit 5488166730
1 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/state_tracker/st_glsl_to_nir.cpp
+37 -5
View File
@@ -218,7 +218,8 @@ st_nir_lookup_parameter_index(const struct gl_program_parameter_list *params,
}
static void
st_nir_assign_uniform_locations(struct gl_program *prog,
st_nir_assign_uniform_locations(struct gl_context *ctx,
struct gl_program *prog,
struct gl_shader_program *shader_program,
struct exec_list *uniform_list, unsigned *size)
{
@@ -247,7 +248,21 @@ st_nir_assign_uniform_locations(struct gl_program *prog,
/* This state reference has already been setup by ir_to_mesa, but we'll
* get the same index back here.
*/
loc = _mesa_add_state_reference(prog->Parameters, stateTokens);
unsigned comps;
const struct glsl_type *type = glsl_without_array(uniform->type);
if (glsl_type_is_struct(type)) {
comps = 4;
} else {
comps = glsl_get_vector_elements(type);
}
if (ctx->Const.PackedDriverUniformStorage) {
loc = _mesa_add_sized_state_reference(prog->Parameters,
stateTokens, comps, false);
} else {
loc = _mesa_add_state_reference(prog->Parameters, stateTokens);
}
} else {
loc = st_nir_lookup_parameter_index(prog->Parameters, uniform->name);
}
@@ -359,9 +374,26 @@ st_glsl_to_nir_post_opts(struct st_context *st, struct gl_program *prog,
const nir_state_slot *const slots = var->state_slots;
assert(var->state_slots != NULL);
const struct glsl_type *type = glsl_without_array(var->type);
for (unsigned int i = 0; i < var->num_state_slots; i++) {
_mesa_add_state_reference(prog->Parameters,
slots[i].tokens);
unsigned comps;
if (glsl_type_is_struct(type)) {
/* Builtin struct require specical handling for now we just
* make all members vec4. See st_nir_lower_builtin.
*/
comps = 4;
} else {
comps = glsl_get_vector_elements(type);
}
if (st->ctx->Const.PackedDriverUniformStorage) {
_mesa_add_sized_state_reference(prog->Parameters,
slots[i].tokens,
comps, false);
} else {
_mesa_add_state_reference(prog->Parameters,
slots[i].tokens);
}
}
}
}
@@ -717,7 +749,7 @@ st_finalize_nir(struct st_context *st, struct gl_program *prog,
NIR_PASS_V(nir, nir_lower_atomics_to_ssbo,
st->ctx->Const.Program[nir->info.stage].MaxAtomicBuffers);
st_nir_assign_uniform_locations(prog, shader_program,
st_nir_assign_uniform_locations(st->ctx, prog, shader_program,
&nir->uniforms, &nir->num_uniforms);
if (screen->get_param(screen, PIPE_CAP_NIR_SAMPLERS_AS_DEREF))