From d2141d0a8e1eceb5bb5ba686e5958db256451c62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 2 Oct 2024 20:09:52 +0200 Subject: [PATCH] external: some extensions got new GL entrypoints since last time. --- src/MagnumExternal/OpenGL/GL/flextGL.cpp | 1 + src/MagnumExternal/OpenGL/GL/flextGL.h | 2 ++ src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp | 1 + src/MagnumExternal/OpenGL/GLES3/flextGL.h | 2 ++ src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h | 1 + src/MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp | 1 + src/MagnumExternal/OpenGL/GLES3/flextGLPlatformIOS.cpp | 2 ++ .../OpenGL/GLES3/flextGLPlatformWindowsDesktop.cpp | 1 + src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h | 2 ++ 9 files changed, 13 insertions(+) diff --git a/src/MagnumExternal/OpenGL/GL/flextGL.cpp b/src/MagnumExternal/OpenGL/GL/flextGL.cpp index aae9f14a9..7b1199d8c 100644 --- a/src/MagnumExternal/OpenGL/GL/flextGL.cpp +++ b/src/MagnumExternal/OpenGL/GL/flextGL.cpp @@ -236,6 +236,7 @@ FlextGL flextGL{ /* GL_OVR_multiview */ nullptr, + nullptr, /* GL_VERSION_1_0 */ glBlendFunc, diff --git a/src/MagnumExternal/OpenGL/GL/flextGL.h b/src/MagnumExternal/OpenGL/GL/flextGL.h index c4d10331a..01ce2a391 100644 --- a/src/MagnumExternal/OpenGL/GL/flextGL.h +++ b/src/MagnumExternal/OpenGL/GL/flextGL.h @@ -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 */ diff --git a/src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp b/src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp index 6492c02a3..309b01f38 100644 --- a/src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp +++ b/src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp @@ -200,6 +200,7 @@ void flextGLInit(Magnum::GL::Context& context) { /* GL_OVR_multiview */ flextGL.FramebufferTextureMultiviewOVR = reinterpret_cast(loader.load("glFramebufferTextureMultiviewOVR")); + flextGL.NamedFramebufferTextureMultiviewOVR = reinterpret_cast(loader.load("glNamedFramebufferTextureMultiviewOVR")); /* GL_VERSION_1_2 */ flextGL.CopyTexSubImage3D = reinterpret_cast(loader.load("glCopyTexSubImage3D")); diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGL.h b/src/MagnumExternal/OpenGL/GLES3/flextGL.h index fa14d529a..b20e420d7 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGL.h +++ b/src/MagnumExternal/OpenGL/GLES3/flextGL.h @@ -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 } diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h b/src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h index 8877983db..611ba934d 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h +++ b/src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h @@ -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 } diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp b/src/MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp index 827d72a9a..e044621e0 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp +++ b/src/MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp @@ -365,4 +365,5 @@ void flextGLInit(Magnum::GL::Context&) { /* GL_OVR_multiview */ flextGL.FramebufferTextureMultiviewOVR = reinterpret_cast(loader.load("glFramebufferTextureMultiviewOVR")); + flextGL.NamedFramebufferTextureMultiviewOVR = reinterpret_cast(loader.load("glNamedFramebufferTextureMultiviewOVR")); } diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGLPlatformIOS.cpp b/src/MagnumExternal/OpenGL/GLES3/flextGLPlatformIOS.cpp index c93214fff..ea397f35f 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGLPlatformIOS.cpp +++ b/src/MagnumExternal/OpenGL/GLES3/flextGLPlatformIOS.cpp @@ -170,6 +170,7 @@ #undef glTexStorage3DMultisampleOES #undef glTextureViewOES #undef glFramebufferTextureMultiviewOVR +#undef glNamedFramebufferTextureMultiviewOVR #define GLES_SILENCE_DEPRECATION /* YES I KNOW, APPLE! FFS */ #include @@ -463,5 +464,6 @@ void flextGLInit(Magnum::GL::Context&) { /* GL_OVR_multiview */ #if GL_OVR_multiview flextGL.FramebufferTextureMultiviewOVR = reinterpret_cast(glFramebufferTextureMultiviewOVR); + flextGL.NamedFramebufferTextureMultiviewOVR = reinterpret_cast(glNamedFramebufferTextureMultiviewOVR); #endif } diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGLPlatformWindowsDesktop.cpp b/src/MagnumExternal/OpenGL/GLES3/flextGLPlatformWindowsDesktop.cpp index 96e08ba17..330ab9414 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGLPlatformWindowsDesktop.cpp +++ b/src/MagnumExternal/OpenGL/GLES3/flextGLPlatformWindowsDesktop.cpp @@ -567,4 +567,5 @@ void flextGLInit(Magnum::GL::Context&) { /* GL_OVR_multiview */ flextGL.FramebufferTextureMultiviewOVR = reinterpret_cast(loader.load("glFramebufferTextureMultiviewOVR")); + flextGL.NamedFramebufferTextureMultiviewOVR = reinterpret_cast(loader.load("glNamedFramebufferTextureMultiviewOVR")); } diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h b/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h index c85617b5e..c4af27186 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h +++ b/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h @@ -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 }