Browse Source

external: some extensions got new GL entrypoints since last time.

pull/650/head
Vladimír Vondruš 2 years ago
parent
commit
d2141d0a8e
  1. 1
      src/MagnumExternal/OpenGL/GL/flextGL.cpp
  2. 2
      src/MagnumExternal/OpenGL/GL/flextGL.h
  3. 1
      src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp
  4. 2
      src/MagnumExternal/OpenGL/GLES3/flextGL.h
  5. 1
      src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h
  6. 1
      src/MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp
  7. 2
      src/MagnumExternal/OpenGL/GLES3/flextGLPlatformIOS.cpp
  8. 1
      src/MagnumExternal/OpenGL/GLES3/flextGLPlatformWindowsDesktop.cpp
  9. 2
      src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h

1
src/MagnumExternal/OpenGL/GL/flextGL.cpp vendored

@ -236,6 +236,7 @@ FlextGL flextGL{
/* GL_OVR_multiview */
nullptr,
nullptr,
/* GL_VERSION_1_0 */
glBlendFunc,

2
src/MagnumExternal/OpenGL/GL/flextGL.h vendored

@ -1910,6 +1910,7 @@ struct FlextGL {
/* GL_OVR_multiview */
void(APIENTRY *FramebufferTextureMultiviewOVR)(GLenum, GLenum, GLuint, GLint, GLint, GLsizei);
void(APIENTRY *NamedFramebufferTextureMultiviewOVR)(GLuint, GLenum, GLuint, GLint, GLint, GLsizei);
/* GL_VERSION_1_0 */
@ -2723,6 +2724,7 @@ extern FLEXTGL_EXPORT FlextGL flextGL;
/* GL_OVR_multiview */
#define glFramebufferTextureMultiviewOVR flextGL.FramebufferTextureMultiviewOVR
#define glNamedFramebufferTextureMultiviewOVR flextGL.NamedFramebufferTextureMultiviewOVR
/* GL_VERSION_1_0 */

1
src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp vendored

@ -200,6 +200,7 @@ void flextGLInit(Magnum::GL::Context& context) {
/* GL_OVR_multiview */
flextGL.FramebufferTextureMultiviewOVR = reinterpret_cast<void(APIENTRY*)(GLenum, GLenum, GLuint, GLint, GLint, GLsizei)>(loader.load("glFramebufferTextureMultiviewOVR"));
flextGL.NamedFramebufferTextureMultiviewOVR = reinterpret_cast<void(APIENTRY*)(GLuint, GLenum, GLuint, GLint, GLint, GLsizei)>(loader.load("glNamedFramebufferTextureMultiviewOVR"));
/* GL_VERSION_1_2 */
flextGL.CopyTexSubImage3D = reinterpret_cast<void(APIENTRY*)(GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei)>(loader.load("glCopyTexSubImage3D"));

2
src/MagnumExternal/OpenGL/GLES3/flextGL.h vendored

@ -2391,6 +2391,7 @@ struct FlextGL {
/* GL_OVR_multiview */
void(APIENTRY *FramebufferTextureMultiviewOVR)(GLenum, GLenum, GLuint, GLint, GLint, GLsizei);
void(APIENTRY *NamedFramebufferTextureMultiviewOVR)(GLuint, GLenum, GLuint, GLint, GLint, GLsizei);
};
extern FLEXTGL_EXPORT FlextGL flextGL;
@ -2765,6 +2766,7 @@ extern FLEXTGL_EXPORT FlextGL flextGL;
/* GL_OVR_multiview */
#define glFramebufferTextureMultiviewOVR flextGL.FramebufferTextureMultiviewOVR
#define glNamedFramebufferTextureMultiviewOVR flextGL.NamedFramebufferTextureMultiviewOVR
#ifdef __cplusplus
}

1
src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h vendored

@ -1208,6 +1208,7 @@ GLAPI void glGetBufferSubData(GLenum, GLintptr, GLsizeiptr, void *);
/* GL_OVR_multiview */
GLAPI void glFramebufferTextureMultiviewOVR(GLenum, GLenum, GLuint, GLint, GLint, GLsizei);
GLAPI void glNamedFramebufferTextureMultiviewOVR(GLuint, GLenum, GLuint, GLint, GLint, GLsizei);
#ifdef __cplusplus
}

1
src/MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp vendored

@ -365,4 +365,5 @@ void flextGLInit(Magnum::GL::Context&) {
/* GL_OVR_multiview */
flextGL.FramebufferTextureMultiviewOVR = reinterpret_cast<void(APIENTRY*)(GLenum, GLenum, GLuint, GLint, GLint, GLsizei)>(loader.load("glFramebufferTextureMultiviewOVR"));
flextGL.NamedFramebufferTextureMultiviewOVR = reinterpret_cast<void(APIENTRY*)(GLuint, GLenum, GLuint, GLint, GLint, GLsizei)>(loader.load("glNamedFramebufferTextureMultiviewOVR"));
}

2
src/MagnumExternal/OpenGL/GLES3/flextGLPlatformIOS.cpp vendored

@ -170,6 +170,7 @@
#undef glTexStorage3DMultisampleOES
#undef glTextureViewOES
#undef glFramebufferTextureMultiviewOVR
#undef glNamedFramebufferTextureMultiviewOVR
#define GLES_SILENCE_DEPRECATION /* YES I KNOW, APPLE! FFS */
#include <OpenGLES/ES3/glext.h>
@ -463,5 +464,6 @@ void flextGLInit(Magnum::GL::Context&) {
/* GL_OVR_multiview */
#if GL_OVR_multiview
flextGL.FramebufferTextureMultiviewOVR = reinterpret_cast<void(APIENTRY*)(GLenum, GLenum, GLuint, GLint, GLint, GLsizei)>(glFramebufferTextureMultiviewOVR);
flextGL.NamedFramebufferTextureMultiviewOVR = reinterpret_cast<void(APIENTRY*)(GLuint, GLenum, GLuint, GLint, GLint, GLsizei)>(glNamedFramebufferTextureMultiviewOVR);
#endif
}

1
src/MagnumExternal/OpenGL/GLES3/flextGLPlatformWindowsDesktop.cpp vendored

@ -567,4 +567,5 @@ void flextGLInit(Magnum::GL::Context&) {
/* GL_OVR_multiview */
flextGL.FramebufferTextureMultiviewOVR = reinterpret_cast<void(APIENTRY*)(GLenum, GLenum, GLuint, GLint, GLint, GLsizei)>(loader.load("glFramebufferTextureMultiviewOVR"));
flextGL.NamedFramebufferTextureMultiviewOVR = reinterpret_cast<void(APIENTRY*)(GLuint, GLenum, GLuint, GLint, GLint, GLsizei)>(loader.load("glNamedFramebufferTextureMultiviewOVR"));
}

2
src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h vendored

@ -2395,6 +2395,7 @@ struct FlextGL {
/* GL_OVR_multiview */
void(APIENTRY *FramebufferTextureMultiviewOVR)(GLenum, GLenum, GLuint, GLint, GLint, GLsizei);
void(APIENTRY *NamedFramebufferTextureMultiviewOVR)(GLuint, GLenum, GLuint, GLint, GLint, GLsizei);
};
extern FLEXTGL_EXPORT FlextGL flextGL;
@ -2973,6 +2974,7 @@ extern FLEXTGL_EXPORT FlextGL flextGL;
/* GL_OVR_multiview */
#define glFramebufferTextureMultiviewOVR flextGL.FramebufferTextureMultiviewOVR
#define glNamedFramebufferTextureMultiviewOVR flextGL.NamedFramebufferTextureMultiviewOVR
#ifdef __cplusplus
}

Loading…
Cancel
Save