1 files changed, 54 insertions, 1 deletions

diff --git a/src/mesa/drivers/dri/r600/r700_vertprog.c b/src/mesa/drivers/dri/r600/r700_vertprog.c
index 6a2a09eaf1a..7ed4b7d2387 100644
--- a/src/mesa/drivers/dri/r600/r700_vertprog.c
+++ b/src/mesa/drivers/dri/r600/r700_vertprog.c
@@ -302,18 +302,23 @@ GLboolean Find_Instruction_Dependencies_vp(struct r700_vertex_program *vp,
 }
 
 struct r700_vertex_program* r700TranslateVertexShader(GLcontext *ctx,
 						      struct gl_vertex_program *mesa_vp)
 {
 	context_t *context = R700_CONTEXT(ctx);
+
+    R700_CHIP_CONTEXT *r700 = (R700_CHIP_CONTEXT*)(&context->hw);
+
 	struct r700_vertex_program *vp;
 	unsigned int i;
 
 	vp = calloc(1, sizeof(*vp));
 	vp->mesa_program = _mesa_clone_vertex_program(ctx, mesa_vp);
 
+    vp->constbo0 = NULL;
+
 	if (mesa_vp->IsPositionInvariant)
 	{
                 _mesa_insert_mvp_code(ctx, vp->mesa_program);
         }
 
 	for(i=0; i<context->nNumActiveAos; i++)
@@ -328,12 +333,24 @@ struct r700_vertex_program* r700TranslateVertexShader(GLcontext *ctx,
 	{
 		vp->r700AsmCode.bR6xx = 1;
 	}
 
 	//Init_Program
 	Init_r700_AssemblerBase(SPT_VP, &(vp->r700AsmCode), &(vp->r700Shader) );
+
+    if(GL_TRUE == r700->bShaderUseMemConstant)
+    {
+        vp->r700AsmCode.bUseMemConstant = GL_TRUE;
+    }
+    else
+    {
+        vp->r700AsmCode.bUseMemConstant = GL_FALSE;
+    }
+
+    vp->r700AsmCode.unAsic = 7;
+
 	Map_Vertex_Program(ctx, vp, vp->mesa_program );
 
 	if(GL_FALSE == Find_Instruction_Dependencies_vp(vp, vp->mesa_program))
 	{
 		return NULL;
 	}
@@ -573,12 +590,23 @@ void * r700GetActiveVpShaderBo(GLcontext * ctx)
     if (vp)
 	return vp->shaderbo;
     else
 	return NULL;
 }
 
+void * r700GetActiveVpShaderConstBo(GLcontext * ctx)
+{
+    context_t *context = R700_CONTEXT(ctx);
+    struct r700_vertex_program *vp = context->selected_vp;;
+
+    if (vp)
+	return vp->constbo0;
+    else
+	return NULL;
+}
+
 GLboolean r700SetupVertexProgram(GLcontext * ctx)
 {
     context_t *context = R700_CONTEXT(ctx);
     R700_CHIP_CONTEXT *r700 = (R700_CHIP_CONTEXT*)(&context->hw);
     struct r700_vertex_program *vp = context->selected_vp;
 
@@ -597,12 +625,25 @@ GLboolean r700SetupVertexProgram(GLcontext * ctx)
         r600EmitShader(ctx,
                        &(vp->shaderbo),
                        (GLvoid *)(vp->r700Shader.pProgram),
                        vp->r700Shader.uShaderBinaryDWORDSize,
                        "VS");
 
+        if(GL_TRUE == r700->bShaderUseMemConstant)
+        {
+            paramList = vp->mesa_program->Base.Parameters;
+            if(NULL != paramList)
+            {
+                unNumParamData = paramList->NumParameters;
+                r600AllocShaderConsts(ctx,
+                               &(vp->constbo0),                       
+                               unNumParamData *4*4,
+                               "VSCON");
+            }
+        }        
+
         vp->loaded = GL_TRUE;
     }
 
     DumpHwBinary(DUMP_VERTEX_SHADER, (GLvoid *)(vp->r700Shader.pProgram),
                  vp->r700Shader.uShaderBinaryDWORDSize);
 
@@ -613,13 +654,15 @@ GLboolean r700SetupVertexProgram(GLcontext * ctx)
     R600_STATECHANGE(context, vs);
     R600_STATECHANGE(context, fs); /* hack */
 
     r700->vs.SQ_PGM_RESOURCES_VS.u32All = 0;
     SETbit(r700->vs.SQ_PGM_RESOURCES_VS.u32All, PGM_RESOURCES__PRIME_CACHE_ON_DRAW_bit);
 
-    r700->vs.SQ_PGM_START_VS.u32All = 0; /* set from buffer object. */
+    r700->vs.SQ_ALU_CONST_CACHE_VS_0.u32All = 0; /* set from buffer object. */
+    
+    r700->vs.SQ_PGM_START_VS.u32All = 0;
 
     SETfield(r700->vs.SQ_PGM_RESOURCES_VS.u32All, vp->r700Shader.nRegs + 1,
              NUM_GPRS_shift, NUM_GPRS_mask);
 
     if(vp->r700Shader.uStackSize) /* we don't use branch for now, it should be zero. */
 	{
@@ -684,12 +727,22 @@ GLboolean r700SetupVertexProgram(GLcontext * ctx)
 		        r700->vs.consts[ui][0].f32All = paramList->ParameterValues[ui][0];
 		        r700->vs.consts[ui][1].f32All = paramList->ParameterValues[ui][1];
 		        r700->vs.consts[ui][2].f32All = paramList->ParameterValues[ui][2];
 		        r700->vs.consts[ui][3].f32All = paramList->ParameterValues[ui][3];
             }
 	    }
+
+        /* Load vp constants to gpu */
+        if(GL_TRUE == r700->bShaderUseMemConstant)
+        {
+            r600EmitShaderConsts(ctx,
+                           vp->constbo0,
+                           0,
+                           (GLvoid *)&(r700->vs.consts[0][0]),
+                           unNumParamData * 4 * 4);
+        }
     } else
 	    r700->vs.num_consts = 0;
 
     COMPILED_SUB * pCompiledSub;
     GLuint uj;
     GLuint unConstOffset = r700->vs.num_consts;