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

softpipe: fix integer texture swizzling for 1 vs 1.0f

Browse source 
The swizzling was putting float one in not integer 1.

This fixes a lot of arb_texture_view-rendering-formats cases.

Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Dave Airlie 2019-03-21 15:22:02 +10:00
parent aae5ba72ab
commit 9dd92d08a5
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gallium/drivers/softpipe/sp_tex_sample.c
View file

@ -2754,6 +2754,7 @@ do_swizzling(const struct pipe_sampler_view *sview,
const unsigned swizzle_g = sview->swizzle_g;
const unsigned swizzle_b = sview->swizzle_b;
const unsigned swizzle_a = sview->swizzle_a;
float oneval = util_format_is_pure_integer(sview->format) ? uif(1) : 1.0f;
switch (swizzle_r) {
case PIPE_SWIZZLE_0:
@ -2762,7 +2763,7 @@ do_swizzling(const struct pipe_sampler_view *sview,
break;
case PIPE_SWIZZLE_1:
for (j = 0; j < 4; j++)
out[0][j] = 1.0f;
out[0][j] = oneval;
break;
default:
assert(swizzle_r < 4);
@ -2777,7 +2778,7 @@ do_swizzling(const struct pipe_sampler_view *sview,
break;
case PIPE_SWIZZLE_1:
for (j = 0; j < 4; j++)
out[1][j] = 1.0f;
out[1][j] = oneval;
break;
default:
assert(swizzle_g < 4);
@ -2792,7 +2793,7 @@ do_swizzling(const struct pipe_sampler_view *sview,
break;
case PIPE_SWIZZLE_1:
for (j = 0; j < 4; j++)
out[2][j] = 1.0f;
out[2][j] = oneval;
break;
default:
assert(swizzle_b < 4);
@ -2807,7 +2808,7 @@ do_swizzling(const struct pipe_sampler_view *sview,
break;
case PIPE_SWIZZLE_1:
for (j = 0; j < 4; j++)
out[3][j] = 1.0f;
out[3][j] = oneval;
break;
default:
assert(swizzle_a < 4);