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

Allow initializers for uniforms

Browse source
This commit is contained in:
Ian Romanick 2010-06-17 20:09:34 -07:00
parent c648a124b2
commit ce03088406
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ast_to_hir.cpp
View file

@ -1758,15 +1758,17 @@ ast_declarator_list::hir(exec_list *instructions,
ir_dereference *const lhs = new ir_dereference_variable(var);
ir_rvalue *rhs = decl->initializer->hir(instructions, state);
/* Calculate the constant value if this is a const
/* Calculate the constant value if this is a const or uniform
* declaration.
*/
if (this->type->qualifier.constant) {
if (this->type->qualifier.constant || this->type->qualifier.uniform) {
ir_constant *constant_value = rhs->constant_expression_value();
if (!constant_value) {
_mesa_glsl_error(& initializer_loc, state,
"initializer of const variable `%s' must be a "
"initializer of %s variable `%s' must be a "
"constant expression",
(this->type->qualifier.constant)
? "const" : "uniform",
decl->identifier);
} else {
rhs = constant_value;
@ -1778,8 +1780,12 @@ ast_declarator_list::hir(exec_list *instructions,
bool temp = var->read_only;
if (this->type->qualifier.constant)
var->read_only = false;
result = do_assignment(instructions, state, lhs, rhs,
this->get_location());
/* Never emit code to initialize a uniform.
*/
if (!this->type->qualifier.uniform)
result = do_assignment(instructions, state, lhs, rhs,
this->get_location());
var->read_only = temp;
}
}