More fixes

Author: kunitoki

modules/yup_graphics/native/yup_GraphicsContext_gl.cpp

@@ -38,14 +38,14 @@ static void GLAPIENTRY err_msg_callback (GLenum source,
                                          const GLchar* message,
                                          const void* userParam)
 {
-    if (type == GL_DEBUG_TYPE_ERROR)
+    if (type == GL_DEBUG_TYPE_ERROR_KHR)
     {
         printf ("GL ERROR: %s\n", message);
         fflush (stdout);
 
         assert (false);
     }
-    else if (type == GL_DEBUG_TYPE_PERFORMANCE)
+    else if (type == GL_DEBUG_TYPE_PERFORMANCE_KHR)
     {
         if (strcmp (message,
                     "API_ID_REDUNDANT_FBO performance warning has been generated. Redundant state "
@@ -73,7 +73,7 @@ class LowLevelRenderContextGL : public GraphicsContext
     {
 #if RIVE_DESKTOP_GL
         // Load the OpenGL API using glad.
-        if (! gladLoadCustomLoader ((GLADloadproc) options.loaderFunction))
+        if (! gladLoadCustomLoader ((GLADloadfunc) options.loaderFunction))
         {
             fprintf (stderr, "Failed to initialize glad.\n");
             exit (-1);
@@ -105,7 +105,7 @@ class LowLevelRenderContextGL : public GraphicsContext
 #if RIVE_DESKTOP_GL && DEBUG
         if (GLAD_GL_KHR_debug)
         {
-            glEnable (GL_DEBUG_OUTPUT);
+            glEnable (GL_DEBUG_OUTPUT_KHR);
             glDebugMessageControlKHR (GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, nullptr, GL_TRUE);
             glDebugMessageCallbackKHR (&err_msg_callback, nullptr);
         }

modules/yup_graphics/native/yup_GraphicsContext_opengl.cpp

@@ -40,14 +40,14 @@ static void GLAPIENTRY err_msg_callback (GLenum source,
                                          const GLchar* message,
                                          const void* userParam)
 {
-    if (type == GL_DEBUG_TYPE_ERROR)
+    if (type == GL_DEBUG_TYPE_ERROR_KHR)
     {
         printf ("GL ERROR: %s\n", message);
         fflush (stdout);
 
         assert (false);
     }
-    else if (type == GL_DEBUG_TYPE_PERFORMANCE)
+    else if (type == GL_DEBUG_TYPE_PERFORMANCE_KHR)
     {
         if (strcmp (message,
                     "API_ID_REDUNDANT_FBO performance warning has been generated. Redundant state "
@@ -84,7 +84,7 @@ class LowLevelRenderContextGL : public GraphicsContext
     {
 #if RIVE_DESKTOP_GL
         // Load the OpenGL API using glad.
-        if (! gladLoadCustomLoader ((GLADloadproc) options.loaderFunction))
+        if (! gladLoadCustomLoader ((GLADloadfunc) options.loaderFunction))
         {
             fprintf (stderr, "Failed to initialize glad.\n");
             return;
@@ -108,7 +108,7 @@ class LowLevelRenderContextGL : public GraphicsContext
 #if DEBUG
         if (GLAD_GL_KHR_debug)
         {
-            glEnable (GL_DEBUG_OUTPUT);
+            glEnable (GL_DEBUG_OUTPUT_KHR);
             glDebugMessageControlKHR (GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, nullptr, GL_TRUE);
             glDebugMessageCallbackKHR (&err_msg_callback, nullptr);
         }
@@ -278,4 +278,4 @@ std::unique_ptr<GraphicsContext> yup_constructOpenGLGraphicsContext (GraphicsCon
 }
 
 } // namespace yup
-#endif
+#endif

thirdparty/rive_renderer/rive_renderer_emscripten.cpp

@@ -35,7 +35,6 @@
 #elif RIVE_WEBGL
 #include "source/gl/gl_state.cpp"
 #include "source/gl/gl_utils.cpp"
-#include "source/gl/load_gles_extensions.cpp"
 #include "source/gl/load_store_actions_ext.cpp"
 #include "source/gl/pls_impl_webgl.cpp"
 #include "source/gl/render_buffer_gl_impl.cpp"