mesa: Branch 'glsl-compiler-1' - 2 commits
Brian Paul
brianp at kemper.freedesktop.org
Sun Mar 11 23:30:20 UTC 2007
progs/tests/Makefile | 1 +
src/mesa/shader/slang/slang_codegen.c | 15 +++++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
New commits:
diff-tree 3f7ef618b6ea9d80aaef416ca9ddf6994bcbec8e (from 15aa7aaa9327f528d1edc47d76fcc92e32bf001e)
Author: Brian <brian at nostromo.localnet.net>
Date: Sun Mar 11 17:30:13 2007 -0600
added drawbuffers.c
diff --git a/progs/tests/Makefile b/progs/tests/Makefile
index 3a22285..482ae2c 100644
--- a/progs/tests/Makefile
+++ b/progs/tests/Makefile
@@ -33,6 +33,7 @@ SOURCES = \
crossbar.c \
cva.c \
dinoshade.c \
+ drawbuffers.c \
floattex.c \
fbotest1.c \
fbotest2.c \
diff-tree 15aa7aaa9327f528d1edc47d76fcc92e32bf001e (from ccb80d7ec4e4415c5443031ec26447117e20e4de)
Author: Brian <brian at nostromo.localnet.net>
Date: Sun Mar 11 17:29:54 2007 -0600
add NULL ptr check
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index 88a4b2d..7b2ca3a 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -1985,12 +1985,15 @@ _slang_gen_assignment(slang_assemble_ctx
else {
slang_ir_node *n, *lhs, *rhs;
lhs = _slang_gen_operation(A, &oper->children[0]);
- if (lhs->Store->File != PROGRAM_OUTPUT &&
- lhs->Store->File != PROGRAM_TEMPORARY &&
- lhs->Store->File != PROGRAM_VARYING &&
- lhs->Store->File != PROGRAM_UNDEFINED) {
- slang_info_log_error(A->log, "Assignment to read-only variable");
- return NULL;
+
+ if (lhs) {
+ if (lhs->Store->File != PROGRAM_OUTPUT &&
+ lhs->Store->File != PROGRAM_TEMPORARY &&
+ lhs->Store->File != PROGRAM_VARYING &&
+ lhs->Store->File != PROGRAM_UNDEFINED) {
+ slang_info_log_error(A->log, "Assignment to read-only variable");
+ return NULL;
+ }
}
rhs = _slang_gen_operation(A, &oper->children[1]);
More information about the mesa-commit
mailing list