mirrors/raylib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try to implement GLAD support

Browse Source
This commit is contained in:
raysan5 2016-01-21 13:52:09 +01:00
parent 23d66e9b6f
commit 455be7f6f6
3 changed files with 22066 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core.c
View File

@ -54,9 +54,14 @@
#include <errno.h> // Macros for reporting and retrieving error conditions through error codes #include <errno.h> // Macros for reporting and retrieving error conditions through error codes
#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB) #if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB)
#define GLEW_STATIC
#include <GL/glew.h> // GLEW extensions loading lib #define GLEW_EXTENSIONS_LOADER
//#include "glad.h" // GLAD library: Manage OpenGL headers and extensions #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 //#define GLFW_INCLUDE_NONE // Disable the standard OpenGL header inclusion on GLFW3
#include <GLFW/glfw3.h> // GLFW3 library: Windows, OpenGL context and Input management #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 // Extensions initialization for OpenGL 3.3
if (rlGetVersion() == OPENGL_33) if (rlGetVersion() == OPENGL_33)
{ {
#define GLEW_EXTENSIONS_LOADER
#if defined(GLEW_EXTENSIONS_LOADER) #if defined(GLEW_EXTENSIONS_LOADER)
// Initialize extensions using GLEW // Initialize extensions using GLEW
glewExperimental = 1; // Needed for core profile 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 // NOTE: GLEW is a big library that loads ALL extensions, we can use some alternative to load only required ones
// Alternatives: glLoadGen, glad, libepoxy // Alternatives: glLoadGen, glad, libepoxy
#elif defined(GLAD_EXTENSIONS_LOADER) #elif defined(GLAD_EXTENSIONS_LOADER)
// NOTE: glad is generated and contains only required OpenGL version and Core extensions // NOTE: glad is generated and contains only required OpenGL version and Core extensions
//if (!gladLoadGL()) TraceLog(ERROR, "Failed to initialize glad\n"); //if (!gladLoadGL()) TraceLog(ERROR, "Failed to initialize glad\n");

7813
src/glad.c Normal file
View File

File diff suppressed because one or more lines are too long

14244
src/glad.h Normal file
View File

File diff suppressed because one or more lines are too long