diff options
| author | Michel Dänzer <[email protected]> | 2010-03-12 19:00:47 +0100 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2010-03-12 19:00:47 +0100 |
| commit | b13e305ee1a2454265fd957a99640a2e49507bea (patch) | |
| tree | e62dfd0ff761ec89de478499130d58d4b119aa0d /src/mesa/shader/prog_instruction.h | |
| parent | d1ca1599f0319f5c99852ce24420aa592e806db0 (diff) | |
| parent | 8561bec0ac1ae5a8871c86f1f2cc29d44cb0f878 (diff) | |
Merge branch '7.8'
Diffstat (limited to 'src/mesa/shader/prog_instruction.h')
| -rw-r--r-- | src/mesa/shader/prog_instruction.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/shader/prog_instruction.h b/src/mesa/shader/prog_instruction.h index 224350caac6..28c797a4ba8 100644 --- a/src/mesa/shader/prog_instruction.h +++ b/src/mesa/shader/prog_instruction.h @@ -97,8 +97,8 @@ #define COND_EQ 2 /**< equal to zero */ #define COND_LT 3 /**< less than zero */ #define COND_UN 4 /**< unordered (NaN) */ -#define COND_GE 5 /**< greater then or equal to zero */ -#define COND_LE 6 /**< less then or equal to zero */ +#define COND_GE 5 /**< greater than or equal to zero */ +#define COND_LE 6 /**< less than or equal to zero */ #define COND_NE 7 /**< not equal to zero */ #define COND_TR 8 /**< always true */ #define COND_FL 9 /**< always false */ |