summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2021-01-13 02:14:07 -0500
committerMarge Bot <eric+marge@anholt.net>2021-01-16 08:03:14 +0000
commit55c42b7885701098cff9cc0fd0ffe08b0a90ea8b (patch)
treef4fa6d6d4a8921ca117134427fd6727e705a90e7
parent011fea1a90041838ad4f00dc880a231c3eca5dc8 (diff)
st/mesa: fix broken moves for u2i64 and related ops
These ops just put out mov's directly, which screws up the assignment logic -- it just tries to only process the "last" mov. Don't try to do the more optimized thing for 64-bit types, where this is just much trickier. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Reviewed-by: Dave Airlie <airlied@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8463>
-rw-r--r--src/mesa/state_tracker/st_glsl_to_tgsi.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index 740fb927f47..9e9289b41cb 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -3263,6 +3263,7 @@ glsl_to_tgsi_visitor::visit(ir_assignment *ir)
ir->rhs == ((glsl_to_tgsi_instruction *)this->instructions.get_tail())->ir &&
!((glsl_to_tgsi_instruction *)this->instructions.get_tail())->is_64bit_expanded &&
type_size(ir->lhs->type) == 1 &&
+ !ir->lhs->type->is_64bit() &&
l.writemask == ((glsl_to_tgsi_instruction *)this->instructions.get_tail())->dst[0].writemask) {
/* To avoid emitting an extra MOV when assigning an expression to a
* variable, emit the last instruction of the expression again, but