Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-05 06:06:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge f40d085e3c into 85c6168bba

Browse Source
This commit is contained in:
Konstantin Käfer 2017-05-16 12:34:24 +00:00 committed by GitHub
commit 7673e51250
2 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
include/GLFW/glfw3.h
View File

@ -139,7 +139,32 @@ extern "C" {
/* Include the chosen client API headers. /* Include the chosen client API headers.
*/ */
#if defined(__APPLE__) #if defined(GLFW_INCLUDE_ES1)
#include <GLES/gl.h>
#if defined(GLFW_INCLUDE_GLEXT)
#include <GLES/glext.h>
#endif
#elif defined(GLFW_INCLUDE_ES2)
#include <GLES2/gl2.h>
#if defined(GLFW_INCLUDE_GLEXT)
#include <GLES2/gl2ext.h>
#endif
#elif defined(GLFW_INCLUDE_ES3)
#include <GLES3/gl3.h>
#if defined(GLFW_INCLUDE_GLEXT)
#include <GLES2/gl2ext.h>
#endif
#elif defined(GLFW_INCLUDE_ES31)
#include <GLES3/gl31.h>
#if defined(GLFW_INCLUDE_GLEXT)
#include <GLES2/gl2ext.h>
#endif
#elif defined(GLFW_INCLUDE_ES32)
#include <GLES3/gl32.h>
#if defined(GLFW_INCLUDE_GLEXT)
#include <GLES2/gl2ext.h>
#endif
#elif defined(__APPLE__)
#if defined(GLFW_INCLUDE_GLCOREARB) #if defined(GLFW_INCLUDE_GLCOREARB)
#include <OpenGL/gl3.h> #include <OpenGL/gl3.h>
#if defined(GLFW_INCLUDE_GLEXT) #if defined(GLFW_INCLUDE_GLEXT)
@ -157,31 +182,6 @@ extern "C" {
#else #else
#if defined(GLFW_INCLUDE_GLCOREARB) #if defined(GLFW_INCLUDE_GLCOREARB)
#include <GL/glcorearb.h> #include <GL/glcorearb.h>
#elif defined(GLFW_INCLUDE_ES1)
#include <GLES/gl.h>
#if defined(GLFW_INCLUDE_GLEXT)
#include <GLES/glext.h>
#endif
#elif defined(GLFW_INCLUDE_ES2)
#include <GLES2/gl2.h>
#if defined(GLFW_INCLUDE_GLEXT)
#include <GLES2/gl2ext.h>
#endif
#elif defined(GLFW_INCLUDE_ES3)
#include <GLES3/gl3.h>
#if defined(GLFW_INCLUDE_GLEXT)
#include <GLES2/gl2ext.h>
#endif
#elif defined(GLFW_INCLUDE_ES31)
#include <GLES3/gl31.h>
#if defined(GLFW_INCLUDE_GLEXT)
#include <GLES2/gl2ext.h>
#endif
#elif defined(GLFW_INCLUDE_ES32)
#include <GLES3/gl32.h>
#if defined(GLFW_INCLUDE_GLEXT)
#include <GLES2/gl2ext.h>
#endif
#elif !defined(GLFW_INCLUDE_NONE) #elif !defined(GLFW_INCLUDE_NONE)
#include <GL/gl.h> #include <GL/gl.h>
#if defined(GLFW_INCLUDE_GLEXT) #if defined(GLFW_INCLUDE_GLEXT)

2
src/cocoa_window.m
View File

@ -423,6 +423,8 @@ static const NSRange kEmptyRange = { NSNotFound, 0 };
- (id)makeBackingLayer - (id)makeBackingLayer
{ {
if (!window->ns.layer)
window->ns.layer = [super makeBackingLayer];
return window->ns.layer; return window->ns.layer;
} }