r300: Enable the vertprog point size again.

diff --git a/src/mesa/drivers/dri/r300/r300_emit.c b/src/mesa/drivers/dri/r300/r300_emit.c
index 6da22f6..424bf44 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_emit.c
+++ b/src/mesa/drivers/dri/r300/r300_emit.c
@@ -308,10 +308,10 @@ GLuint r300VAPOutputCntl0(GLcontext * ctx, GLuint OutputsWritten)
 
 #if 0
        if (OutputsWritten & (1 << VERT_RESULT_FOGC)) ;
+#endif
 
        if (OutputsWritten & (1 << VERT_RESULT_PSIZ))
                ret |= R300_VAP_OUTPUT_VTX_FMT_0__PT_SIZE_PRESENT;
-#endif
 
        return ret;
 }

diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.c b/src/mesa/drivers/dri/r300/r300_vertprog.c
index 7d8ac4c..313d0b2 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_vertprog.c
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.c
@@ -924,11 +924,14 @@ static void t_inputs_outputs(struct r300_vertex_program *vp)
 
        assert(vp->key.OutputsWritten & (1 << VERT_RESULT_HPOS));
 
-       /* Assign outputs */
        if (vp->key.OutputsWritten & (1 << VERT_RESULT_HPOS)) {
                vp->outputs[VERT_RESULT_HPOS] = cur_reg++;
        }
 
+       if (vp->key.OutputsWritten & (1 << VERT_RESULT_PSIZ)) {
+               vp->outputs[VERT_RESULT_PSIZ] = cur_reg++;
+       }
+
        if (vp->key.OutputsWritten & (1 << VERT_RESULT_COL0)) {
                vp->outputs[VERT_RESULT_COL0] = cur_reg++;
        }
@@ -954,10 +957,6 @@ static void t_inputs_outputs(struct r300_vertex_program *vp)
        if (vp->key.OutputsWritten & (1 << VERT_RESULT_FOGC)) {
                vp->outputs[VERT_RESULT_FOGC] = cur_reg++;
        }
-
-       if (vp->key.OutputsWritten & (1 << VERT_RESULT_PSIZ)) {
-               vp->outputs[VERT_RESULT_PSIZ] = cur_reg++;
-       }
 #endif
 
        for (i = VERT_RESULT_TEX0; i <= VERT_RESULT_TEX7; i++) {