Mesa (staging/21.3): r300: fix transformation of abs modifiers with negate

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: f2abcb8167a3feee9fba0c406f83d43b720aaf55
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f2abcb8167a3feee9fba0c406f83d43b720aaf55

Author: Pavel Ondračka <pavel.ondracka at gmail.com>
Date:   Mon Feb  7 16:49:38 2022 +0100

r300: fix transformation of abs modifiers with negate

It is being overwritten by the memset. Just set the only remaining
member RelAddr explicitly.

Signed-off-by: Pavel Ondračka <pavel.ondracka at gmail.com>
Reviewed-by: Filip Gawin <filip.gawin at zoho.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14915>
(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 91120cace61..c398548f66b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3406,7 +3406,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 f4ba0e1abae..93eec205ca4 100644
--- a/src/gallium/drivers/r300/compiler/r3xx_vertprog.c
+++ b/src/gallium/drivers/r300/compiler/r3xx_vertprog.c
@@ -703,10 +703,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;