From b8e9c345d063c8283be9cb2e625f09e7de7ce47b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Ondra=C4=8Dka?= Date: Mon, 7 Feb 2022 16:49:38 +0100 Subject: [PATCH] r300: fix transformation of abs modifiers with negate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is being overwritten by the memset. Just set the only remaining member RelAddr explicitly. Signed-off-by: Pavel Ondračka Reviewed-by: Filip Gawin Cc: mesa-stable Part-of: (cherry picked from commit 1f5330de3a6c54faf7a0ed7485c72a2ce40ac744) --- .pick_status.json | 2 +- src/gallium/drivers/r300/compiler/r3xx_vertprog.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index f3cebbaf028..d1817a7e0d5 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -292,7 +292,7 @@ "description": "r300: fix transformation of abs modifiers with negate", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/r300/compiler/r3xx_vertprog.c b/src/gallium/drivers/r300/compiler/r3xx_vertprog.c index de0d98240f3..ea84ad17ece 100644 --- a/src/gallium/drivers/r300/compiler/r3xx_vertprog.c +++ b/src/gallium/drivers/r300/compiler/r3xx_vertprog.c @@ -688,10 +688,10 @@ static int transform_nonnative_modifiers( new_inst->U.I.SrcReg[1] = inst->U.I.SrcReg[i]; new_inst->U.I.SrcReg[1].Negate ^= RC_MASK_XYZW; - memset(&inst->U.I.SrcReg[i], 0, sizeof(inst->U.I.SrcReg[i])); inst->U.I.SrcReg[i].File = RC_FILE_TEMPORARY; inst->U.I.SrcReg[i].Index = temp; inst->U.I.SrcReg[i].Swizzle = RC_SWIZZLE_XYZW; + inst->U.I.SrcReg[i].RelAddr = 0; } } return 1;