From: Matt Turner <mattst88@gmail.com>
Date: Sun, 31 Mar 2013 04:26:57 +0000 (-0700)
Subject: i965/fs: Fix bad interaction between tex swizzles and textureQueryLOD.
X-Git-Tag: android-x86-4.4-r1~638
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e2b40e253b420933ebc504c7fd929168f2afe77d;p=android-x86%2Fexternal-mesa.git

i965/fs: Fix bad interaction between tex swizzles and textureQueryLOD.

Reported-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
index 8556b56439e..b6fc21849ad 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
@@ -1468,7 +1468,7 @@ fs_visitor::swizzle_result(ir_texture *ir, fs_reg orig_val, int sampler)
 {
    this->result = orig_val;
 
-   if (ir->op == ir_txs)
+   if (ir->op == ir_txs || ir->op == ir_lod)
       return;
 
    if (ir->type == glsl_type::float_type) {