diff options
| author | Nicolai Hähnle <nhaehnle@gmail.com> | 2009-09-21 13:26:50 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <nhaehnle@gmail.com> | 2009-09-21 13:26:50 +0200 |
| commit | 81c7561d9d3faf70ac22c6a5f3fbea18f53eed92 (patch) | |
| tree | 5ec097e0e1fe99804104d3a56923c16edf1533aa /src/mesa/shader/prog_instruction.h | |
| parent | f02f63997ce65530788a6dfcb28f11790a14d938 (diff) | |
| parent | 3083ba38f4c884b32cd0460607b5064b6b7008d2 (diff) | |
Merge branch 'master' into r300-compiler
There were additional non-textual conflicts.
Conflicts:
src/gallium/drivers/r300/r300_tgsi_to_rc.c
src/mesa/drivers/dri/r300/compiler/r3xx_vertprog.c
src/mesa/drivers/dri/r300/compiler/radeon_program.c
src/mesa/drivers/dri/r300/compiler/radeon_program_alu.c
Diffstat (limited to 'src/mesa/shader/prog_instruction.h')
| -rw-r--r-- | src/mesa/shader/prog_instruction.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mesa/shader/prog_instruction.h b/src/mesa/shader/prog_instruction.h index 39a221eeab..1c687bc16c 100644 --- a/src/mesa/shader/prog_instruction.h +++ b/src/mesa/shader/prog_instruction.h @@ -121,7 +121,6 @@ /*@{*/ #define SATURATE_OFF 0 #define SATURATE_ZERO_ONE 1 -#define SATURATE_PLUS_MINUS_ONE 2 /*@}*/ |