diff options
| author | marha <marha@users.sourceforge.net> | 2011-08-05 08:12:52 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-08-05 08:12:52 +0200 |
| commit | d105412503ea250e07d3cb008f10f60e6e48bf8a (patch) | |
| tree | 8601f1f1f77b22249cbfdecb20b52aa8bc69bd5a /mesalib/src/mesa/program/ir_to_mesa.cpp | |
| parent | 9b009a8bdb31d08e3d07f68416373b9aa6f85724 (diff) | |
| download | vcxsrv-d105412503ea250e07d3cb008f10f60e6e48bf8a.tar.gz vcxsrv-d105412503ea250e07d3cb008f10f60e6e48bf8a.tar.bz2 vcxsrv-d105412503ea250e07d3cb008f10f60e6e48bf8a.zip | |
mesa pixman git update 5 aug 2011
Diffstat (limited to 'mesalib/src/mesa/program/ir_to_mesa.cpp')
| -rw-r--r-- | mesalib/src/mesa/program/ir_to_mesa.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/src/mesa/program/ir_to_mesa.cpp b/mesalib/src/mesa/program/ir_to_mesa.cpp index 382cda0c7..debadb9a3 100644 --- a/mesalib/src/mesa/program/ir_to_mesa.cpp +++ b/mesalib/src/mesa/program/ir_to_mesa.cpp @@ -585,7 +585,7 @@ ir_to_mesa_visitor::src_reg_for_float(float val) src_reg src(PROGRAM_CONSTANT, -1, NULL); src.index = _mesa_add_unnamed_constant(this->prog->Parameters, - &val, 1, &src.swizzle); + (const gl_constant_value *)&val, 1, &src.swizzle); return src; } @@ -1795,7 +1795,7 @@ ir_to_mesa_visitor::visit(ir_constant *ir) src = src_reg(PROGRAM_CONSTANT, -1, NULL); src.index = _mesa_add_unnamed_constant(this->prog->Parameters, - values, + (gl_constant_value *) values, ir->type->vector_elements, &src.swizzle); emit(ir, OPCODE_MOV, mat_column, src); @@ -1833,7 +1833,7 @@ ir_to_mesa_visitor::visit(ir_constant *ir) this->result = src_reg(PROGRAM_CONSTANT, -1, ir->type); this->result.index = _mesa_add_unnamed_constant(this->prog->Parameters, - values, + (gl_constant_value *) values, ir->type->vector_elements, &this->result.swizzle); } @@ -2533,7 +2533,7 @@ add_uniforms_to_parameters_list(struct gl_shader_program *shader_program, */ if (file == PROGRAM_SAMPLER) { for (unsigned int j = 0; j < size / 4; j++) - prog->Parameters->ParameterValues[index + j][0] = next_sampler++; + prog->Parameters->ParameterValues[index + j][0].f = next_sampler++; } /* The location chosen in the Parameters list here (returned |