RaySollium99/libpicofe
1
0
Fork 0
mirror of https://github.com/RaySollium99/libpicofe.git synced 2025-09-07 07:38:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sdl: don't try gl on remote displays

Browse source
This commit is contained in:
notaz 2021-10-31 17:16:02 +02:00
parent 39639dd1da
commit c668921a45
3 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gl.c
View file

@ -131,6 +131,11 @@ out:
return retval; return retval;
} }
void gl_announce(void)
{
printf("GL_RENDERER: %s\n", (char *)glGetString(GL_RENDERER));
}
static float vertices[] = { static float vertices[] = {
-1.0f, 1.0f, 0.0f, // 0 0 1 -1.0f, 1.0f, 0.0f, // 0 0 1
1.0f, 1.0f, 0.0f, // 1 ^ 1.0f, 1.0f, 0.0f, // 1 ^

8
gl.h
View file

@ -3,8 +3,9 @@
#ifdef HAVE_GLES #ifdef HAVE_GLES
int gl_init(void *display, void *window, int *quirks); int gl_init(void *display, void *window, int *quirks);
int gl_flip(const void *fb, int w, int h); void gl_announce(void);
int gl_flip(const void *fb, int w, int h);
void gl_finish(void); void gl_finish(void);
/* for external flips */ /* for external flips */
@ -17,6 +18,9 @@ static __inline int gl_init(void *display, void *window, int *quirks)
{ {
return -1; return -1;
} }
static void gl_announce(void)
{
}
static __inline int gl_flip(const void *fb, int w, int h) static __inline int gl_flip(const void *fb, int w, int h)
{ {
return -1; return -1;

18
plat_sdl.c
View file

@ -186,9 +186,11 @@ int plat_sdl_init(void)
static const char *vout_list[] = { NULL, NULL, NULL, NULL, NULL }; static const char *vout_list[] = { NULL, NULL, NULL, NULL, NULL };
const SDL_VideoInfo *info; const SDL_VideoInfo *info;
SDL_SysWMinfo wminfo; SDL_SysWMinfo wminfo;
const char *env;
int overlay_works = 0; int overlay_works = 0;
int gl_works = 0; int gl_works = 0;
int i, ret, h; int i, ret, h;
int try_gl;
ret = SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE); ret = SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE);
if (ret != 0) { if (ret != 0) {
@ -274,8 +276,22 @@ int plat_sdl_init(void)
(void)wminfo; (void)wminfo;
#endif #endif
ret = gl_init(display, window, &gl_quirks); ret = -1;
try_gl = 1;
env = getenv("DISPLAY");
if (env && env[0] != ':') {
fprintf(stderr, "looks like a remote DISPLAY, "
"not trying GL (use PICOFE_GL=1 to override)\n");
// because some drivers just kill the program with no way to recover
try_gl = 0;
}
env = getenv("PICOFE_GL");
if (env)
try_gl = atoi(env);
if (try_gl)
ret = gl_init(display, window, &gl_quirks);
if (ret == 0) { if (ret == 0) {
gl_announce();
gl_works = 1; gl_works = 1;
gl_finish(); gl_finish();
} }