Mesa (staging/21.1): sparc: Avoid some redefinition warnings

[GitLab Mirror]

Module: Mesa
Branch: staging/21.1
Commit: 9f2d803317b49da5544ad0125f7beb570f541f68
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9f2d803317b49da5544ad0125f7beb570f541f68

Author: Matt Turner <mattst88 at gmail.com>
Date:   Tue Jun  1 14:38:19 2021 -0700

sparc: Avoid some redefinition warnings

These definitions are provided by m_vector_asm.h now.

Fixes: 67ffb853f05 ("sparc: Reuse m_vector_asm.h.")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11119>
(cherry picked from commit c460f3806d3ebecd103e6ad6cb82839e7217c768)

---

 .pick_status.json             | 2 +-
 src/mesa/sparc/sparc_clip.S   | 5 -----
 src/mesa/sparc/sparc_matrix.h | 5 -----
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 372e4ba7c07..5bca2eec712 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1624,7 +1624,7 @@
         "description": "sparc: Avoid some redefinition warnings",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "67ffb853f05eb24222970261018f6ed0982e6be4"
     },
diff --git a/src/mesa/sparc/sparc_clip.S b/src/mesa/sparc/sparc_clip.S
index 11aa8324ec2..a034acb2d00 100644
--- a/src/mesa/sparc/sparc_clip.S
+++ b/src/mesa/sparc/sparc_clip.S
@@ -12,11 +12,6 @@
 #include "math/m_vector_asm.h"
 #endif
 
-#define VEC_SIZE_1   	1
-#define VEC_SIZE_2   	3
-#define VEC_SIZE_3   	7
-#define VEC_SIZE_4   	15
-
         .register %g2, #scratch
         .register %g3, #scratch
 
diff --git a/src/mesa/sparc/sparc_matrix.h b/src/mesa/sparc/sparc_matrix.h
index d478b76802f..41f59bba0d6 100644
--- a/src/mesa/sparc/sparc_matrix.h
+++ b/src/mesa/sparc/sparc_matrix.h
@@ -15,11 +15,6 @@
 #include "math/m_vector_asm.h"
 #endif
 
-#define VEC_SIZE_1   	1
-#define VEC_SIZE_2   	3
-#define VEC_SIZE_3   	7
-#define VEC_SIZE_4   	15
-
 #define M0		%f16
 #define M1		%f17
 #define M2		%f18