aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/shader/slang
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-07-28 18:15:53 +0000
committermarha <marha@users.sourceforge.net>2010-07-28 18:15:53 +0000
commit022d9c6cf6a67385d84ff33ce095f5c7f9f6d0cc (patch)
tree1c6bef40b9b16775f2d9b39f88d6224e0bea69ff /mesalib/src/mesa/shader/slang
parent51e3b8e993cc874f4ac4ba4162c7aea00fe1a8eb (diff)
downloadvcxsrv-022d9c6cf6a67385d84ff33ce095f5c7f9f6d0cc.tar.gz
vcxsrv-022d9c6cf6a67385d84ff33ce095f5c7f9f6d0cc.tar.bz2
vcxsrv-022d9c6cf6a67385d84ff33ce095f5c7f9f6d0cc.zip
Update to mesa 7,8,2
Diffstat (limited to 'mesalib/src/mesa/shader/slang')
-rw-r--r--mesalib/src/mesa/shader/slang/slang_codegen.c3
-rw-r--r--mesalib/src/mesa/shader/slang/slang_compile_variable.h2
-rw-r--r--mesalib/src/mesa/shader/slang/slang_link.c5
3 files changed, 6 insertions, 4 deletions
diff --git a/mesalib/src/mesa/shader/slang/slang_codegen.c b/mesalib/src/mesa/shader/slang/slang_codegen.c
index ecb2f6d5c..7d5e5eb29 100644
--- a/mesalib/src/mesa/shader/slang/slang_codegen.c
+++ b/mesalib/src/mesa/shader/slang/slang_codegen.c
@@ -4187,11 +4187,10 @@ _slang_gen_variable(slang_assemble_ctx * A, slang_operation *oper)
slang_atom name = oper->var ? oper->var->a_name : oper->a_id;
slang_variable *var = _slang_variable_locate(oper->locals, name, GL_TRUE);
slang_ir_node *n;
- if (!var) {
+ if (!var || !var->declared) {
slang_info_log_error(A->log, "undefined variable '%s'", (char *) name);
return NULL;
}
- assert(var->declared);
n = new_var(A, var);
return n;
}
diff --git a/mesalib/src/mesa/shader/slang/slang_compile_variable.h b/mesalib/src/mesa/shader/slang/slang_compile_variable.h
index b4585599f..5c9d248b3 100644
--- a/mesalib/src/mesa/shader/slang/slang_compile_variable.h
+++ b/mesalib/src/mesa/shader/slang/slang_compile_variable.h
@@ -41,7 +41,7 @@ typedef struct slang_variable_
GLuint size; /**< Variable's size in bytes */
GLboolean is_global;
GLboolean isTemp; /**< a named temporary (__resultTmp) */
- GLboolean declared; /**< for debug */
+ GLboolean declared; /**< has the var been declared? */
struct slang_ir_storage_ *store; /**< Storage for this var */
} slang_variable;
diff --git a/mesalib/src/mesa/shader/slang/slang_link.c b/mesalib/src/mesa/shader/slang/slang_link.c
index 7c7bfbdbc..e8dca0142 100644
--- a/mesalib/src/mesa/shader/slang/slang_link.c
+++ b/mesalib/src/mesa/shader/slang/slang_link.c
@@ -921,7 +921,10 @@ _slang_link(GLcontext *ctx,
if (!vertNotify || !fragNotify) {
/* driver rejected one/both of the vertex/fragment programs */
- link_error(shProg, "Vertex and/or fragment program rejected by driver\n");
+ if (!shProg->InfoLog) {
+ link_error(shProg,
+ "Vertex and/or fragment program rejected by driver\n");
+ }
}
else {
shProg->LinkStatus = (shProg->VertexProgram || shProg->FragmentProgram);