aboutsummaryrefslogtreecommitdiff
path: root/src/core.c
diff options
context:
space:
mode:
authorraysan5 <raysan5@gmail.com>2016-01-21 13:52:09 +0100
committerraysan5 <raysan5@gmail.com>2016-01-21 13:52:09 +0100
commit455be7f6f6dfd80d36ffe42cf09618aef4c1f43e (patch)
tree6f60e797693f6fae108475a0c50f737e846a84d4 /src/core.c
parent23d66e9b6f4ae26cded37878da37aabcb29e48ad (diff)
downloadraylib-455be7f6f6dfd80d36ffe42cf09618aef4c1f43e.tar.gz
raylib-455be7f6f6dfd80d36ffe42cf09618aef4c1f43e.zip
Try to implement GLAD support
Diffstat (limited to 'src/core.c')
-rw-r--r--src/core.c15
1 files changed, 9 insertions, 6 deletions
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 <errno.h> // Macros for reporting and retrieving error conditions through error codes
#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB)
- #define GLEW_STATIC
- #include <GL/glew.h> // 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 <GL/glew.h> // 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 <GLFW/glfw3.h> // 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");