diff options
| author | Kenneth Graunke <[email protected]> | 2011-12-06 12:39:54 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2011-12-18 11:59:52 -0800 |
| commit | c592ebc581e5ca0122660b3d76ec924b96581216 (patch) | |
| tree | d37486b7d1633ed0a902c2e8453b417980a57e6b | |
| parent | bb6fb7afd37e523256d1b8861b0d5e3030e31282 (diff) | |
i965/fs: Don't swizzle the results of textureSize().
Fixes a regression since d2235b0f4681f75d562131d655a6d7b7033d2d8b,
in my new textureSize sampler(1DArrayShadow|2DShadow|2DArrayShadow)
piglit tests, though I'm not honestly sure how this ever worked.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp index 208572784b8..718ca52cd7f 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp @@ -1235,6 +1235,9 @@ fs_visitor::swizzle_result(ir_texture *ir, fs_reg orig_val, int sampler) { this->result = orig_val; + if (ir->op == ir_txs) + return; + if (ir->type == glsl_type::float_type) { /* Ignore DEPTH_TEXTURE_MODE swizzling. */ assert(ir->sampler->type->sampler_shadow); |