From d36d11ad907c93407d1e984ab0931337936a4a37 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 10 May 2016 15:53:48 +1000 Subject: 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 Signed-off-by: Dave Airlie --- src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 4 ++-- 1 file 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; -- cgit v1.2.3