r300-gallium: r300 passthrough shader, static shader objects, and clear code.

1 files changed, 4 insertions, 47 deletions

diff --git a/src/gallium/drivers/r300/r300_state_shader.c b/src/gallium/drivers/r300/r300_state_shader.c
index 824dbeb0aa2..352cb62df74 100644
--- a/src/gallium/drivers/r300/r300_state_shader.c
+++ b/src/gallium/drivers/r300/r300_state_shader.c
@@ -22,59 +22,16 @@
 
 #include "r300_state_shader.h"
 
-void r300_make_passthrough_fragment_shader(struct r300_fragment_shader* fs)
-{
-    fs->alu_instruction_count = 1;
-    fs->tex_instruction_count = 0;
-    fs->indirections = 1;
-    fs->shader.stack_size = 2;
-
-    /* XXX decode these */
-    fs->instructions[0].alu_rgb_inst = 0x50A80;
-    fs->instructions[0].alu_rgb_inst = 0x1C000000;
-    fs->instructions[0].alu_alpha_inst = 0x40889;
-    fs->instructions[0].alu_alpha_inst = 0x1000000;
-}
-
-void r500_make_passthrough_fragment_shader(struct r500_fragment_shader* fs)
-{
-    fs->instruction_count = 1;
-    fs->shader.stack_size = 0;
-
-    fs->instructions[0].inst0 = R500_INST_TYPE_OUT |
-        R500_INST_TEX_SEM_WAIT |
-        R500_INST_LAST |
-        R500_INST_RGB_OMASK_RGB | R500_INST_ALPHA_OMASK |
-        R500_INST_RGB_CLAMP | R500_INST_ALPHA_CLAMP;
-    fs->instructions[0].inst1 =
-        R500_RGB_ADDR0(0) | R500_RGB_ADDR1(0) | R500_RGB_ADDR1_CONST |
-        R500_RGB_ADDR2(0) | R500_RGB_ADDR2_CONST;
-    fs->instructions[0].inst2 =
-        R500_ALPHA_ADDR0(0) | R500_ALPHA_ADDR1(0) | R500_ALPHA_ADDR1_CONST |
-        R500_ALPHA_ADDR2(0) | R500_ALPHA_ADDR2_CONST;
-    fs->instructions[0].inst3 =
-        R500_ALU_RGB_SEL_A_SRC0 | R500_ALU_RGB_R_SWIZ_A_R |
-        R500_ALU_RGB_G_SWIZ_A_G | R500_ALU_RGB_B_SWIZ_A_B |
-        R500_ALU_RGB_SEL_B_SRC0 | R500_ALU_RGB_R_SWIZ_B_R |
-        R500_ALU_RGB_B_SWIZ_B_G | R500_ALU_RGB_G_SWIZ_B_B;
-    fs->instructions[0].inst4 =
-        R500_ALPHA_OP_CMP | R500_ALPHA_SWIZ_A_A | R500_ALPHA_SWIZ_B_A;
-    fs->instructions[0].inst5 =
-        R500_ALU_RGBA_OP_CMP | R500_ALU_RGBA_R_SWIZ_0 |
-        R500_ALU_RGBA_G_SWIZ_0 | R500_ALU_RGBA_B_SWIZ_0 |
-        R500_ALU_RGBA_A_SWIZ_0;
-
-    fs->shader.translated = true;
-}
-
 void r300_translate_shader(struct r300_context* r300,
                            struct r300_fragment_shader* fs)
 {
-    r300_make_passthrough_fragment_shader(fs);
+    /* XXX fix this at some point */
+    *fs = r300_passthrough_fragment_shader;
 }
 
 void r500_translate_shader(struct r300_context* r300,
                            struct r500_fragment_shader* fs)
 {
-    r500_make_passthrough_fragment_shader(fs);
+    /* XXX fix this at some point */
+    *fs = r500_passthrough_fragment_shader;
 }