diff options
| author | Julien Cristau <jcristau@debian.org> | 2007-12-18 12:28:29 +0100 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2007-12-18 12:28:29 +0100 |
| commit | c02990525c091c9dbdff3aa56414f9fb67c4c0af (patch) | |
| tree | a51a2c0019aef95e7bafa228b6b056a230568140 /src/mesa/shader/slang/slang_codegen.c | |
| parent | ae0bf74db93b5c3f9260fefd3546dccfea1e80fc (diff) | |
| parent | 0107acded03c510df2093b0b98bca52b5734dd5b (diff) | |
Merge branch 'mesa_7_0_branch' of git.freedesktop.org:/git/mesa/mesa into debian-unstable
Conflicts:
progs/trivial/quad-clip-nearplane.c
Diffstat (limited to 'src/mesa/shader/slang/slang_codegen.c')
| -rw-r--r-- | src/mesa/shader/slang/slang_codegen.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c index 675dd831805..ef9c0ab3f9a 100644 --- a/src/mesa/shader/slang/slang_codegen.c +++ b/src/mesa/shader/slang/slang_codegen.c @@ -2344,7 +2344,8 @@ _slang_gen_field(slang_assemble_ctx * A, slang_operation *oper) return n; } else if ( ti.spec.type == SLANG_SPEC_FLOAT - || ti.spec.type == SLANG_SPEC_INT) { + || ti.spec.type == SLANG_SPEC_INT + || ti.spec.type == SLANG_SPEC_BOOL) { const GLuint rows = 1; slang_swizzle swz; slang_ir_node *n; |