Don't call opengl from src/shader.c

j-w-c-b · SiegeLord · commit 36c59807cbcd · 2025-06-15T12:38:17.000-07:00
diff --git a/src/shader.c b/src/shader.c
@@ -418,11 +418,13 @@ char const *al_get_default_shader_source(ALLEGRO_SHADER_PLATFORM platform,
    bool use_gl3_shader = false;
 #ifdef ALLEGRO_MACOSX
    {
+      ALLEGRO_DISPLAY *display = al_get_current_display();
+
+
       /* Apple's glsl implementation supports either 1.20 shaders, or strictly
        * versioned 3.2+ shaders which do not use deprecated features.
        */
-      const char * shader_language = glGetString(GL_SHADING_LANGUAGE_VERSION);
-      if (strcmp(shader_language, "1.20") != 0) {
+      if (display && (display->flags & ALLEGRO_OPENGL_3_0)) {
          use_gl3_shader = true;
       }
    }

Original file line number	Diff line number	Diff line change
`@@ -418,11 +418,13 @@ char const *al_get_default_shader_source(ALLEGRO_SHADER_PLATFORM platform,`
`418`	`418`	`bool use_gl3_shader = false;`
`419`	`419`	`#ifdef ALLEGRO_MACOSX`
`420`	`420`	`{`
	`421`	`+ ALLEGRO_DISPLAY *display = al_get_current_display();`
	`422`	`+`
	`423`	`+`
`421`	`424`	`/* Apple's glsl implementation supports either 1.20 shaders, or strictly`
`422`	`425`	`* versioned 3.2+ shaders which do not use deprecated features.`
`423`	`426`	`*/`
`424`		`- const char * shader_language = glGetString(GL_SHADING_LANGUAGE_VERSION);`
`425`		`- if (strcmp(shader_language, "1.20") != 0) {`
	`427`	`+ if (display && (display->flags & ALLEGRO_OPENGL_3_0)) {`
`426`	`428`	`use_gl3_shader = true;`
`427`	`429`	`}`
`428`	`430`	`}`