diff options
author | Brian Paul <brianp@vmware.com> | 2009-12-31 09:02:27 -0700 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-12-31 09:02:27 -0700 |
commit | 25024d948298a9f3f3210a0b91486f79a3917b0f (patch) | |
tree | 5647623b9781193b7ed55c8d9233404938aeb853 /src/mesa/shader/slang/slang_compile_operation.c | |
parent | d14beea534dcb2b3ae2ae1f7ee0ba5dcdef3dba3 (diff) | |
parent | 195e7657e2f15f7ad8b22042b86bcf33c5bba76b (diff) |
Merge branch 'mesa_7_7_branch'
Conflicts:
configs/darwin
src/gallium/auxiliary/util/u_clear.h
src/gallium/state_trackers/xorg/xorg_exa_tgsi.c
src/mesa/drivers/dri/i965/brw_draw_upload.c
Diffstat (limited to 'src/mesa/shader/slang/slang_compile_operation.c')
-rw-r--r-- | src/mesa/shader/slang/slang_compile_operation.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/shader/slang/slang_compile_operation.c b/src/mesa/shader/slang/slang_compile_operation.c index be73094ca0..3a15d9d3ab 100644 --- a/src/mesa/shader/slang/slang_compile_operation.c +++ b/src/mesa/shader/slang/slang_compile_operation.c @@ -46,6 +46,7 @@ slang_operation_construct(slang_operation * oper) oper->literal_size = 1; oper->array_constructor = GL_FALSE; oper->a_id = SLANG_ATOM_NULL; + oper->a_obj = SLANG_ATOM_NULL; oper->locals = _slang_variable_scope_new(NULL); if (oper->locals == NULL) return GL_FALSE; |