diff options
author | Patrice Mandin <pmandin@caramail.com> | 2007-07-07 00:08:35 +0200 |
---|---|---|
committer | Patrice Mandin <pmandin@caramail.com> | 2007-07-07 00:08:35 +0200 |
commit | f0aa6654e27b279ecb29e9fd19c140cb1ac7946f (patch) | |
tree | ea9caba04ed3c5b3005edd79060002cb66a5e03a /src/mesa/shader/slang/slang_codegen.c | |
parent | 69501d76fc6a45da48bf4c416ac9e15edd44e7a9 (diff) | |
parent | f98bdfca574478837b33c97d131dad4833e3ee12 (diff) |
Merge branch 'master' of git+ssh://pmandin@git.freedesktop.org/git/mesa/mesa
Diffstat (limited to 'src/mesa/shader/slang/slang_codegen.c')
-rw-r--r-- | src/mesa/shader/slang/slang_codegen.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c index 02260d3422..2b5196f095 100644 --- a/src/mesa/shader/slang/slang_codegen.c +++ b/src/mesa/shader/slang/slang_codegen.c @@ -37,13 +37,13 @@ -#include "imports.h" -#include "macros.h" -#include "mtypes.h" -#include "program.h" -#include "prog_instruction.h" -#include "prog_parameter.h" -#include "prog_statevars.h" +#include "main/imports.h" +#include "main/macros.h" +#include "main/mtypes.h" +#include "shader/program.h" +#include "shader/prog_instruction.h" +#include "shader/prog_parameter.h" +#include "shader/prog_statevars.h" #include "slang_typeinfo.h" #include "slang_codegen.h" #include "slang_compile.h" @@ -1261,15 +1261,23 @@ make_writemask(const char *field) while (*field) { switch (*field) { case 'x': + case 's': + case 'r': mask |= WRITEMASK_X; break; case 'y': + case 't': + case 'g': mask |= WRITEMASK_Y; break; case 'z': + case 'p': + case 'b': mask |= WRITEMASK_Z; break; case 'w': + case 'q': + case 'a': mask |= WRITEMASK_W; break; default: |