diff options
| author | Richard Li <richardradeon@gmail.com> | 2009-05-15 19:37:09 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-05-15 19:49:17 -0400 |
| commit | 2a7a2c6b77116fd475e1d05fb0adbd1702d11f77 (patch) | |
| tree | 916caec81f0b8eb28076fef190bc20832d04600f /src/mesa/drivers/dri/r600/r700_vertprog.c | |
| parent | e2dcebd2e6b2af6269a5ece6d6ced73ec8bb4a47 (diff) | |
Fix r6 code bugs.
Diffstat (limited to 'src/mesa/drivers/dri/r600/r700_vertprog.c')
| -rw-r--r-- | src/mesa/drivers/dri/r600/r700_vertprog.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/r600/r700_vertprog.c b/src/mesa/drivers/dri/r600/r700_vertprog.c index f0dfbe20f0..4d113e2e0b 100644 --- a/src/mesa/drivers/dri/r600/r700_vertprog.c +++ b/src/mesa/drivers/dri/r600/r700_vertprog.c @@ -360,7 +360,8 @@ GLboolean r700SetupVertexProgram(GLcontext * ctx) (context->chipobj.EmitShader)(ctx, &(vp->shaderbo), (GLvoid *)(vp->r700Shader.pProgram), - vp->r700Shader.uShaderBinaryDWORDSize); + vp->r700Shader.uShaderBinaryDWORDSize,
+ "VS"); vp->loaded = GL_TRUE; } @@ -405,18 +406,18 @@ GLboolean r700SetupVertexProgram(GLcontext * ctx) BEGIN_BATCH_NO_AUTOSTATE(unNumParamData + 2); - OUT_BATCH(CP_PACKET3(R600_IT_SET_ALU_CONST, unNumParamData)); + R600_OUT_BATCH(CP_PACKET3(R600_IT_SET_ALU_CONST, unNumParamData)); /* assembler map const from very beginning. */ - OUT_BATCH(SQ_ALU_CONSTANT_VS_OFFSET * 4); + R600_OUT_BATCH(SQ_ALU_CONSTANT_VS_OFFSET * 4); unNumParamData = paramList->NumParameters; for(ui=0; ui<unNumParamData; ui++) { - OUT_BATCH(*((unsigned int*)&(paramList->ParameterValues[ui][0]))); - OUT_BATCH(*((unsigned int*)&(paramList->ParameterValues[ui][1]))); - OUT_BATCH(*((unsigned int*)&(paramList->ParameterValues[ui][2]))); - OUT_BATCH(*((unsigned int*)&(paramList->ParameterValues[ui][3]))); + R600_OUT_BATCH(*((unsigned int*)&(paramList->ParameterValues[ui][0]))); + R600_OUT_BATCH(*((unsigned int*)&(paramList->ParameterValues[ui][1]))); + R600_OUT_BATCH(*((unsigned int*)&(paramList->ParameterValues[ui][2]))); + R600_OUT_BATCH(*((unsigned int*)&(paramList->ParameterValues[ui][3]))); } END_BATCH(); COMMIT_BATCH(); |