From 6cc0a3ed44d9dfd0cd9abcb3fb525515346bdc8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Ondra=C4=8Dka?= Date: Mon, 20 Jun 2022 22:17:21 +0200 Subject: [PATCH] r300: only run merge_movs pass on R500 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This pass currently generates some swizzles that the R300 and R400 hardware can't handle, make it R500 for now. Fixes: 6c2959c0 Signed-off-by: Pavel Ondračka Part-of: --- src/gallium/drivers/r300/compiler/radeon_optimize.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/r300/compiler/radeon_optimize.c b/src/gallium/drivers/r300/compiler/radeon_optimize.c index 019d7abf4cb..8d120984b89 100644 --- a/src/gallium/drivers/r300/compiler/radeon_optimize.c +++ b/src/gallium/drivers/r300/compiler/radeon_optimize.c @@ -979,8 +979,10 @@ void rc_optimize(struct radeon_compiler * c, void *user) continue; if (cur->U.I.Opcode == RC_OPCODE_MOV) { - if (merge_movs(c,cur)) - continue; + if (c->is_r500) { + if (merge_movs(c, cur)) + continue; + } copy_propagate(c, cur); /* cur may no longer be part of the program */ }