From 7fe8cad4e447b32bdc3f27f25c3d3d6d48b552bc Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 5 Jul 2016 10:26:14 +1000 Subject: [PATCH 1/1] st/glsl_to_tgsi: fix st_src_reg_for_double constant. This needs to set the src swizzle so it doesn't access the .zw members ever when we are just emitting a 0 constant here. This fixes: vert-conversion-explicit-dvec3-bvec3.shader_test and a bunch of other fp64 tests on softpipe and radeonsi. Cc: Signed-off-by: Dave Airlie (cherry picked from commit 26187f3890cd92d6871ffb431763b27cacd8d4fe) --- src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 4587eda8170..54db9b101e5 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -1136,7 +1136,7 @@ glsl_to_tgsi_visitor::st_src_reg_for_double(double val) uval[0].u = *(uint32_t *)&val; uval[1].u = *(((uint32_t *)&val) + 1); src.index = add_constant(src.file, uval, 1, GL_DOUBLE, &src.swizzle); - + src.swizzle = MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, SWIZZLE_X, SWIZZLE_Y); return src; } -- 2.11.0