diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-24 08:28:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-24 08:28:39 +0200 |
| commit | 0ebcd32e91486caccc041c8ca23e39e160b24702 (patch) | |
| tree | 50cd0bc17e8a587fdbecdf52be48fe8c59e222b9 /mesalib/src/mesa/main/ff_fragment_shader.cpp | |
| parent | 06d4ea68085558b94d8e9c937091e7b7fcc5d95a (diff) | |
| download | vcxsrv-0ebcd32e91486caccc041c8ca23e39e160b24702.tar.gz vcxsrv-0ebcd32e91486caccc041c8ca23e39e160b24702.tar.bz2 vcxsrv-0ebcd32e91486caccc041c8ca23e39e160b24702.zip | |
mesa pixman xserver git update 24 sep 2012
xserver: 7722bcbab2507d263c7685b15cccbfdd52fc3a24
pixman: c4b69e706e63e01fbc70e0026c2079007c89de14
mesa: c432c86e6aeebeb46c028af940224c59faa16e88
Diffstat (limited to 'mesalib/src/mesa/main/ff_fragment_shader.cpp')
| -rw-r--r-- | mesalib/src/mesa/main/ff_fragment_shader.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/src/mesa/main/ff_fragment_shader.cpp b/mesalib/src/mesa/main/ff_fragment_shader.cpp index e850d47dd..f21cf80ae 100644 --- a/mesalib/src/mesa/main/ff_fragment_shader.cpp +++ b/mesalib/src/mesa/main/ff_fragment_shader.cpp @@ -890,10 +890,10 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit) } else { float const_data[4] = { - 1 << rgb_shift, - 1 << rgb_shift, - 1 << rgb_shift, - 1 << alpha_shift + 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); |