Bump Rive to v0.1.62 (#90)

Author: kunitoki

.gitignore

@@ -30,6 +30,7 @@
 *.exe
 *.out
 *.app
+*.pyc
 
 # Cruft
 .DS_Store
@@ -40,6 +41,8 @@ cmake-build*
 out/*
 
 # Ides/Agents
+__pycache__/
+.gitnexus/
 .vscode/
 .idea/
 .vs/

justfile

@@ -97,3 +97,6 @@ python_uninstall:
 [working-directory: 'python']
 python_test *TEST_OPTS:
   python -m pytest -s {{TEST_OPTS}}
+
+rive_update REF="runtime-v0.1.62":
+  uv run python tools/rive_update.py --rive-ref {{REF}} --allow-dirty --keep-work-dir

modules/yup_graphics/imaging/yup_Image.cpp

@@ -173,6 +173,7 @@ bool Image::createTextureIfNotPresent (GraphicsContext& context) const
         width,
         height,
         rive::math::msb (width | height),
+        rive::GPUTextureFormat::rgba32,
         getRawData().data());
 
     return true;

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_headless.cpp

@@ -79,7 +79,7 @@ class NoOpRenderPath : public rive::RenderPath
 
     void addPath (rive::CommandPath*, const rive::Mat2D&) override {}
 
-    void addRenderPath (rive::RenderPath*, const rive::Mat2D&) override {}
+    void addRenderPath (const rive::RenderPath*, const rive::Mat2D&) override {}
 
     void moveTo (float, float) override {}
 
@@ -179,6 +179,8 @@ class NoOpRenderer : public rive::Renderer
                         uint32_t indexCount,
                         rive::BlendMode,
                         float) override {}
+
+    void modulateOpacity (float) override {}
 };
 
 //==============================================================================

modules/yup_graphics/native/yup_GraphicsContext_metal.cpp

@@ -82,7 +82,7 @@ class LowLevelRenderContextMetal : public GraphicsContext
         rive::gpu::RenderContextMetalImpl::ContextOptions metalOptions;
 
         if (m_fiddleOptions.synchronousShaderCompilations)
-            metalOptions.synchronousShaderCompilations = true;
+            metalOptions.shaderCompilationMode = rive::gpu::ShaderCompilationMode::alwaysSynchronous;
 
         if (m_fiddleOptions.disableRasterOrdering)
             metalOptions.disableFramebufferReads = true;
@@ -192,8 +192,12 @@ class LowLevelRenderContextMetal : public GraphicsContext
         if (m_currentTexture != nil)
         {
             [m_currentTexture setPurgeableState:MTLPurgeableStateEmpty];
+#if defined(__has_feature) && __has_feature(objc_arc)
+            m_currentTexture = nil;
+#else
             [m_currentTexture release];
             m_currentTexture = nil;
+#endif
         }
 
         MTLTextureDescriptor* descriptor = [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:(MTLPixelFormatBGRA8Unorm)

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

modules/yup_gui/artboard/yup_ArtboardFile.cpp

@@ -57,7 +57,7 @@ class LambdaAssetLoader : public rive::FileAssetLoader
 
 //==============================================================================
 
-ArtboardFile::ArtboardFile (std::unique_ptr<rive::File> rivFile)
+ArtboardFile::ArtboardFile (rive::rcp<rive::File> rivFile)
     : rivFile (std::move (rivFile))
 {
 }
@@ -106,7 +106,7 @@ ArtboardFile::LoadResult ArtboardFile::load (InputStream& is, rive::Factory& fac
     is.readIntoMemoryBlock (mb);
 
     rive::ImportResult result;
-    std::unique_ptr<rive::File> rivFile;
+    rive::rcp<rive::File> rivFile;
 
     if (assetCallback != nullptr)
     {

modules/yup_gui/artboard/yup_ArtboardFile.h

@@ -94,9 +94,9 @@ class YUP_API ArtboardFile
 
 private:
     ArtboardFile() = default;
-    ArtboardFile (std::unique_ptr<rive::File> rivFile);
+    ArtboardFile (rive::rcp<rive::File> rivFile);
 
-    std::unique_ptr<rive::File> rivFile;
+    rive::rcp<rive::File> rivFile;
 };
 
 } // namespace yup

thirdparty/glad/glad.c

@@ -21,5 +21,6 @@
 
 #include "glad.h"
 
-#include "source/glad.c"
+#include "source/egl.c"
+#include "source/gles2.c"
 #include "source/glad_custom.c"