From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue, 15 Dec 2015 05:10:26 +0000 (-0800)
Subject: vec4/generator: Actually pass the sampler into generate_tex
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8224571ef80e58d0dd1f00f6ee91960ddca799fa;p=mesa.git

vec4/generator: Actually pass the sampler into generate_tex

This is an artifact of the way the separate samplers/textures series ended
up getting sent out and rebased.  This should fix a number of CTS tests
involving geometry shaders.
---

diff --git a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
index 205a86d597a..3299843bfa9 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
@@ -1341,7 +1341,7 @@ generate_code(struct brw_codegen *p,
       case SHADER_OPCODE_TG4:
       case SHADER_OPCODE_TG4_OFFSET:
       case SHADER_OPCODE_SAMPLEINFO:
-         generate_tex(p, prog_data, inst, dst, src[0], src[1], src[1]);
+         generate_tex(p, prog_data, inst, dst, src[0], src[1], src[2]);
          break;
 
       case VS_OPCODE_URB_WRITE: