From faa96094b4ef9954741493fe0d180e7039d6ba4a Mon Sep 17 00:00:00 2001 From: Clownacy Date: Fri, 17 Jan 2020 10:25:18 +0000 Subject: [PATCH] Use SDL's GetProcAddress function for OpenGL Also added extra sanity checks --- src/Backends/Rendering/OpenGL3.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Backends/Rendering/OpenGL3.cpp b/src/Backends/Rendering/OpenGL3.cpp index a46cfa1c..406b9305 100644 --- a/src/Backends/Rendering/OpenGL3.cpp +++ b/src/Backends/Rendering/OpenGL3.cpp @@ -288,7 +288,13 @@ Backend_Surface* Backend_Init(SDL_Window *p_window) context = SDL_GL_CreateContext(window); - if (!gladLoadGL()) + if (context == NULL) + return NULL; + + if (SDL_GL_MakeCurrent(window, context) < 0) + return NULL; + + if (!gladLoadGLLoader((GLADloadproc)SDL_GL_GetProcAddress)) return NULL; // Check if the platform supports OpenGL 3.2