diff options
| author | Dave Airlie <[email protected]> | 2008-05-28 10:03:10 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2008-05-28 10:03:10 +1000 |
| commit | 5552500cdfc4b97f5c824f6af1f8213c785693f9 (patch) | |
| tree | 593234de9e40c245e107b159357a3a3f94e55f09 /src/mesa/drivers/dri/r300/r500_fragprog.h | |
| parent | 8c39e24ec397200420146faa4f48672eadeac9b2 (diff) | |
r500: cleanup warnings and include files
Diffstat (limited to 'src/mesa/drivers/dri/r300/r500_fragprog.h')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r500_fragprog.h | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/src/mesa/drivers/dri/r300/r500_fragprog.h b/src/mesa/drivers/dri/r300/r500_fragprog.h index 404dbf3b7c5..5dd2def1c40 100644 --- a/src/mesa/drivers/dri/r300/r500_fragprog.h +++ b/src/mesa/drivers/dri/r300/r500_fragprog.h @@ -30,8 +30,8 @@ * Ben Skeggs <[email protected]> * Jerome Glisse <[email protected]> */ -#ifndef __R300_FRAGPROG_H_ -#define __R300_FRAGPROG_H_ +#ifndef __R500_FRAGPROG_H_ +#define __R500_FRAGPROG_H_ #include "glheader.h" #include "macros.h" @@ -41,12 +41,6 @@ #include "r300_context.h" -typedef struct r300_fragment_program_swizzle { - GLuint length; - GLuint src[4]; - GLuint inst[8]; -} r300_fragment_program_swizzle_t; - /* supported hw opcodes */ #define PFS_OP_MAD 0 #define PFS_OP_DP3 1 @@ -74,25 +68,6 @@ typedef struct r300_fragment_program_swizzle { #define SRC_MASK (63 << 0) #define SRC_STRIDE 6 -#define NOP_INST0 ( \ - (R300_FPI0_OUTC_MAD) | \ - (R300_FPI0_ARGC_ZERO << R300_FPI0_ARG0C_SHIFT) | \ - (R300_FPI0_ARGC_ZERO << R300_FPI0_ARG1C_SHIFT) | \ - (R300_FPI0_ARGC_ZERO << R300_FPI0_ARG2C_SHIFT)) -#define NOP_INST1 ( \ - ((0 | SRC_CONST) << R300_FPI1_SRC0C_SHIFT) | \ - ((0 | SRC_CONST) << R300_FPI1_SRC1C_SHIFT) | \ - ((0 | SRC_CONST) << R300_FPI1_SRC2C_SHIFT)) -#define NOP_INST2 ( \ - (R300_FPI2_OUTA_MAD) | \ - (R300_FPI2_ARGA_ZERO << R300_FPI2_ARG0A_SHIFT) | \ - (R300_FPI2_ARGA_ZERO << R300_FPI2_ARG1A_SHIFT) | \ - (R300_FPI2_ARGA_ZERO << R300_FPI2_ARG2A_SHIFT)) -#define NOP_INST3 ( \ - ((0 | SRC_CONST) << R300_FPI3_SRC0A_SHIFT) | \ - ((0 | SRC_CONST) << R300_FPI3_SRC1A_SHIFT) | \ - ((0 | SRC_CONST) << R300_FPI3_SRC2A_SHIFT)) - #define DRI_CONF_FP_OPTIMIZATION_SPEED 0 #define DRI_CONF_FP_OPTIMIZATION_QUALITY 1 @@ -101,7 +76,4 @@ struct r500_fragment_program; extern void r500TranslateFragmentShader(r300ContextPtr r300, struct r500_fragment_program *fp); -extern void r300TranslateFragmentShader(r300ContextPtr r300, - struct r300_fragment_program *fp); - #endif |