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

glsl: fix array size initialiazers using const variables

Browse source 
e.g.
const int kernelSize = 9;
uniform vec2 kernel[kernelSize];
This commit is contained in:
Zack Rusin 2008-06-08 23:05:15 -04:00
parent 19659a50f9
commit effb73befa
1 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/mesa/shader/slang/slang_compile.c
View file

@ -258,9 +258,33 @@ parse_array_len(slang_parse_ctx * C, slang_output_ctx * O, GLuint * len)
/* evaluate compile-time expression which is array size */
_slang_simplify(&array_size, &space, C->atoms);
result = (array_size.type == SLANG_OPER_LITERAL_INT);
*len = (GLint) array_size.literal[0];
if (array_size.type == SLANG_OPER_LITERAL_INT) {
result = GL_TRUE;
*len = (GLint) array_size.literal[0];
} else if (array_size.type == SLANG_OPER_IDENTIFIER) {
slang_variable *var = _slang_locate_variable(array_size.locals, array_size.a_id, GL_TRUE);
if (!var) {
slang_info_log_error(C->L, "undefined variable '%s'",
(char *) array_size.a_id);
result = GL_FALSE;
} else if (var->type.qualifier == SLANG_QUAL_CONST &&
var->type.specifier.type == SLANG_SPEC_INT) {
if (var->initializer &&
var->initializer->type == SLANG_OPER_LITERAL_INT) {
*len = (GLint) var->initializer->literal[0];
result = GL_TRUE;
} else {
slang_info_log_error(C->L, "unable to parse array size declaration");
result = GL_FALSE;
}
} else {
slang_info_log_error(C->L, "unable to parse array size declaration");
result = GL_FALSE;
}
} else {
result = GL_FALSE;
}
slang_operation_destruct(&array_size);
return result;