Mesa (master): glsl: Move assert from outside to inside of _slang_gen_swizzle function.
Vinson Lee
vlee at kemper.freedesktop.org
Sun Feb 28 01:04:35 UTC 2010
Module: Mesa
Branch: master
Commit: 65974f67e16187e1827fa4e46bde3b5df7a5bf02
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=65974f67e16187e1827fa4e46bde3b5df7a5bf02
Author: Vinson Lee <vlee at vmware.com>
Date: Sat Feb 27 17:01:25 2010 -0800
glsl: Move assert from outside to inside of _slang_gen_swizzle function.
---
src/mesa/shader/slang/slang_codegen.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index 9ca5c13..6d1cea2 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -4223,6 +4223,7 @@ _slang_gen_swizzle(slang_ir_node *child, GLuint swizzle)
n->Store = _slang_new_ir_storage_relative(0,
swizzle_size(swizzle),
child->Store);
+ assert(n->Store);
n->Store->Swizzle = swizzle;
}
return n;
@@ -4524,7 +4525,6 @@ _slang_gen_array_element(slang_assemble_ctx * A, slang_operation *oper)
SWIZZLE_NIL);
n = _slang_gen_swizzle(n, swizzle);
}
- assert(n->Store);
return n;
}
else {
More information about the mesa-commit
mailing list