Silence Apple GL deprecation warnings and cleanup gl context on shutdown

etfdevs · May 1, 2024 · 30b4aec · 30b4aec
1 parent 8917c69
commit 30b4aec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/renderer/qgl.h b/src/renderer/qgl.h
@@ -47,6 +47,7 @@ If you have questions concerning this license or the applicable additional terms
 #include <GL/gl.h>
 #include <GL/glx.h>
 #elif defined(__APPLE__)
+#define GL_SILENCE_DEPRECATION
 #include <OpenGL/gl.h>
 #endif
 

diff --git a/src/sdl/sdl_glimp.c b/src/sdl/sdl_glimp.c
@@ -65,6 +65,13 @@ void GLimp_Shutdown( qboolean unloadDLL )
 {
 	IN_Shutdown();
 
+	// Destroy existing state if it exists
+	if ( SDL_glContext != NULL )
+	{
+		SDL_GL_DeleteContext( SDL_glContext );
+		SDL_glContext = NULL;
+	}
+
 	SDL_DestroyWindow( SDL_window );
 	SDL_window = NULL;