diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-02 14:47:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-02 14:47:58 +0000 |
| commit | 7933658107276f9d5491f8736a743cf8f8bbd5f2 (patch) | |
| tree | f2893a761364e7abc9d934e9c5427e5cf5190c7a /mesalib/src/mesa/shader/prog_instruction.h | |
| parent | 83fa9a9811e2c18cffd83a020757f7fb51ffddaa (diff) | |
| download | vcxsrv-7933658107276f9d5491f8736a743cf8f8bbd5f2.tar.gz vcxsrv-7933658107276f9d5491f8736a743cf8f8bbd5f2.tar.bz2 vcxsrv-7933658107276f9d5491f8736a743cf8f8bbd5f2.zip | |
Updated to following packages:
mesa-7.8
Diffstat (limited to 'mesalib/src/mesa/shader/prog_instruction.h')
| -rw-r--r-- | mesalib/src/mesa/shader/prog_instruction.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesalib/src/mesa/shader/prog_instruction.h b/mesalib/src/mesa/shader/prog_instruction.h index 1c687bc16..28c797a4b 100644 --- a/mesalib/src/mesa/shader/prog_instruction.h +++ b/mesalib/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 */ @@ -312,7 +312,6 @@ struct prog_dst_register */ GLuint CondSrc:1; /*@}*/ - GLuint pad:28; }; |