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

glsl: export accessor for builtin-uniform descriptors

Browse Source 
We'll need this for a nir pass to lower builtin-uniform access.

Signed-off-by: Rob Clark <robclark@freedesktop.org>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Rob Clark
2016-01-29 11:18:11 -05:00
parent dfbabc6bad
commit 0e5a369879
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/compiler/glsl/builtin_variables.cpp
View File

@@ -527,6 +527,16 @@ builtin_variable_generator::add_variable(const char *name,
return var;
}
extern "C" const struct gl_builtin_uniform_desc *
_mesa_glsl_get_builtin_uniform_desc(const char *name)
{
for (unsigned i = 0; _mesa_builtin_uniform_desc[i].name != NULL; i++) {
if (strcmp(_mesa_builtin_uniform_desc[i].name, name) == 0) {
return &_mesa_builtin_uniform_desc[i];
}
}
return NULL;
}
ir_variable *
builtin_variable_generator::add_uniform(const glsl_type *type,
@@ -534,16 +544,9 @@ builtin_variable_generator::add_uniform(const glsl_type *type,
{
ir_variable *const uni = add_variable(name, type, ir_var_uniform, -1);
unsigned i;
for (i = 0; _mesa_builtin_uniform_desc[i].name != NULL; i++) {
if (strcmp(_mesa_builtin_uniform_desc[i].name, name) == 0) {
break;
}
}
assert(_mesa_builtin_uniform_desc[i].name != NULL);
const struct gl_builtin_uniform_desc* const statevar =
&_mesa_builtin_uniform_desc[i];
_mesa_glsl_get_builtin_uniform_desc(name);
assert(statevar != NULL);
const unsigned array_count = type->is_array() ? type->length : 1;

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

@@ -2626,6 +2626,9 @@ extern void _mesa_print_ir(FILE *f, struct exec_list *instructions,
extern void
fprint_ir(FILE *f, const void *instruction);
extern const struct gl_builtin_uniform_desc *
_mesa_glsl_get_builtin_uniform_desc(const char *name);
#ifdef __cplusplus
} /* extern "C" */
#endif