Browse Source

intel: Fix warnings from gl_constant_parameter changes.

tags/mesa-8.0-rc1
Eric Anholt 14 years ago
parent
commit
a9e97d022c

+ 2
- 4
src/mesa/drivers/dri/i915/i915_fragprog.c View File

@@ -175,10 +175,8 @@ src_vector(struct i915_fragment_program *p,
case PROGRAM_STATE_VAR:
case PROGRAM_NAMED_PARAM:
case PROGRAM_UNIFORM:
src =
i915_emit_param4fv(p,
program->Base.Parameters->ParameterValues[source->
Index]);
src = i915_emit_param4fv(p,
&program->Base.Parameters->ParameterValues[source->Index][0].f);
break;

default:

+ 5
- 5
src/mesa/drivers/dri/i965/brw_wm_fp.c View File

@@ -535,15 +535,15 @@ static struct prog_src_register search_or_add_const4f( struct brw_wm_compile *c,
GLfloat s3)
{
struct gl_program_parameter_list *paramList = c->fp->program.Base.Parameters;
GLfloat values[4];
gl_constant_value values[4];
GLuint idx;
GLuint swizzle;
struct prog_src_register reg;

values[0] = s0;
values[1] = s1;
values[2] = s2;
values[3] = s3;
values[0].f = s0;
values[1].f = s1;
values[2].f = s2;
values[3].f = s3;

idx = _mesa_add_unnamed_constant( paramList, values, 4, &swizzle );
reg = src_reg(PROGRAM_STATE_VAR, idx);

+ 2
- 2
src/mesa/drivers/dri/i965/brw_wm_pass0.c View File

@@ -205,14 +205,14 @@ static const struct brw_wm_ref *pass0_get_reg( struct brw_wm_compile *c,
case PROGRAM_CONSTANT:
/* These are invarient:
*/
ref = get_const_ref(c, &plist->ParameterValues[idx][component]);
ref = get_const_ref(c, &plist->ParameterValues[idx][component].f);
break;

case PROGRAM_STATE_VAR:
case PROGRAM_UNIFORM:
/* These may change from run to run:
*/
ref = get_param_ref(c, &plist->ParameterValues[idx][component] );
ref = get_param_ref(c, &plist->ParameterValues[idx][component].f );
break;

default:

Loading…
Cancel
Save