fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 11:30:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: In emit_texenv() type mismatch was forced with typecast

Browse source 
Type mismatch caused random memory to be copied when casted
memory area was smaller than expected type.

Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Juha-Pekka Heikkila 2014-02-24 09:42:17 +02:00 • committed by Tapani Pälli
parent 6cd30f5d73
commit fe5224b16a
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/mesa/main/ff_fragment_shader.cpp
View file

@ -877,14 +877,15 @@ emit_texenv(texenv_fragment_program *p, GLuint unit)
shift = new(p->mem_ctx) ir_constant((float)(1 << rgb_shift));
}
else {
float const_data[4] = {
float(1 << rgb_shift),
float(1 << rgb_shift),
float(1 << rgb_shift),
float(1 << alpha_shift)
};
shift = new(p->mem_ctx) ir_constant(glsl_type::vec4_type,
(ir_constant_data *)const_data);
ir_constant_data const_data;
const_data.f[0] = float(1 << rgb_shift);
const_data.f[1] = float(1 << rgb_shift);
const_data.f[2] = float(1 << rgb_shift);
const_data.f[3] = float(1 << alpha_shift);
shift = new(p->mem_ctx) ir_constant(glsl_type::vec4_type,
&const_data);
}
return saturate(mul(deref, shift));