|
|
@ -1466,10 +1466,14 @@ namespace X11 { |
|
|
|
|
|
|
|
|
|
|
|
#if defined(__APPLE__) |
|
|
|
#if defined(__APPLE__) |
|
|
|
#define GL_SILENCE_DEPRECATION |
|
|
|
#define GL_SILENCE_DEPRECATION |
|
|
|
|
|
|
|
#define CALLSTYLE |
|
|
|
|
|
|
|
#define OGL_LOAD(t, n) n; |
|
|
|
|
|
|
|
#define GL_GLEXT_PROTOTYPES |
|
|
|
#include <OpenGL/OpenGL.h> |
|
|
|
#include <OpenGL/OpenGL.h> |
|
|
|
#include <OpenGL/gl.h> |
|
|
|
#include <OpenGl/gl3ext.h> |
|
|
|
|
|
|
|
#include <OpenGL/gl3.h> |
|
|
|
#include <OpenGL/glu.h> |
|
|
|
#include <OpenGL/glu.h> |
|
|
|
#define CALLSTYLE |
|
|
|
#include <OpenGL/gltypes.h> |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
#if defined(OLC_PLATFORM_EMSCRIPTEN) |
|
|
|
#if defined(OLC_PLATFORM_EMSCRIPTEN) |
|
|
@ -1529,10 +1533,18 @@ namespace olc |
|
|
|
#if defined(OLC_PLATFORM_EMSCRIPTEN) |
|
|
|
#if defined(OLC_PLATFORM_EMSCRIPTEN) |
|
|
|
typedef void CALLSTYLE locShaderSource_t(GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length); |
|
|
|
typedef void CALLSTYLE locShaderSource_t(GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length); |
|
|
|
typedef EGLBoolean(locSwapInterval_t)(EGLDisplay display, EGLint interval); |
|
|
|
typedef EGLBoolean(locSwapInterval_t)(EGLDisplay display, EGLint interval); |
|
|
|
#else |
|
|
|
|
|
|
|
#ifndef OLC_GFX_HEADLESS |
|
|
|
|
|
|
|
typedef void CALLSTYLE locShaderSource_t(GLuint shader, GLsizei count, const GLchar** string, const GLint* length); |
|
|
|
|
|
|
|
#endif |
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if defined(__APPLE__) |
|
|
|
|
|
|
|
typedef int EGLBoolean; |
|
|
|
|
|
|
|
typedef int32_t EGLint; |
|
|
|
|
|
|
|
typedef void *EGLDisplay; |
|
|
|
|
|
|
|
typedef void *EGLConfig; |
|
|
|
|
|
|
|
typedef void *EGLSurface; |
|
|
|
|
|
|
|
typedef void *EGLContext; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
typedef EGLBoolean(locSwapInterval_t)(EGLDisplay display, GLint interval); |
|
|
|
|
|
|
|
typedef void CALLSTYLE locShaderSource_t(GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length); |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
} // olc namespace
|
|
|
|
} // olc namespace
|
|
|
|