r300: fix compiler bugs introduced with MRT changes.
the first looks like a definite bug, the second I'm not so confident of but it works. Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
@@ -208,8 +208,8 @@ static void set_pair_instruction(struct r300_fragment_program_compiler *c,
|
||||
} else {
|
||||
for (i = 0; i < 4; i++) {
|
||||
if (inst->DstReg.Index == c->OutputColor[i]) {
|
||||
pair->RGB.Target = inst->DstReg.Index;
|
||||
pair->Alpha.Target = inst->DstReg.Index;
|
||||
pair->RGB.Target = i;
|
||||
pair->Alpha.Target = i;
|
||||
pair->RGB.OutputWriteMask |=
|
||||
inst->DstReg.WriteMask & RC_MASK_XYZ;
|
||||
pair->Alpha.OutputWriteMask |=
|
||||
|
@@ -221,6 +221,7 @@ static void translate_fragment_program(GLcontext *ctx, struct r300_fragment_prog
|
||||
compiler.state = fp->state;
|
||||
compiler.is_r500 = (r300->radeon.radeonScreen->chip_family >= CHIP_FAMILY_RV515) ? GL_TRUE : GL_FALSE;
|
||||
compiler.OutputDepth = FRAG_RESULT_DEPTH;
|
||||
memset(compiler.OutputColor, 0, 4 * sizeof(unsigned));
|
||||
compiler.OutputColor[0] = FRAG_RESULT_COLOR;
|
||||
compiler.AllocateHwInputs = &allocate_hw_inputs;
|
||||
|
||||
|
Reference in New Issue
Block a user