r600: fix segfault in morph3d

These attributes still need work, but it shouldn't hurt to
enable them.

diff --git a/src/mesa/drivers/dri/r600/r700_vertprog.c b/src/mesa/drivers/dri/r600/r700_vertprog.c
index f8d64f71d0b1908ad80777da43fc32c1cdf487af..af6a6b8c2958cabb3a496a65a0e49e3e1d60aa61 100644 (file)
--- a/src/mesa/drivers/dri/r600/r700_vertprog.c
+++ b/src/mesa/drivers/dri/r600/r700_vertprog.c
@@ -52,7 +52,7 @@ unsigned int Map_Vertex_Output(r700_AssemblerBase       *pAsm,
        unsigned int unBit;
        unsigned int unTotal = unStart;
 
-    //!!!!!!! THE ORDER MATCH FS INPUT 
+    //!!!!!!! THE ORDER MATCH FS INPUT
 
        unBit = 1 << VERT_RESULT_HPOS;
        if(mesa_vp->Base.OutputsWritten & unBit)
@@ -73,17 +73,17 @@ unsigned int Map_Vertex_Output(r700_AssemblerBase       *pAsm,
        }
 
        //TODO : dealing back face.
-       //unBit = 1 << VERT_RESULT_BFC0;
-       //if(mesa_vp->Base.OutputsWritten & unBit)
-       //{
-       //      pAsm->ucVP_OutputMap[VERT_RESULT_COL0] = unTotal++;
-       //}
-
-       //unBit = 1 << VERT_RESULT_BFC1;
-       //if(mesa_vp->Base.OutputsWritten & unBit)
-       //{
-       //      pAsm->ucVP_OutputMap[VERT_RESULT_COL1] = unTotal++;
-       //}
+       unBit = 1 << VERT_RESULT_BFC0;
+       if(mesa_vp->Base.OutputsWritten & unBit)
+       {
+               pAsm->ucVP_OutputMap[VERT_RESULT_BFC0] = unTotal++;
+       }
+
+       unBit = 1 << VERT_RESULT_BFC1;
+       if(mesa_vp->Base.OutputsWritten & unBit)
+       {
+               pAsm->ucVP_OutputMap[VERT_RESULT_BFC1] = unTotal++;
+       }
 
        //TODO : dealing fog.
        unBit = 1 << VERT_RESULT_FOGC;
@@ -93,11 +93,11 @@ unsigned int Map_Vertex_Output(r700_AssemblerBase       *pAsm,
        }
 
        //TODO : dealing point size.
-       //unBit = 1 << VERT_RESULT_PSIZ;
-       //if(mesa_vp->Base.OutputsWritten & unBit)
-       //{
-       //      pAsm->ucVP_OutputMap[VERT_RESULT_PSIZ] = unTotal++;
-       //}
+       unBit = 1 << VERT_RESULT_PSIZ;
+       if(mesa_vp->Base.OutputsWritten & unBit)
+       {
+               pAsm->ucVP_OutputMap[VERT_RESULT_PSIZ] = unTotal++;
+       }
 
        for(i=0; i<8; i++)
        {