From 455be7f6f6dfd80d36ffe42cf09618aef4c1f43e Mon Sep 17 00:00:00 2001 From: raysan5 Date: Thu, 21 Jan 2016 13:52:09 +0100 Subject: Try to implement GLAD support --- src/core.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/core.c') diff --git a/src/core.c b/src/core.c index 6e59e57b..d0c98cca 100644 --- a/src/core.c +++ b/src/core.c @@ -54,10 +54,15 @@ #include // Macros for reporting and retrieving error conditions through error codes #if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB) - #define GLEW_STATIC - #include // GLEW extensions loading lib - //#include "glad.h" // GLAD library: Manage OpenGL headers and extensions - + + #define GLEW_EXTENSIONS_LOADER + #if defined(GLEW_EXTENSIONS_LOADER) + #define GLEW_STATIC + #include // GLEW extensions loading lib + #elif defined(GLAD_EXTENSIONS_LOADER) + #include "glad.h" // GLAD library: Manage OpenGL headers and extensions + #endif + //#define GLFW_INCLUDE_NONE // Disable the standard OpenGL header inclusion on GLFW3 #include // GLFW3 library: Windows, OpenGL context and Input management @@ -1386,7 +1391,6 @@ static void InitDisplay(int width, int height) // Extensions initialization for OpenGL 3.3 if (rlGetVersion() == OPENGL_33) { - #define GLEW_EXTENSIONS_LOADER #if defined(GLEW_EXTENSIONS_LOADER) // Initialize extensions using GLEW glewExperimental = 1; // Needed for core profile @@ -1403,7 +1407,6 @@ static void InitDisplay(int width, int height) // NOTE: GLEW is a big library that loads ALL extensions, we can use some alternative to load only required ones // Alternatives: glLoadGen, glad, libepoxy - #elif defined(GLAD_EXTENSIONS_LOADER) // NOTE: glad is generated and contains only required OpenGL version and Core extensions //if (!gladLoadGL()) TraceLog(ERROR, "Failed to initialize glad\n"); -- cgit v1.2.3