Mesa (staging/22.0): mesa: Drop dead #include "sparc/sparc.h"

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Jun 1 20:58:19 UTC 2022


Module: Mesa
Branch: staging/22.0
Commit: 48a2e73ae23abfd46d5e079282bfe3e9f6b645d3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=48a2e73ae23abfd46d5e079282bfe3e9f6b645d3

Author: Matt Turner <mattst88 at gmail.com>
Date:   Sun May 29 14:25:37 2022 -0400

mesa: Drop dead #include "sparc/sparc.h"

sparc.h was removed in when the classic drivers were removed. It only
contained a prototype for _mesa_init_all_sparc_transform_asm() which
wasn't even called by context.c. Remove the #include to fix the build on
sparc.

Fixes: e030d5ba8ac ("mesa: Delete libmesa_classic")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6425
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16765>
(cherry picked from commit 27f3fb5699e35cdaca29cd7309c4ac9a2fd21ff6)

---

 .pick_status.json       | 2 +-
 src/mesa/main/context.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 4f20b3ed52f..d8c5793bdf3 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1140,7 +1140,7 @@
         "description": "mesa: Drop dead #include \"sparc/sparc.h\"",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": "e030d5ba8ac321b4d75587d72a0a381bb906d70e"
     },
     {
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 7ad1a9fb533..99ef270e777 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -143,10 +143,6 @@
 #include "macros.h"
 #include "git_sha1.h"
 
-#ifdef USE_SPARC_ASM
-#include "sparc/sparc.h"
-#endif
-
 #include "compiler/glsl_types.h"
 #include "compiler/glsl/builtin_functions.h"
 #include "compiler/glsl/glsl_parser_extras.h"



More information about the mesa-commit mailing list