summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/r300/r300_emit.c
diff options
context:
space:
mode:
authorCorbin Simpson <MostAwesomeDude@gmail.com>2009-02-12 20:35:17 -0800
committerCorbin Simpson <MostAwesomeDude@gmail.com>2009-02-12 20:35:17 -0800
commit1d2c31df41d2a52b306fd65bbb6c800e993a2798 (patch)
treea7845c305822988dd5cc7e0800118b991f339892 /src/gallium/drivers/r300/r300_emit.c
parent92661bcbad13c8750f63e3a30b6c616d2f1094d3 (diff)
r300-gallium: Fix build errors.
Diffstat (limited to 'src/gallium/drivers/r300/r300_emit.c')
-rw-r--r--src/gallium/drivers/r300/r300_emit.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c
index a4d520a674..a3b2772e15 100644
--- a/src/gallium/drivers/r300/r300_emit.c
+++ b/src/gallium/drivers/r300/r300_emit.c
@@ -115,7 +115,7 @@ void r500_emit_fragment_shader(struct r300_context* r300,
{
CS_LOCALS(r300);
int i = 0;
- BEGIN_CS(11 + (shader->shader.instruction_count * 6));
+ BEGIN_CS(11 + (fs->instruction_count * 6));
OUT_CS_REG(R500_US_CONFIG, R500_ZERO_TIMES_ANYTHING_EQUALS_ZERO);
OUT_CS_REG(R500_US_PIXSIZE, fs->shader.stack_size);
OUT_CS_REG(R500_US_CODE_ADDR, R500_US_CODE_START_ADDR(0) |
@@ -123,14 +123,14 @@ void r500_emit_fragment_shader(struct r300_context* r300,
OUT_CS_REG(R500_GA_US_VECTOR_INDEX, R500_GA_US_VECTOR_INDEX_TYPE_INSTR);
OUT_CS_ONE_REG(R500_GA_US_VECTOR_DATA,
- shader->shader.instruction_count * 6);
- for (i = 0; i < shader->shader.instruction_count; i++) {
- OUT_CS(shader->instructions[i].inst0);
- OUT_CS(shader->instructions[i].inst1);
- OUT_CS(shader->instructions[i].inst2);
- OUT_CS(shader->instructions[i].inst3);
- OUT_CS(shader->instructions[i].inst4);
- OUT_CS(shader->instructions[i].inst5);
+ fs->instruction_count * 6);
+ for (i = 0; i < fs->instruction_count; i++) {
+ OUT_CS(fs->instructions[i].inst0);
+ OUT_CS(fs->instructions[i].inst1);
+ OUT_CS(fs->instructions[i].inst2);
+ OUT_CS(fs->instructions[i].inst3);
+ OUT_CS(fs->instructions[i].inst4);
+ OUT_CS(fs->instructions[i].inst5);
}
R300_PACIFY;
END_CS;