r300: Cleanup r300_fragment_program_code

[mesa.git] / src / mesa / drivers / dri / r300 / compiler / radeon_code.h

diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_code.h b/src/mesa/drivers/dri/r300/compiler/radeon_code.h
index 77bc19d8ff9eed89c7b58444b2eb9cde0d6d6bfc..6f5bc288316d1b7c9b5d122406511d9407b58d07 100644 (file)
--- a/src/mesa/drivers/dri/r300/compiler/radeon_code.h
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_code.h
@@ -136,18 +136,17 @@ struct r300_fragment_program_code {
        struct {
                int length; /**< total # of ALU instructions used */
                struct {
-                       uint32_t inst0;
-                       uint32_t inst1;
-                       uint32_t inst2;
-                       uint32_t inst3;
+                       uint32_t rgb_inst;
+                       uint32_t rgb_addr;
+                       uint32_t alpha_inst;
+                       uint32_t alpha_addr;
                } inst[R300_PFS_MAX_ALU_INST];
        } alu;
 
-       struct r300_fragment_program_node node[4];
-       int cur_node;
-       int first_node_has_tex;
-
-       int max_temp_idx;
+       uint32_t config; /* US_CONFIG */
+       uint32_t pixsize; /* US_PIXSIZE */
+       uint32_t code_offset; /* US_CODE_OFFSET */
+       uint32_t code_addr[4]; /* US_CODE_ADDR */
 };