From 7ba0db7afd8339428a21229cb06cbb67acc2e1ff Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sun, 29 May 2022 14:25:37 -0400 Subject: [PATCH] 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: (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 240a32564c5..9dbeaa22b88 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1282,7 +1282,7 @@ "description": "mesa: Drop dead #include \"sparc/sparc.h\"", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "e030d5ba8ac321b4d75587d72a0a381bb906d70e" }, diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 8e623d68c30..d4a0bcf1d41 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"