r200/glsl/st/mesa: use common outputs written field

And set outputs written directly in shader_info.

st/mesa changes where:
Reviewed-by: Marek Olšák <[email protected]>

Reviewed-by: Jason Ekstrand <[email protected]>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/mesa/program/programopt.c b/src/mesa/program/programopt.c
index 3c9839bf248..b4bbbdae76b 100644
--- a/src/mesa/program/programopt.c
+++ b/src/mesa/program/programopt.c
@@ -108,7 +108,7 @@ _mesa_insert_mvp_dp4_code(struct gl_context *ctx, struct gl_program *vprog)
    vprog->Instructions = newInst;
    vprog->NumInstructions = newLen;
    vprog->info.inputs_read |= VERT_BIT_POS;
-   vprog->OutputsWritten |= BITFIELD64_BIT(VARYING_SLOT_POS);
+   vprog->info.outputs_written |= BITFIELD64_BIT(VARYING_SLOT_POS);
 }
 
 
@@ -209,7 +209,7 @@ _mesa_insert_mvp_mad_code(struct gl_context *ctx, struct gl_program *vprog)
    vprog->Instructions = newInst;
    vprog->NumInstructions = newLen;
    vprog->info.inputs_read |= VERT_BIT_POS;
-   vprog->OutputsWritten |= BITFIELD64_BIT(VARYING_SLOT_POS);
+   vprog->info.outputs_written |= BITFIELD64_BIT(VARYING_SLOT_POS);
 }
 
 
@@ -264,7 +264,7 @@ _mesa_append_fog_code(struct gl_context *ctx, struct gl_program *fprog,
       return;
    }
 
-   if (!(fprog->OutputsWritten & (1 << FRAG_RESULT_COLOR))) {
+   if (!(fprog->info.outputs_written & (1 << FRAG_RESULT_COLOR))) {
       /* program doesn't output color, so nothing to do */
       return;
    }
@@ -409,7 +409,7 @@ _mesa_append_fog_code(struct gl_context *ctx, struct gl_program *fprog,
    fprog->Instructions = newInst;
    fprog->NumInstructions = inst - newInst;
    fprog->info.inputs_read |= VARYING_BIT_FOGC;
-   assert(fprog->OutputsWritten & (1 << FRAG_RESULT_COLOR));
+   assert(fprog->info.outputs_written & (1 << FRAG_RESULT_COLOR));
 }