Mesa (master): r600: fix segfault in morph3d

[Alex Deucher]

Module: Mesa
Branch: master
Commit: 3b4235d4eb5818d0e57b768c66a28249ac5d853c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3b4235d4eb5818d0e57b768c66a28249ac5d853c

Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Jul 23 18:23:18 2009 -0400

r600: fix segfault in morph3d

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

---

 src/mesa/drivers/dri/r600/r700_vertprog.c |   34 ++++++++++++++--------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/mesa/drivers/dri/r600/r700_vertprog.c b/src/mesa/drivers/dri/r600/r700_vertprog.c
index f8d64f7..af6a6b8 100644
--- 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++)
 	{