From 95b138362f0a369f76988f9c1ad991f89682d02a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 22 Feb 2023 20:12:43 +0100 Subject: [PATCH] external: refresh generated OpenGL headers. It's comforting to know that I wasn't the only one struggling with const in pointers to pointers, heh. --- src/MagnumExternal/OpenGL/GLES2/flextGL.h | 8 +++++++- src/MagnumExternal/OpenGL/GLES2/flextGLPlatform.cpp | 2 +- src/MagnumExternal/OpenGL/GLES2/flextGLPlatformIOS.cpp | 2 +- .../OpenGL/GLES2/flextGLPlatformWindowsDesktop.cpp | 2 +- src/MagnumExternal/OpenGL/GLES2/flextGLWindowsDesktop.h | 8 +++++++- src/MagnumExternal/OpenGL/GLES3/flextGL.h | 2 +- src/MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp | 2 +- src/MagnumExternal/OpenGL/GLES3/flextGLPlatformIOS.cpp | 2 +- .../OpenGL/GLES3/flextGLPlatformWindowsDesktop.cpp | 2 +- src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h | 2 +- 10 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGL.h b/src/MagnumExternal/OpenGL/GLES2/flextGL.h index ad7a639df..88ae2af00 100644 --- a/src/MagnumExternal/OpenGL/GLES2/flextGL.h +++ b/src/MagnumExternal/OpenGL/GLES2/flextGL.h @@ -629,6 +629,12 @@ typedef void (APIENTRY *GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLen #define GL_READ_BUFFER_NV 0x0C02 +/* GL_NV_pack_subimage */ + +#define GL_PACK_ROW_LENGTH_NV 0x0D02 +#define GL_PACK_SKIP_ROWS_NV 0x0D03 +#define GL_PACK_SKIP_PIXELS_NV 0x0D04 + /* GL_NV_framebuffer_blit */ #define GL_READ_FRAMEBUFFER_NV 0x8CA8 @@ -1335,7 +1341,7 @@ struct FlextGL { void(APIENTRY *ActiveShaderProgramEXT)(GLuint, GLuint); void(APIENTRY *BindProgramPipelineEXT)(GLuint); - GLuint(APIENTRY *CreateShaderProgramvEXT)(GLenum, GLsizei, const GLchar **); + GLuint(APIENTRY *CreateShaderProgramvEXT)(GLenum, GLsizei, const GLchar *const*); void(APIENTRY *DeleteProgramPipelinesEXT)(GLsizei, const GLuint *); void(APIENTRY *GenProgramPipelinesEXT)(GLsizei, GLuint *); void(APIENTRY *GetProgramPipelineInfoLogEXT)(GLuint, GLsizei, GLsizei *, GLchar *); diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGLPlatform.cpp b/src/MagnumExternal/OpenGL/GLES2/flextGLPlatform.cpp index b1cad512f..a44776d77 100644 --- a/src/MagnumExternal/OpenGL/GLES2/flextGLPlatform.cpp +++ b/src/MagnumExternal/OpenGL/GLES2/flextGLPlatform.cpp @@ -128,7 +128,7 @@ void flextGLInit(Magnum::GL::Context&) { /* GL_EXT_separate_shader_objects */ flextGL.ActiveShaderProgramEXT = reinterpret_cast(loader.load("glActiveShaderProgramEXT")); flextGL.BindProgramPipelineEXT = reinterpret_cast(loader.load("glBindProgramPipelineEXT")); - flextGL.CreateShaderProgramvEXT = reinterpret_cast(loader.load("glCreateShaderProgramvEXT")); + flextGL.CreateShaderProgramvEXT = reinterpret_cast(loader.load("glCreateShaderProgramvEXT")); flextGL.DeleteProgramPipelinesEXT = reinterpret_cast(loader.load("glDeleteProgramPipelinesEXT")); flextGL.GenProgramPipelinesEXT = reinterpret_cast(loader.load("glGenProgramPipelinesEXT")); flextGL.GetProgramPipelineInfoLogEXT = reinterpret_cast(loader.load("glGetProgramPipelineInfoLogEXT")); diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGLPlatformIOS.cpp b/src/MagnumExternal/OpenGL/GLES2/flextGLPlatformIOS.cpp index 83152cd05..29476b586 100644 --- a/src/MagnumExternal/OpenGL/GLES2/flextGLPlatformIOS.cpp +++ b/src/MagnumExternal/OpenGL/GLES2/flextGLPlatformIOS.cpp @@ -305,7 +305,7 @@ void flextGLInit(Magnum::GL::Context&) { #if GL_EXT_separate_shader_objects flextGL.ActiveShaderProgramEXT = reinterpret_cast(glActiveShaderProgramEXT); flextGL.BindProgramPipelineEXT = reinterpret_cast(glBindProgramPipelineEXT); - flextGL.CreateShaderProgramvEXT = reinterpret_cast(glCreateShaderProgramvEXT); + flextGL.CreateShaderProgramvEXT = reinterpret_cast(glCreateShaderProgramvEXT); flextGL.DeleteProgramPipelinesEXT = reinterpret_cast(glDeleteProgramPipelinesEXT); flextGL.GenProgramPipelinesEXT = reinterpret_cast(glGenProgramPipelinesEXT); flextGL.GetProgramPipelineInfoLogEXT = reinterpret_cast(glGetProgramPipelineInfoLogEXT); diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGLPlatformWindowsDesktop.cpp b/src/MagnumExternal/OpenGL/GLES2/flextGLPlatformWindowsDesktop.cpp index 81f64cac9..c0c6323b3 100644 --- a/src/MagnumExternal/OpenGL/GLES2/flextGLPlatformWindowsDesktop.cpp +++ b/src/MagnumExternal/OpenGL/GLES2/flextGLPlatformWindowsDesktop.cpp @@ -227,7 +227,7 @@ void flextGLInit(Magnum::GL::Context&) { /* GL_EXT_separate_shader_objects */ flextGL.ActiveShaderProgramEXT = reinterpret_cast(loader.load("glActiveShaderProgramEXT")); flextGL.BindProgramPipelineEXT = reinterpret_cast(loader.load("glBindProgramPipelineEXT")); - flextGL.CreateShaderProgramvEXT = reinterpret_cast(loader.load("glCreateShaderProgramvEXT")); + flextGL.CreateShaderProgramvEXT = reinterpret_cast(loader.load("glCreateShaderProgramvEXT")); flextGL.DeleteProgramPipelinesEXT = reinterpret_cast(loader.load("glDeleteProgramPipelinesEXT")); flextGL.GenProgramPipelinesEXT = reinterpret_cast(loader.load("glGenProgramPipelinesEXT")); flextGL.GetProgramPipelineInfoLogEXT = reinterpret_cast(loader.load("glGetProgramPipelineInfoLogEXT")); diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGLWindowsDesktop.h b/src/MagnumExternal/OpenGL/GLES2/flextGLWindowsDesktop.h index fe9a05fa2..8049427d4 100644 --- a/src/MagnumExternal/OpenGL/GLES2/flextGLWindowsDesktop.h +++ b/src/MagnumExternal/OpenGL/GLES2/flextGLWindowsDesktop.h @@ -625,6 +625,12 @@ typedef void (APIENTRY *GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLen #define GL_READ_BUFFER_NV 0x0C02 +/* GL_NV_pack_subimage */ + +#define GL_PACK_ROW_LENGTH_NV 0x0D02 +#define GL_PACK_SKIP_ROWS_NV 0x0D03 +#define GL_PACK_SKIP_PIXELS_NV 0x0D04 + /* GL_NV_framebuffer_blit */ #define GL_READ_FRAMEBUFFER_NV 0x8CA8 @@ -1335,7 +1341,7 @@ struct FlextGL { void(APIENTRY *ActiveShaderProgramEXT)(GLuint, GLuint); void(APIENTRY *BindProgramPipelineEXT)(GLuint); - GLuint(APIENTRY *CreateShaderProgramvEXT)(GLenum, GLsizei, const GLchar **); + GLuint(APIENTRY *CreateShaderProgramvEXT)(GLenum, GLsizei, const GLchar *const*); void(APIENTRY *DeleteProgramPipelinesEXT)(GLsizei, const GLuint *); void(APIENTRY *GenProgramPipelinesEXT)(GLsizei, GLuint *); void(APIENTRY *GetProgramPipelineInfoLogEXT)(GLuint, GLsizei, GLsizei *, GLchar *); diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGL.h b/src/MagnumExternal/OpenGL/GLES3/flextGL.h index 7aeabd6ac..2f121f808 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGL.h +++ b/src/MagnumExternal/OpenGL/GLES3/flextGL.h @@ -2162,7 +2162,7 @@ struct FlextGL { void(APIENTRY *ActiveShaderProgramEXT)(GLuint, GLuint); void(APIENTRY *BindProgramPipelineEXT)(GLuint); - GLuint(APIENTRY *CreateShaderProgramvEXT)(GLenum, GLsizei, const GLchar **); + GLuint(APIENTRY *CreateShaderProgramvEXT)(GLenum, GLsizei, const GLchar *const*); void(APIENTRY *DeleteProgramPipelinesEXT)(GLsizei, const GLuint *); void(APIENTRY *GenProgramPipelinesEXT)(GLsizei, GLuint *); void(APIENTRY *GetProgramPipelineInfoLogEXT)(GLuint, GLsizei, GLsizei *, GLchar *); diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp b/src/MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp index cd13791b1..8de260563 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp +++ b/src/MagnumExternal/OpenGL/GLES3/flextGLPlatform.cpp @@ -229,7 +229,7 @@ void flextGLInit(Magnum::GL::Context&) { /* GL_EXT_separate_shader_objects */ flextGL.ActiveShaderProgramEXT = reinterpret_cast(loader.load("glActiveShaderProgramEXT")); flextGL.BindProgramPipelineEXT = reinterpret_cast(loader.load("glBindProgramPipelineEXT")); - flextGL.CreateShaderProgramvEXT = reinterpret_cast(loader.load("glCreateShaderProgramvEXT")); + flextGL.CreateShaderProgramvEXT = reinterpret_cast(loader.load("glCreateShaderProgramvEXT")); flextGL.DeleteProgramPipelinesEXT = reinterpret_cast(loader.load("glDeleteProgramPipelinesEXT")); flextGL.GenProgramPipelinesEXT = reinterpret_cast(loader.load("glGenProgramPipelinesEXT")); flextGL.GetProgramPipelineInfoLogEXT = reinterpret_cast(loader.load("glGetProgramPipelineInfoLogEXT")); diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGLPlatformIOS.cpp b/src/MagnumExternal/OpenGL/GLES3/flextGLPlatformIOS.cpp index 64ee4375e..bf5910944 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGLPlatformIOS.cpp +++ b/src/MagnumExternal/OpenGL/GLES3/flextGLPlatformIOS.cpp @@ -275,7 +275,7 @@ void flextGLInit(Magnum::GL::Context&) { #if GL_EXT_separate_shader_objects flextGL.ActiveShaderProgramEXT = reinterpret_cast(glActiveShaderProgramEXT); flextGL.BindProgramPipelineEXT = reinterpret_cast(glBindProgramPipelineEXT); - flextGL.CreateShaderProgramvEXT = reinterpret_cast(glCreateShaderProgramvEXT); + flextGL.CreateShaderProgramvEXT = reinterpret_cast(glCreateShaderProgramvEXT); flextGL.DeleteProgramPipelinesEXT = reinterpret_cast(glDeleteProgramPipelinesEXT); flextGL.GenProgramPipelinesEXT = reinterpret_cast(glGenProgramPipelinesEXT); flextGL.GetProgramPipelineInfoLogEXT = reinterpret_cast(glGetProgramPipelineInfoLogEXT); diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGLPlatformWindowsDesktop.cpp b/src/MagnumExternal/OpenGL/GLES3/flextGLPlatformWindowsDesktop.cpp index 3dceb07db..f91b7d117 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGLPlatformWindowsDesktop.cpp +++ b/src/MagnumExternal/OpenGL/GLES3/flextGLPlatformWindowsDesktop.cpp @@ -431,7 +431,7 @@ void flextGLInit(Magnum::GL::Context&) { /* GL_EXT_separate_shader_objects */ flextGL.ActiveShaderProgramEXT = reinterpret_cast(loader.load("glActiveShaderProgramEXT")); flextGL.BindProgramPipelineEXT = reinterpret_cast(loader.load("glBindProgramPipelineEXT")); - flextGL.CreateShaderProgramvEXT = reinterpret_cast(loader.load("glCreateShaderProgramvEXT")); + flextGL.CreateShaderProgramvEXT = reinterpret_cast(loader.load("glCreateShaderProgramvEXT")); flextGL.DeleteProgramPipelinesEXT = reinterpret_cast(loader.load("glDeleteProgramPipelinesEXT")); flextGL.GenProgramPipelinesEXT = reinterpret_cast(loader.load("glGenProgramPipelinesEXT")); flextGL.GetProgramPipelineInfoLogEXT = reinterpret_cast(loader.load("glGetProgramPipelineInfoLogEXT")); diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h b/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h index 2ad781e50..533529239 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h +++ b/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h @@ -2166,7 +2166,7 @@ struct FlextGL { void(APIENTRY *ActiveShaderProgramEXT)(GLuint, GLuint); void(APIENTRY *BindProgramPipelineEXT)(GLuint); - GLuint(APIENTRY *CreateShaderProgramvEXT)(GLenum, GLsizei, const GLchar **); + GLuint(APIENTRY *CreateShaderProgramvEXT)(GLenum, GLsizei, const GLchar *const*); void(APIENTRY *DeleteProgramPipelinesEXT)(GLsizei, const GLuint *); void(APIENTRY *GenProgramPipelinesEXT)(GLsizei, GLuint *); void(APIENTRY *GetProgramPipelineInfoLogEXT)(GLuint, GLsizei, GLsizei *, GLchar *);