Skip to content
Snippets Groups Projects

Package swiftshader and gl4es

Closed Imported Package swiftshader and gl4es
swiftshader-glshim into master
Closed Imported Administrator requested to merge swiftshader-glshim into master
Compare
and
8 files
+ 480
− 0
Compare changes
  • Side-by-side
  • Inline
Files
8
main/gl4es/0001-Remove-stacktrace-code-to-support-musl.patch 0 → 100644
+ 89
− 0
From 46e1fcb8d71c7d1c27f1cdd6ffdc9d57fb02b8ef Mon Sep 17 00:00:00 2001
From: knuxify <knuxify@gmail.com>
Date: Wed, 1 Jul 2020 20:51:43 +0200
Subject: [PATCH] Remove stacktrace code to support musl
---
src/gl/init.c | 2 --
src/gl/init.h | 1 -
src/glx/glx.c | 25 +------------------------
3 files changed, 1 insertion(+), 27 deletions(-)
diff --git a/src/gl/init.c b/src/gl/init.c
index e5c5b49..a851fe5 100755
--- a/src/gl/init.c
+++ b/src/gl/init.c
@@ -92,8 +92,6 @@ void initialize_gl4es() {
}
env(LIBGL_XREFRESH, globals4es.xrefresh, "xrefresh will be called on cleanup");
- env(LIBGL_STACKTRACE, globals4es.stacktrace, "stacktrace will be printed on crash");
-
switch(ReturnEnvVarInt("LIBGL_FB")) {
case 1:
diff --git a/src/gl/init.h b/src/gl/init.h
index 43c5a18..40d1bed 100755
--- a/src/gl/init.h
+++ b/src/gl/init.h
@@ -9,7 +9,6 @@ typedef struct _globals4es {
int nobanner;
int mergelist;
int xrefresh;
- int stacktrace;
int usefb;
int usegbm;
int usefbo;
diff --git a/src/glx/glx.c b/src/glx/glx.c
index aae0b36..9ba90e8 100755
--- a/src/glx/glx.c
+++ b/src/glx/glx.c
@@ -1,9 +1,6 @@
#include "glx.h"
#include "../gl/init.h"
-#if !defined(ANDROID) && !defined(AMIGAOS4)
-#include <execinfo.h>
-#endif // !defined(ANDROID) && !defined(AMIGAOS4)
#include <fcntl.h>
#include "khash.h"
#ifdef USE_FBIO
@@ -454,26 +451,6 @@ static void signal_handler(int sig) {
#if defined(BCMHOST) && !defined(ANDROID)
rpi_fini();
-#endif
-#if !defined(ANDROID) && !defined(AMIGAOS4)
- if (globals4es.stacktrace) {
- switch (sig) {
- case SIGBUS:
- case SIGFPE:
- case SIGILL:
- case SIGSEGV: {
- void *array[10];
- size_t size = backtrace(array, 10);
- if (! size) {
- LOGD("No stacktrace. Compile with -funwind-tables.\n");
- } else {
- LOGD("Stacktrace: %zd\n", size);
- backtrace_symbols_fd(array, size, 2);
- }
- break;
- }
- }
- }
#endif
signal(sig, SIG_DFL);
raise(sig);
@@ -515,7 +492,7 @@ void glx_init() {
#endif
if(globals4es.usegbm)
atexit(CloseGBMFunctions);
- if (globals4es.xrefresh || globals4es.stacktrace)
+ if (globals4es.xrefresh)
{
// TODO: a bit gross. Maybe look at this: http://stackoverflow.com/a/13290134/293352
signal(SIGBUS, signal_handler);
--
2.27.0