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

i965/nir/vec4: Handle uniforms on vertex programs 

The implementation takes into account that on ARB_vertex_program
only a single nir variable is generated to support all the uniform data.

Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
This commit is contained in:
Antia Puentes 2015-06-29 14:21:38 +02:00 committed by Jason Ekstrand
parent 90825e3ca9
commit 82f2e706bf
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/mesa/drivers/dri/i965/brw_vec4_nir.cpp
View File

@ -153,8 +153,38 @@ vec4_visitor::nir_setup_uniforms(nir_shader *shader)
nir_setup_uniform(var);
}
} else {
/* ARB_vertex_program is not supported yet */
assert("Not implemented");
/* For ARB_vertex_program, only a single "parameters" variable is
* generated to support uniform data.
*/
nir_variable *var = (nir_variable *) shader->uniforms.get_head();
assert(shader->uniforms.length() == 1 &&
strcmp(var->name, "parameters") == 0);
assert(uniforms < uniform_array_size);
this->uniform_size[uniforms] = type_size(var->type);
struct gl_program_parameter_list *plist = prog->Parameters;
for (unsigned p = 0; p < plist->NumParameters; p++) {
uniform_vector_size[uniforms] = plist->Parameters[p].Size;
/* Parameters should be either vec4 uniforms or single component
* constants; matrices and other larger types should have been broken
* down earlier.
*/
assert(uniform_vector_size[uniforms] <= 4);
int i;
for (i = 0; i < uniform_vector_size[uniforms]; i++) {
stage_prog_data->param[uniforms * 4 + i] = &plist->ParameterValues[p][i];
}
for (; i < 4; i++) {
static const gl_constant_value zero = { 0.0 };
stage_prog_data->param[uniforms * 4 + i] = &zero;
}
nir_uniform_driver_location[uniforms] = var->data.driver_location;
uniforms++;
}
}
}