From 6e482549d2c618ae85447c61adace55ea7b11332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 9 Apr 2019 19:41:38 +0200 Subject: [PATCH] external: don't even attempt to load ES3.1 and ES3.2 functions on iOS. Probably a missed leftover from the times where the world was still optimistic about OpenGL on Apple platforms. --- .../OpenGL/GLES3/flextGLPlatformIOS.cpp | 232 ------------------ .../GLES3/flextGLPlatformIOS.cpp.template | 4 +- 2 files changed, 2 insertions(+), 234 deletions(-) diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGLPlatformIOS.cpp b/src/MagnumExternal/OpenGL/GLES3/flextGLPlatformIOS.cpp index b768ddf4c..ae251dafa 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGLPlatformIOS.cpp +++ b/src/MagnumExternal/OpenGL/GLES3/flextGLPlatformIOS.cpp @@ -25,118 +25,6 @@ #include "flextGL.h" -#undef glActiveShaderProgram -#undef glBindImageTexture -#undef glBindProgramPipeline -#undef glBindVertexBuffer -#undef glCreateShaderProgramv -#undef glDeleteProgramPipelines -#undef glDispatchCompute -#undef glDispatchComputeIndirect -#undef glDrawArraysIndirect -#undef glDrawElementsIndirect -#undef glFramebufferParameteri -#undef glGenProgramPipelines -#undef glGetBooleani_v -#undef glGetFramebufferParameteriv -#undef glGetMultisamplefv -#undef glGetProgramInterfaceiv -#undef glGetProgramPipelineInfoLog -#undef glGetProgramPipelineiv -#undef glGetProgramResourceIndex -#undef glGetProgramResourceLocation -#undef glGetProgramResourceName -#undef glGetProgramResourceiv -#undef glGetTexLevelParameterfv -#undef glGetTexLevelParameteriv -#undef glIsProgramPipeline -#undef glMemoryBarrier -#undef glMemoryBarrierByRegion -#undef glProgramUniform1f -#undef glProgramUniform1fv -#undef glProgramUniform1i -#undef glProgramUniform1iv -#undef glProgramUniform1ui -#undef glProgramUniform1uiv -#undef glProgramUniform2f -#undef glProgramUniform2fv -#undef glProgramUniform2i -#undef glProgramUniform2iv -#undef glProgramUniform2ui -#undef glProgramUniform2uiv -#undef glProgramUniform3f -#undef glProgramUniform3fv -#undef glProgramUniform3i -#undef glProgramUniform3iv -#undef glProgramUniform3ui -#undef glProgramUniform3uiv -#undef glProgramUniform4f -#undef glProgramUniform4fv -#undef glProgramUniform4i -#undef glProgramUniform4iv -#undef glProgramUniform4ui -#undef glProgramUniform4uiv -#undef glProgramUniformMatrix2fv -#undef glProgramUniformMatrix2x3fv -#undef glProgramUniformMatrix2x4fv -#undef glProgramUniformMatrix3fv -#undef glProgramUniformMatrix3x2fv -#undef glProgramUniformMatrix3x4fv -#undef glProgramUniformMatrix4fv -#undef glProgramUniformMatrix4x2fv -#undef glProgramUniformMatrix4x3fv -#undef glSampleMaski -#undef glTexStorage2DMultisample -#undef glUseProgramStages -#undef glValidateProgramPipeline -#undef glVertexAttribBinding -#undef glVertexAttribFormat -#undef glVertexAttribIFormat -#undef glVertexBindingDivisor -#undef glBlendBarrier -#undef glBlendEquationSeparatei -#undef glBlendEquationi -#undef glBlendFuncSeparatei -#undef glBlendFunci -#undef glColorMaski -#undef glCopyImageSubData -#undef glDebugMessageCallback -#undef glDebugMessageControl -#undef glDebugMessageInsert -#undef glDisablei -#undef glDrawElementsBaseVertex -#undef glDrawElementsInstancedBaseVertex -#undef glDrawRangeElementsBaseVertex -#undef glEnablei -#undef glFramebufferTexture -#undef glGetDebugMessageLog -#undef glGetGraphicsResetStatus -#undef glGetObjectLabel -#undef glGetObjectPtrLabel -#undef glGetPointerv -#undef glGetSamplerParameterIiv -#undef glGetSamplerParameterIuiv -#undef glGetTexParameterIiv -#undef glGetTexParameterIuiv -#undef glGetnUniformfv -#undef glGetnUniformiv -#undef glGetnUniformuiv -#undef glIsEnabledi -#undef glMinSampleShading -#undef glObjectLabel -#undef glObjectPtrLabel -#undef glPatchParameteri -#undef glPopDebugGroup -#undef glPrimitiveBoundingBox -#undef glPushDebugGroup -#undef glReadnPixels -#undef glSamplerParameterIiv -#undef glSamplerParameterIuiv -#undef glTexBuffer -#undef glTexBufferRange -#undef glTexParameterIiv -#undef glTexParameterIuiv -#undef glTexStorage3DMultisample #undef glCopyImageSubDataEXT #undef glGetObjectLabelEXT #undef glLabelObjectEXT @@ -255,126 +143,6 @@ void flextGLInit(Magnum::GL::Context&) { - /* GL_ES_VERSION_3_1 */ - #if GL_ES_VERSION_3_1 - flextglActiveShaderProgram = reinterpret_cast(glActiveShaderProgram); - flextglBindImageTexture = reinterpret_cast(glBindImageTexture); - flextglBindProgramPipeline = reinterpret_cast(glBindProgramPipeline); - flextglBindVertexBuffer = reinterpret_cast(glBindVertexBuffer); - flextglCreateShaderProgramv = reinterpret_cast(glCreateShaderProgramv); - flextglDeleteProgramPipelines = reinterpret_cast(glDeleteProgramPipelines); - flextglDispatchCompute = reinterpret_cast(glDispatchCompute); - flextglDispatchComputeIndirect = reinterpret_cast(glDispatchComputeIndirect); - flextglDrawArraysIndirect = reinterpret_cast(glDrawArraysIndirect); - flextglDrawElementsIndirect = reinterpret_cast(glDrawElementsIndirect); - flextglFramebufferParameteri = reinterpret_cast(glFramebufferParameteri); - flextglGenProgramPipelines = reinterpret_cast(glGenProgramPipelines); - flextglGetBooleani_v = reinterpret_cast(glGetBooleani_v); - flextglGetFramebufferParameteriv = reinterpret_cast(glGetFramebufferParameteriv); - flextglGetMultisamplefv = reinterpret_cast(glGetMultisamplefv); - flextglGetProgramInterfaceiv = reinterpret_cast(glGetProgramInterfaceiv); - flextglGetProgramPipelineInfoLog = reinterpret_cast(glGetProgramPipelineInfoLog); - flextglGetProgramPipelineiv = reinterpret_cast(glGetProgramPipelineiv); - flextglGetProgramResourceIndex = reinterpret_cast(glGetProgramResourceIndex); - flextglGetProgramResourceLocation = reinterpret_cast(glGetProgramResourceLocation); - flextglGetProgramResourceName = reinterpret_cast(glGetProgramResourceName); - flextglGetProgramResourceiv = reinterpret_cast(glGetProgramResourceiv); - flextglGetTexLevelParameterfv = reinterpret_cast(glGetTexLevelParameterfv); - flextglGetTexLevelParameteriv = reinterpret_cast(glGetTexLevelParameteriv); - flextglIsProgramPipeline = reinterpret_cast(glIsProgramPipeline); - flextglMemoryBarrier = reinterpret_cast(glMemoryBarrier); - flextglMemoryBarrierByRegion = reinterpret_cast(glMemoryBarrierByRegion); - flextglProgramUniform1f = reinterpret_cast(glProgramUniform1f); - flextglProgramUniform1fv = reinterpret_cast(glProgramUniform1fv); - flextglProgramUniform1i = reinterpret_cast(glProgramUniform1i); - flextglProgramUniform1iv = reinterpret_cast(glProgramUniform1iv); - flextglProgramUniform1ui = reinterpret_cast(glProgramUniform1ui); - flextglProgramUniform1uiv = reinterpret_cast(glProgramUniform1uiv); - flextglProgramUniform2f = reinterpret_cast(glProgramUniform2f); - flextglProgramUniform2fv = reinterpret_cast(glProgramUniform2fv); - flextglProgramUniform2i = reinterpret_cast(glProgramUniform2i); - flextglProgramUniform2iv = reinterpret_cast(glProgramUniform2iv); - flextglProgramUniform2ui = reinterpret_cast(glProgramUniform2ui); - flextglProgramUniform2uiv = reinterpret_cast(glProgramUniform2uiv); - flextglProgramUniform3f = reinterpret_cast(glProgramUniform3f); - flextglProgramUniform3fv = reinterpret_cast(glProgramUniform3fv); - flextglProgramUniform3i = reinterpret_cast(glProgramUniform3i); - flextglProgramUniform3iv = reinterpret_cast(glProgramUniform3iv); - flextglProgramUniform3ui = reinterpret_cast(glProgramUniform3ui); - flextglProgramUniform3uiv = reinterpret_cast(glProgramUniform3uiv); - flextglProgramUniform4f = reinterpret_cast(glProgramUniform4f); - flextglProgramUniform4fv = reinterpret_cast(glProgramUniform4fv); - flextglProgramUniform4i = reinterpret_cast(glProgramUniform4i); - flextglProgramUniform4iv = reinterpret_cast(glProgramUniform4iv); - flextglProgramUniform4ui = reinterpret_cast(glProgramUniform4ui); - flextglProgramUniform4uiv = reinterpret_cast(glProgramUniform4uiv); - flextglProgramUniformMatrix2fv = reinterpret_cast(glProgramUniformMatrix2fv); - flextglProgramUniformMatrix2x3fv = reinterpret_cast(glProgramUniformMatrix2x3fv); - flextglProgramUniformMatrix2x4fv = reinterpret_cast(glProgramUniformMatrix2x4fv); - flextglProgramUniformMatrix3fv = reinterpret_cast(glProgramUniformMatrix3fv); - flextglProgramUniformMatrix3x2fv = reinterpret_cast(glProgramUniformMatrix3x2fv); - flextglProgramUniformMatrix3x4fv = reinterpret_cast(glProgramUniformMatrix3x4fv); - flextglProgramUniformMatrix4fv = reinterpret_cast(glProgramUniformMatrix4fv); - flextglProgramUniformMatrix4x2fv = reinterpret_cast(glProgramUniformMatrix4x2fv); - flextglProgramUniformMatrix4x3fv = reinterpret_cast(glProgramUniformMatrix4x3fv); - flextglSampleMaski = reinterpret_cast(glSampleMaski); - flextglTexStorage2DMultisample = reinterpret_cast(glTexStorage2DMultisample); - flextglUseProgramStages = reinterpret_cast(glUseProgramStages); - flextglValidateProgramPipeline = reinterpret_cast(glValidateProgramPipeline); - flextglVertexAttribBinding = reinterpret_cast(glVertexAttribBinding); - flextglVertexAttribFormat = reinterpret_cast(glVertexAttribFormat); - flextglVertexAttribIFormat = reinterpret_cast(glVertexAttribIFormat); - flextglVertexBindingDivisor = reinterpret_cast(glVertexBindingDivisor); - #endif - - /* GL_ES_VERSION_3_2 */ - #if GL_ES_VERSION_3_2 - flextglBlendBarrier = reinterpret_cast(glBlendBarrier); - flextglBlendEquationSeparatei = reinterpret_cast(glBlendEquationSeparatei); - flextglBlendEquationi = reinterpret_cast(glBlendEquationi); - flextglBlendFuncSeparatei = reinterpret_cast(glBlendFuncSeparatei); - flextglBlendFunci = reinterpret_cast(glBlendFunci); - flextglColorMaski = reinterpret_cast(glColorMaski); - flextglCopyImageSubData = reinterpret_cast(glCopyImageSubData); - flextglDebugMessageCallback = reinterpret_cast(glDebugMessageCallback); - flextglDebugMessageControl = reinterpret_cast(glDebugMessageControl); - flextglDebugMessageInsert = reinterpret_cast(glDebugMessageInsert); - flextglDisablei = reinterpret_cast(glDisablei); - flextglDrawElementsBaseVertex = reinterpret_cast(glDrawElementsBaseVertex); - flextglDrawElementsInstancedBaseVertex = reinterpret_cast(glDrawElementsInstancedBaseVertex); - flextglDrawRangeElementsBaseVertex = reinterpret_cast(glDrawRangeElementsBaseVertex); - flextglEnablei = reinterpret_cast(glEnablei); - flextglFramebufferTexture = reinterpret_cast(glFramebufferTexture); - flextglGetDebugMessageLog = reinterpret_cast(glGetDebugMessageLog); - flextglGetGraphicsResetStatus = reinterpret_cast(glGetGraphicsResetStatus); - flextglGetObjectLabel = reinterpret_cast(glGetObjectLabel); - flextglGetObjectPtrLabel = reinterpret_cast(glGetObjectPtrLabel); - flextglGetPointerv = reinterpret_cast(glGetPointerv); - flextglGetSamplerParameterIiv = reinterpret_cast(glGetSamplerParameterIiv); - flextglGetSamplerParameterIuiv = reinterpret_cast(glGetSamplerParameterIuiv); - flextglGetTexParameterIiv = reinterpret_cast(glGetTexParameterIiv); - flextglGetTexParameterIuiv = reinterpret_cast(glGetTexParameterIuiv); - flextglGetnUniformfv = reinterpret_cast(glGetnUniformfv); - flextglGetnUniformiv = reinterpret_cast(glGetnUniformiv); - flextglGetnUniformuiv = reinterpret_cast(glGetnUniformuiv); - flextglIsEnabledi = reinterpret_cast(glIsEnabledi); - flextglMinSampleShading = reinterpret_cast(glMinSampleShading); - flextglObjectLabel = reinterpret_cast(glObjectLabel); - flextglObjectPtrLabel = reinterpret_cast(glObjectPtrLabel); - flextglPatchParameteri = reinterpret_cast(glPatchParameteri); - flextglPopDebugGroup = reinterpret_cast(glPopDebugGroup); - flextglPrimitiveBoundingBox = reinterpret_cast(glPrimitiveBoundingBox); - flextglPushDebugGroup = reinterpret_cast(glPushDebugGroup); - flextglReadnPixels = reinterpret_cast(glReadnPixels); - flextglSamplerParameterIiv = reinterpret_cast(glSamplerParameterIiv); - flextglSamplerParameterIuiv = reinterpret_cast(glSamplerParameterIuiv); - flextglTexBuffer = reinterpret_cast(glTexBuffer); - flextglTexBufferRange = reinterpret_cast(glTexBufferRange); - flextglTexParameterIiv = reinterpret_cast(glTexParameterIiv); - flextglTexParameterIuiv = reinterpret_cast(glTexParameterIuiv); - flextglTexStorage3DMultisample = reinterpret_cast(glTexStorage3DMultisample); - #endif - /* GL_EXT_copy_image */ #if GL_EXT_copy_image flextglCopyImageSubDataEXT = reinterpret_cast(glCopyImageSubDataEXT); diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGLPlatformIOS.cpp.template b/src/MagnumExternal/OpenGL/GLES3/flextGLPlatformIOS.cpp.template index 50506f388..631855aa1 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGLPlatformIOS.cpp.template +++ b/src/MagnumExternal/OpenGL/GLES3/flextGLPlatformIOS.cpp.template @@ -27,7 +27,7 @@ #include "flextGL.h" @for category,funcs in functions: -@if funcs and category not in ['ES_VERSION_2_0', 'ES_VERSION_3_0']: +@if funcs and category not in ['ES_VERSION_2_0', 'ES_VERSION_3_0', 'ES_VERSION_3_1', 'ES_VERSION_3_2']: @for f in funcs: #undef gl@f.name @end @@ -38,7 +38,7 @@ void flextGLInit(Magnum::GL::Context&) { @for category,funcs in functions: - @if funcs and category not in ['ES_VERSION_2_0', 'ES_VERSION_3_0']: + @if funcs and category not in ['ES_VERSION_2_0', 'ES_VERSION_3_0', 'ES_VERSION_3_1', 'ES_VERSION_3_2']: /* GL_@category */ #if GL_@category