summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker
diff options
context:
space:
mode:
authorDave Airlie <[email protected]>2016-05-10 15:53:48 +1000
committerDave Airlie <[email protected]>2016-05-11 06:55:09 +1000
commitd36d11ad907c93407d1e984ab0931337936a4a37 (patch)
tree4129b0ce17d5e602dbbc5402bd3ceab34f72a1a2 /src/mesa/state_tracker
parent07df3b81ffd86a399caf7d530fb4d2f8833fd76c (diff)
st/glsl_to_tgsi: attach image to correct instruction for samples
This fixes a crash (but not the test): GL45-CTS.shader_texture_image_samples_tests.functional_test Reviewed-by: Ilia Mirkin <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker')
-rw-r--r--src/mesa/state_tracker/st_glsl_to_tgsi.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index 6e9c19a6306..9cf204a3cac 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -3511,9 +3511,9 @@ glsl_to_tgsi_visitor::visit_image_intrinsic(ir_call *ir)
st_src_reg res = get_temp(glsl_type::ivec4_type);
st_dst_reg dstres = st_dst_reg(res);
dstres.writemask = WRITEMASK_W;
- emit_asm(ir, TGSI_OPCODE_RESQ, dstres);
+ inst = emit_asm(ir, TGSI_OPCODE_RESQ, dstres);
res.swizzle = SWIZZLE_WWWW;
- inst = emit_asm(ir, TGSI_OPCODE_MOV, dst, res);
+ emit_asm(ir, TGSI_OPCODE_MOV, dst, res);
} else {
st_src_reg arg1 = undef_src, arg2 = undef_src;
st_src_reg coord;