diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-03-16 12:49:46 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-03-16 12:49:46 +1100 |
| commit | c4354f84603cabb0e33ea3f586cc89bfdc27f79b (patch) | |
| tree | 01585e52a3cca102c212630d8bac345058e150f6 /src/mesa/shader/slang/slang_codegen.c | |
| parent | 5e17088ee3d0ddfa8871d92d262bb5242bdd92bd (diff) | |
| parent | cb98f71d42e4c714dfb0c3e29d28d8418a1ee86b (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/shader/slang/slang_codegen.c')
| -rw-r--r-- | 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 767ba3ffb4..0de2b0a57e 100644 --- a/src/mesa/shader/slang/slang_codegen.c +++ b/src/mesa/shader/slang/slang_codegen.c @@ -1087,7 +1087,7 @@ slang_inline_function_call(slang_assemble_ctx * A, slang_function *fun, slang_operation_copy(inlined, fun->body); /*** XXX review this */ - assert(inlined->type = SLANG_OPER_BLOCK_NO_NEW_SCOPE); + assert(inlined->type == SLANG_OPER_BLOCK_NO_NEW_SCOPE); inlined->type = SLANG_OPER_BLOCK_NEW_SCOPE; #if 0 |