diff options
| author | Michal Krol <michal@tungstengraphics.com> | 2008-06-02 11:31:52 +0200 |
|---|---|---|
| committer | Michal Krol <michal@tungstengraphics.com> | 2008-06-02 11:34:56 +0200 |
| commit | 837d49a84e24420dbc06924f4862a5f7dcf4cace (patch) | |
| tree | 15f08854ce6c0e70ff64e810ef2dbadf18e69019 | |
| parent | a3212ee313c52ff4fc15804a3b4ddfb186556575 (diff) | |
gallium: The SWZ opcode no longer aliases MOV.
Also, when the extended swizzle token is used, the simple swizzle
and negate are set to X,Y,Z,W and FALSE, respectively.
| -rw-r--r-- | src/gallium/include/pipe/p_shader_tokens.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gallium/include/pipe/p_shader_tokens.h b/src/gallium/include/pipe/p_shader_tokens.h index 282d32910eb..84e5096418b 100644 --- a/src/gallium/include/pipe/p_shader_tokens.h +++ b/src/gallium/include/pipe/p_shader_tokens.h @@ -232,7 +232,7 @@ struct tgsi_immediate_float32 /* * GL_ARB_vertex_program */ -#define TGSI_OPCODE_SWZ TGSI_OPCODE_MOV +#define TGSI_OPCODE_SWZ 118 #define TGSI_OPCODE_XPD TGSI_OPCODE_CROSSPRODUCT /* @@ -388,7 +388,7 @@ struct tgsi_immediate_float32 #define TGSI_OPCODE_KIL 116 /* unpredicated kill */ #define TGSI_OPCODE_END 117 /* aka HALT */ -#define TGSI_OPCODE_LAST 118 +#define TGSI_OPCODE_LAST 119 #define TGSI_SAT_NONE 0 /* do not saturate */ #define TGSI_SAT_ZERO_ONE 1 /* clamp to [0,1] */ @@ -621,6 +621,10 @@ struct tgsi_src_register_ext * * NegateX, NegateY, NegateZ and NegateW negate individual components of the * source register. + * + * NOTE: To simplify matter, if this token is present, the corresponding Swizzle + * and Negate fields in tgsi_src_register should be set to X,Y,Z,W + * and FALSE, respectively. */ struct tgsi_src_register_ext_swz |