diff options
| author | Ray <raysan5@gmail.com> | 2016-07-22 18:31:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-22 18:31:36 +0200 |
| commit | ab5d1df7cb2b932b0eeb0d6c478d75e9412881bd (patch) | |
| tree | 438e6c7a9c9a6082029a283937ded012cdf77a54 /src/rlgl.c | |
| parent | c482f37dfde9343ee1cc315153dcef80254c7a0b (diff) | |
| parent | 7921d85dc83483f039813b58366c9ea4b5db3d75 (diff) | |
| download | raylib-ab5d1df7cb2b932b0eeb0d6c478d75e9412881bd.tar.gz raylib-ab5d1df7cb2b932b0eeb0d6c478d75e9412881bd.zip | |
Merge pull request #149 from raysan5/master
Merge OSX changes into develop branch
Diffstat (limited to 'src/rlgl.c')
| -rw-r--r-- | src/rlgl.c | 16 |
1 files changed, 11 insertions, 5 deletions
@@ -1275,14 +1275,20 @@ void rlglLoadExtensions(void *loader) { #if defined(GRAPHICS_API_OPENGL_21) || defined(GRAPHICS_API_OPENGL_33) // NOTE: glad is generated and contains only required OpenGL 3.3 Core extensions (and lower versions) - if (!gladLoadGLLoader((GLADloadproc)loader)) TraceLog(WARNING, "GLAD: Cannot load OpenGL extensions"); - else TraceLog(INFO, "GLAD: OpenGL extensions loaded successfully"); + #ifndef __APPLE__ + if (!gladLoadGLLoader((GLADloadproc)loader)) TraceLog(WARNING, "GLAD: Cannot load OpenGL extensions"); + else TraceLog(INFO, "GLAD: OpenGL extensions loaded successfully"); + #endif #if defined(GRAPHICS_API_OPENGL_21) - if (GLAD_GL_VERSION_2_1) TraceLog(INFO, "OpenGL 2.1 profile supported"); + #ifndef __APPLE__ + if (GLAD_GL_VERSION_2_1) TraceLog(INFO, "OpenGL 2.1 profile supported"); + #endif #elif defined(GRAPHICS_API_OPENGL_33) - if(GLAD_GL_VERSION_3_3) TraceLog(INFO, "OpenGL 3.3 Core profile supported"); - else TraceLog(ERROR, "OpenGL 3.3 Core profile not supported"); + #ifndef __APPLE__ + if(GLAD_GL_VERSION_3_3) TraceLog(INFO, "OpenGL 3.3 Core profile supported"); + else TraceLog(ERROR, "OpenGL 3.3 Core profile not supported"); + #endif #endif // With GLAD, we can check if an extension is supported using the GLAD_GL_xxx booleans |