diff options
| author | Brian Paul <brianp@vmware.com> | 2010-12-14 13:01:00 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-12-14 13:01:03 -0700 |
| commit | c62bb90d6a864468fe1a717aebb9c1a9c43bf3c8 (patch) | |
| tree | 22fef0c50d5e49f8dcf379b224ecf2c023c99492 /src/gallium/drivers/softpipe/sp_tex_sample.h | |
| parent | be2aa81f5f8f44be8c9c8854098d29635352c4f8 (diff) | |
softpipe: do texture swizzle during texture sampling
Instead of when we read texture tiles. Now swizzling happens after
the shadow depth compare step. This fixes the piglit glsl-fs-shadow2d*
tests (except for proj+bias because of a GLSL bug).
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_tex_sample.h')
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_tex_sample.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gallium/drivers/softpipe/sp_tex_sample.h b/src/gallium/drivers/softpipe/sp_tex_sample.h index 6114acf737..0f471a9827 100644 --- a/src/gallium/drivers/softpipe/sp_tex_sample.h +++ b/src/gallium/drivers/softpipe/sp_tex_sample.h @@ -64,7 +64,11 @@ union sp_sampler_key { unsigned is_pot:1; unsigned processor:2; unsigned unit:4; - unsigned pad:22; + unsigned swizzle_r:3; + unsigned swizzle_g:3; + unsigned swizzle_b:3; + unsigned swizzle_a:3; + unsigned pad:10; } bits; unsigned value; }; @@ -113,6 +117,7 @@ struct sp_sampler_varient filter_func mip_filter; filter_func compare; + filter_func sample_target; /* Linked list: */ |