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

mesa: glsl: more type checking for attribute/varying/uniform vars/locals

Browse Source
This commit is contained in:
Brian Paul
2008-08-06 11:45:42 -06:00
parent 64a795d8e6
commit acb81d0268
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mesa/shader/slang/slang_codegen.c
View File

@@ -2777,8 +2777,18 @@ _slang_gen_declaration(slang_assemble_ctx *A, slang_operation *oper)
assert(oper->num_children <= 1); assert(oper->num_children <= 1);
v = _slang_locate_variable(oper->locals, oper->a_id, GL_TRUE); v = _slang_locate_variable(oper->locals, oper->a_id, GL_TRUE);
/*printf("Declare %s at %p\n", varName, (void *) v);*/ if (!v)
assert(v); return NULL; /* "shouldn't happen" */
if (v->type.qualifier == SLANG_QUAL_ATTRIBUTE ||
v->type.qualifier == SLANG_QUAL_VARYING ||
v->type.qualifier == SLANG_QUAL_UNIFORM) {
/* can't declare attribute/uniform vars inside functions */
slang_info_log_error(A->log,
"local variable '%s' cannot be an attribute/uniform/varying",
varName);
return NULL;
}
#if 0 #if 0
if (v->declared) { if (v->declared) {
@@ -3685,9 +3695,9 @@ _slang_codegen_global_variable(slang_assemble_ctx *A, slang_variable *var,
if (dbg) printf("UNIFORM (sz %d) ", totalSize); if (dbg) printf("UNIFORM (sz %d) ", totalSize);
} }
else if (var->type.qualifier == SLANG_QUAL_VARYING) { else if (var->type.qualifier == SLANG_QUAL_VARYING) {
if (var->type.specifier.type == SLANG_SPEC_STRUCT) { if (!_slang_type_is_float_vec_mat(var->type.specifier.type)) {
slang_info_log_error(A->log, slang_info_log_error(A->log,
"varying '%s' cannot be a structure type", "varying '%s' must be float/vector/matrix",
varName); varName);
return GL_FALSE; return GL_FALSE;
} }