[GLES] Various GLES fixes.

- Removed ARB_clip_control from GLES backend since it's not supported on mobile. - Enable OutputDebug states in GLES if GL_KHR_debug extension is available. - Include <GLES2/gl2ext.h> header for Android to load extensions dynamically.
LukasBanana · Aug 5, 2024 · 4949862 · 4949862
1 parent b9aa01d
commit 4949862
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 11 deletions.
diff --git a/sources/Renderer/OpenGL/GLESProfile/GLESExtensionLoader.cpp b/sources/Renderer/OpenGL/GLESProfile/GLESExtensionLoader.cpp
@@ -241,7 +241,6 @@ bool LoadSupportedOpenGLExtensions(bool isCoreProfile, bool abortOnFailure)
 
     ENABLE_GLEXT(ARB_clear_buffer_object);
     ENABLE_GLEXT(ARB_clear_texture);
-    ENABLE_GLEXT(ARB_clip_control);
     ENABLE_GLEXT(ARB_buffer_storage);
     ENABLE_GLEXT(ARB_copy_buffer);
     ENABLE_GLEXT(ARB_draw_buffers);

diff --git a/sources/Renderer/OpenGL/GLESProfile/OpenGLES.h b/sources/Renderer/OpenGL/GLESProfile/OpenGLES.h
@@ -15,8 +15,9 @@
 #   include <OpenGLES/ES3/gl.h>
 #   include <OpenGLES/ES3/glext.h>
 #elif defined(LLGL_OS_ANDROID)
-    // Include all GLES 3.0 functions with static linkage
+    // Include all GLES 3.0 functions with static linkage as well as GLES2 extensions
 #   include <GLES3/gl3.h>
+#   include <GLES2/gl2ext.h>
 
     // Include all GLES 3.1+ functions as extensions with dynamic linkage
 #   ifdef GL_GLES_PROTOTYPES

diff --git a/sources/Renderer/OpenGL/GLRenderSystem.cpp b/sources/Renderer/OpenGL/GLRenderSystem.cpp
@@ -592,10 +592,13 @@ void GLRenderSystem::RegisterNewGLContext(GLContext& /*context*/, const GLPixelF
         EnableDebugCallback();
 }
 
-#ifdef GL_KHR_debug
+#if GL_KHR_debug
 
-void APIENTRY GLDebugCallback(
-    GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, const void* /*userParam*/)
+#ifdef LLGL_OPENGL
+void APIENTRY GLDebugCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, const void* /*userParam*/)
+#else
+void GL_APIENTRY GLDebugCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, const void* /*userParam*/)
+#endif
 {
     /* Forward callback to log */
     DebugPrintf(
@@ -613,7 +616,7 @@ struct GLDebugMessageMetaData
 
 void GLRenderSystem::EnableDebugCallback(bool enable)
 {
-    #ifdef GL_KHR_debug
+    #if GL_KHR_debug
 
     if (HasExtension(GLExt::KHR_debug))
     {

diff --git a/sources/Renderer/OpenGL/RenderState/GLContextState.cpp b/sources/Renderer/OpenGL/RenderState/GLContextState.cpp
@@ -18,6 +18,13 @@ namespace LLGL
 {
 
 
+constexpr GLuint GLContextState::numTextureLayers;
+constexpr GLuint GLContextState::numImageUnits;
+constexpr GLuint GLContextState::numCaps;
+constexpr GLuint GLContextState::numBufferTargets;
+constexpr GLuint GLContextState::numFboTargets;
+constexpr GLuint GLContextState::numTextureTargets;
+
 static void GLGetValue(GLenum pname, GLint& params)
 {
     glGetIntegerv(pname, &params);

diff --git a/sources/Renderer/OpenGL/RenderState/GLState.h b/sources/Renderer/OpenGL/RenderState/GLState.h
@@ -26,6 +26,8 @@ enum class GLState
 {
     Blend = 0,                  // GL_BLEND
     CullFace,                   // GL_CULL_FACE
+    DebugOutput,                // GL_DEBUG_OUTPUT
+    DebugOutputSynchronous,     // GL_DEBUG_OUTPUT_SYNCHRONOUS
     DepthTest,                  // GL_DEPTH_TEST
     Dither,                     // GL_DITHER
     PolygonOffsetFill,          // GL_POLYGON_OFFSET_FILL
@@ -40,8 +42,6 @@ enum class GLState
 
     ColorLogicOp,               // GL_COLOR_LOGIC_OP
     DepthClamp,                 // GL_DEPTH_CLAMP
-    DebugOutput,                // GL_DEBUG_OUTPUT
-    DebugOutputSynchronous,     // GL_DEBUG_OUTPUT_SYNCHRONOUS
     FramebufferSRGB,            // GL_FRAMEBUFFER_SRGB
     LineSmooth,                 // GL_LINE_SMOOTH
     Multisample,                // GL_MULTISAMPLE

diff --git a/sources/Renderer/OpenGL/RenderState/GLStateManager.cpp b/sources/Renderer/OpenGL/RenderState/GLStateManager.cpp
@@ -45,6 +45,13 @@ static const GLenum g_stateCapsEnum[] =
 {
     GL_BLEND,
     GL_CULL_FACE,
+    #if GL_KHR_debug
+    GL_DEBUG_OUTPUT,
+    GL_DEBUG_OUTPUT_SYNCHRONOUS,
+    #else
+    0,
+    0,
+    #endif
     GL_DEPTH_TEST,
     GL_DITHER,
     GL_POLYGON_OFFSET_FILL,
@@ -57,8 +64,6 @@ static const GLenum g_stateCapsEnum[] =
     #ifdef LLGL_OPENGL
     GL_COLOR_LOGIC_OP,
     GL_DEPTH_CLAMP,
-    GL_DEBUG_OUTPUT,
-    GL_DEBUG_OUTPUT_SYNCHRONOUS,
     GL_FRAMEBUFFER_SRGB,
     GL_LINE_SMOOTH,
     GL_MULTISAMPLE,

diff --git a/sources/Renderer/OpenGL/Texture/GLRenderTarget.cpp b/sources/Renderer/OpenGL/Texture/GLRenderTarget.cpp
@@ -235,7 +235,7 @@ void GLRenderTarget::BuildResolveAttachment(const AttachmentDescriptor& attachme
 
 void GLRenderTarget::BuildDepthStencilAttachment(const AttachmentDescriptor& attachmentDesc)
 {
-    if (auto* texture = attachmentDesc.texture)
+    if (const Texture* texture = attachmentDesc.texture)
         BuildAttachmentWithTexture(AllocDepthStencilAttachmentBinding(texture->GetFormat()), attachmentDesc);
     else
         BuildAttachmentWithRenderbuffer(AllocDepthStencilAttachmentBinding(attachmentDesc.format), attachmentDesc.format);