diff options
| author | Corbin Simpson <MostAwesomeDude@gmail.com> | 2009-02-13 08:14:42 -0800 |
|---|---|---|
| committer | Corbin Simpson <MostAwesomeDude@gmail.com> | 2009-02-13 08:18:26 -0800 |
| commit | 073a73e4c7344db46ab89862e2fbc267da34969c (patch) | |
| tree | 69d3a800d7586be53f4fa3617d7e8215ec82f63c /src/gallium/drivers/r300/r300_state_shader.h | |
| parent | c273dfe6a28d4bb64ce167685b4053d22db5a727 (diff) | |
r300-gallium: Various thingies.
Add formats to framebuffer emit, fix up shader function names,
make sure fragment format is emitted for r500.
Diffstat (limited to 'src/gallium/drivers/r300/r300_state_shader.h')
| -rw-r--r-- | src/gallium/drivers/r300/r300_state_shader.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/gallium/drivers/r300/r300_state_shader.h b/src/gallium/drivers/r300/r300_state_shader.h index 108f5ec085..1d5d9ee943 100644 --- a/src/gallium/drivers/r300/r300_state_shader.h +++ b/src/gallium/drivers/r300/r300_state_shader.h @@ -27,10 +27,10 @@ #include "r300_reg.h" #include "r300_screen.h" -void r300_translate_shader(struct r300_context* r300, +void r300_translate_fragment_shader(struct r300_context* r300, struct r300_fragment_shader* fs); -void r500_translate_shader(struct r300_context* r300, +void r500_translate_fragment_shader(struct r300_context* r300, struct r500_fragment_shader* fs); static const struct r300_fragment_shader r300_passthrough_fragment_shader = { @@ -41,12 +41,7 @@ static const struct r300_fragment_shader r300_passthrough_fragment_shader = { OUT_CS_REG(R300_US_CODE_ADDR_1, 0x0); OUT_CS_REG(R300_US_CODE_ADDR_2, 0x0); OUT_CS_REG(R300_US_CODE_ADDR_3, 0x400000); - OUT_CS_REG_SEQ(R300_US_OUT_FMT_0, 4); - OUT_CS(R300_C0_SEL_B | R300_C1_SEL_G | R300_C2_SEL_R | R300_C3_SEL_A); - OUT_CS(R300_US_OUT_FMT_UNUSED); - OUT_CS(R300_US_OUT_FMT_UNUSED); - OUT_CS(R300_US_OUT_FMT_UNUSED); - OUT_CS_REG(R300_US_W_FMT, R300_W_FMT_W0); */ +*/ .alu_instruction_count = 1, .tex_instruction_count = 0, .indirections = 1, |