fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 06:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r200, r600c, i965: fix build

Browse source
This commit is contained in:
Bryan Cain 2011-06-30 13:42:37 -05:00
parent 9c2810103d
commit 54db6e618e
7 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/brw_fs.cpp
View file

@ -605,7 +605,7 @@ fs_visitor::setup_paramvalues_refs()
/* Set up the pointers to ParamValues now that that array is finalized. */
for (unsigned int i = 0; i < c->prog_data.nr_params; i++) {
c->prog_data.param[i] =
fp->Base.Parameters->ParameterValues[this->param_index[i]] +
(const float *)fp->Base.Parameters->ParameterValues[this->param_index[i]] +
this->param_offset[i];
}
}

2
src/mesa/drivers/dri/i965/brw_vs_emit.c
View file

@ -1359,7 +1359,7 @@ get_src_reg( struct brw_vs_compile *c,
if (component >= 0) {
params = c->vp->program.Base.Parameters;
f = params->ParameterValues[src->Index][component];
f = params->ParameterValues[src->Index][component].f;
if (src->Abs)
f = fabs(f);

8
src/mesa/drivers/dri/r200/r200_vertprog.c
View file

@ -126,10 +126,10 @@ static GLboolean r200VertexProgUpdateParams(struct gl_context *ctx, struct r200_
case PROGRAM_NAMED_PARAM:
//fprintf(stderr, "%s", vp->Parameters->Parameters[pi].Name);
case PROGRAM_CONSTANT:
*fcmd++ = paramList->ParameterValues[pi][0];
*fcmd++ = paramList->ParameterValues[pi][1];
*fcmd++ = paramList->ParameterValues[pi][2];
*fcmd++ = paramList->ParameterValues[pi][3];
*fcmd++ = paramList->ParameterValues[pi][0].f;
*fcmd++ = paramList->ParameterValues[pi][1].f;
*fcmd++ = paramList->ParameterValues[pi][2].f;
*fcmd++ = paramList->ParameterValues[pi][3].f;
break;
default:
_mesa_problem(NULL, "Bad param type in %s", __FUNCTION__);

8
src/mesa/drivers/dri/r600/evergreen_fragprog.c
View file

@ -752,10 +752,10 @@ GLboolean evergreenSetupFPconstants(struct gl_context * ctx)
unNumParamData = paramList->NumParameters;
for(ui=0; ui<unNumParamData; ui++) {
evergreen->ps.consts[ui][0].f32All = paramList->ParameterValues[ui][0];
evergreen->ps.consts[ui][1].f32All = paramList->ParameterValues[ui][1];
evergreen->ps.consts[ui][2].f32All = paramList->ParameterValues[ui][2];
evergreen->ps.consts[ui][3].f32All = paramList->ParameterValues[ui][3];
evergreen->ps.consts[ui][0].f32All = paramList->ParameterValues[ui][0].f;
evergreen->ps.consts[ui][1].f32All = paramList->ParameterValues[ui][1].f;
evergreen->ps.consts[ui][2].f32All = paramList->ParameterValues[ui][2].f;
evergreen->ps.consts[ui][3].f32All = paramList->ParameterValues[ui][3].f;
}
/* alloc multiple of 16 constants */

16
src/mesa/drivers/dri/r600/evergreen_vertprog.c
View file

@ -684,17 +684,17 @@ GLboolean evergreenSetupVPconstants(struct gl_context * ctx)
for(ui=0; ui<unNumParamData; ui++) {
if(paramList->Parameters[ui].Type == PROGRAM_UNIFORM)
{
evergreen->vs.consts[ui][0].f32All = paramListOrginal->ParameterValues[ui][0];
evergreen->vs.consts[ui][1].f32All = paramListOrginal->ParameterValues[ui][1];
evergreen->vs.consts[ui][2].f32All = paramListOrginal->ParameterValues[ui][2];
evergreen->vs.consts[ui][3].f32All = paramListOrginal->ParameterValues[ui][3];
evergreen->vs.consts[ui][0].f32All = paramListOrginal->ParameterValues[ui][0].f;
evergreen->vs.consts[ui][1].f32All = paramListOrginal->ParameterValues[ui][1].f;
evergreen->vs.consts[ui][2].f32All = paramListOrginal->ParameterValues[ui][2].f;
evergreen->vs.consts[ui][3].f32All = paramListOrginal->ParameterValues[ui][3].f;
}
else
{
evergreen->vs.consts[ui][0].f32All = paramList->ParameterValues[ui][0];
evergreen->vs.consts[ui][1].f32All = paramList->ParameterValues[ui][1];
evergreen->vs.consts[ui][2].f32All = paramList->ParameterValues[ui][2];
evergreen->vs.consts[ui][3].f32All = paramList->ParameterValues[ui][3];
evergreen->vs.consts[ui][0].f32All = paramList->ParameterValues[ui][0].f;
evergreen->vs.consts[ui][1].f32All = paramList->ParameterValues[ui][1].f;
evergreen->vs.consts[ui][2].f32All = paramList->ParameterValues[ui][2].f;
evergreen->vs.consts[ui][3].f32All = paramList->ParameterValues[ui][3].f;
}
}

8
src/mesa/drivers/dri/r600/r700_fragprog.c
View file

@ -778,10 +778,10 @@ GLboolean r700SetupFragmentProgram(struct gl_context * ctx)
unNumParamData = paramList->NumParameters;
for(ui=0; ui<unNumParamData; ui++) {
r700->ps.consts[ui][0].f32All = paramList->ParameterValues[ui][0];
r700->ps.consts[ui][1].f32All = paramList->ParameterValues[ui][1];
r700->ps.consts[ui][2].f32All = paramList->ParameterValues[ui][2];
r700->ps.consts[ui][3].f32All = paramList->ParameterValues[ui][3];
r700->ps.consts[ui][0].f32All = paramList->ParameterValues[ui][0].f;
r700->ps.consts[ui][1].f32All = paramList->ParameterValues[ui][1].f;
r700->ps.consts[ui][2].f32All = paramList->ParameterValues[ui][2].f;
r700->ps.consts[ui][3].f32All = paramList->ParameterValues[ui][3].f;
}
/* Load fp constants to gpu */

16
src/mesa/drivers/dri/r600/r700_vertprog.c
View file

@ -720,17 +720,17 @@ GLboolean r700SetupVertexProgram(struct gl_context * ctx)
for(ui=0; ui<unNumParamData; ui++) {
if(paramList->Parameters[ui].Type == PROGRAM_UNIFORM)
{
r700->vs.consts[ui][0].f32All = paramListOrginal->ParameterValues[ui][0];
r700->vs.consts[ui][1].f32All = paramListOrginal->ParameterValues[ui][1];
r700->vs.consts[ui][2].f32All = paramListOrginal->ParameterValues[ui][2];
r700->vs.consts[ui][3].f32All = paramListOrginal->ParameterValues[ui][3];
r700->vs.consts[ui][0].f32All = paramListOrginal->ParameterValues[ui][0].f;
r700->vs.consts[ui][1].f32All = paramListOrginal->ParameterValues[ui][1].f;
r700->vs.consts[ui][2].f32All = paramListOrginal->ParameterValues[ui][2].f;
r700->vs.consts[ui][3].f32All = paramListOrginal->ParameterValues[ui][3].f;
}
else
{
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];
r700->vs.consts[ui][0].f32All = paramList->ParameterValues[ui][0].f;
r700->vs.consts[ui][1].f32All = paramList->ParameterValues[ui][1].f;
r700->vs.consts[ui][2].f32All = paramList->ParameterValues[ui][2].f;
r700->vs.consts[ui][3].f32All = paramList->ParameterValues[ui][3].f;
}
}