r300_fragprog: Remove dead declarations, move NOP declarations into source

diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.c b/src/mesa/drivers/dri/r300/r300_fragprog.c
index ba88b88..819615c 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_fragprog.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog.c
@@ -245,6 +245,26 @@ struct r300_pfs_compile_state {
 #define REG_NEGS(reg)                                                  \
        reg = (reg | REG_NEGS_MASK)
 
+#define NOP_INST0 (                                             \
+               (R300_ALU_OUTC_MAD) |                            \
+               (R300_ALU_ARGC_ZERO << R300_ALU_ARG0C_SHIFT) | \
+               (R300_ALU_ARGC_ZERO << R300_ALU_ARG1C_SHIFT) | \
+               (R300_ALU_ARGC_ZERO << R300_ALU_ARG2C_SHIFT))
+#define NOP_INST1 (                                         \
+               ((0 | SRC_CONST) << R300_ALU_SRC0C_SHIFT) | \
+               ((0 | SRC_CONST) << R300_ALU_SRC1C_SHIFT) | \
+               ((0 | SRC_CONST) << R300_ALU_SRC2C_SHIFT))
+#define NOP_INST2 ( \
+               (R300_ALU_OUTA_MAD) |                            \
+               (R300_ALU_ARGA_ZERO << R300_ALU_ARG0A_SHIFT) | \
+               (R300_ALU_ARGA_ZERO << R300_ALU_ARG1A_SHIFT) | \
+               (R300_ALU_ARGA_ZERO << R300_ALU_ARG2A_SHIFT))
+#define NOP_INST3 (                                         \
+               ((0 | SRC_CONST) << R300_ALU_SRC0A_SHIFT) | \
+               ((0 | SRC_CONST) << R300_ALU_SRC1A_SHIFT) | \
+               ((0 | SRC_CONST) << R300_ALU_SRC2A_SHIFT))
+
+
 /*
  * Datas structures for fragment program generation
  */

diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.h b/src/mesa/drivers/dri/r300/r300_fragprog.h
index 573aacf..561d7c6 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_fragprog.h
+++ b/src/mesa/drivers/dri/r300/r300_fragprog.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_ALU_OUTC_MAD) |                            \
-               (R300_ALU_ARGC_ZERO << R300_ALU_ARG0C_SHIFT) | \
-               (R300_ALU_ARGC_ZERO << R300_ALU_ARG1C_SHIFT) | \
-               (R300_ALU_ARGC_ZERO << R300_ALU_ARG2C_SHIFT))
-#define NOP_INST1 (                                         \
-               ((0 | SRC_CONST) << R300_ALU_SRC0C_SHIFT) | \
-               ((0 | SRC_CONST) << R300_ALU_SRC1C_SHIFT) | \
-               ((0 | SRC_CONST) << R300_ALU_SRC2C_SHIFT))
-#define NOP_INST2 ( \
-               (R300_ALU_OUTA_MAD) |                            \
-               (R300_ALU_ARGA_ZERO << R300_ALU_ARG0A_SHIFT) | \
-               (R300_ALU_ARGA_ZERO << R300_ALU_ARG1A_SHIFT) | \
-               (R300_ALU_ARGA_ZERO << R300_ALU_ARG2A_SHIFT))
-#define NOP_INST3 (                                         \
-               ((0 | SRC_CONST) << R300_ALU_SRC0A_SHIFT) | \
-               ((0 | SRC_CONST) << R300_ALU_SRC1A_SHIFT) | \
-               ((0 | SRC_CONST) << R300_ALU_SRC2A_SHIFT))
-
 #define DRI_CONF_FP_OPTIMIZATION_SPEED   0
 #define DRI_CONF_FP_OPTIMIZATION_QUALITY 1