Share retained renderbuffer dispatch bridge

src/canvas.cpp

@@ -2,6 +2,7 @@
 #include "log.h"
 #include "canvas.h"
 #include "app.h"
+#include "legacy_gl_renderbuffer_dispatch.h"
 #include "legacy_ui_gl_dispatch.h"
 #include "texture.h"
 #include "node_progress_bar.h"
@@ -188,84 +189,26 @@ bool query_canvas_capability(std::uint32_t state)
     return pp::legacy::ui_gl::query_capability(state, "Canvas");
 }
 
-void gen_opengl_renderbuffers(std::uint32_t count, std::uint32_t* ids) noexcept
-{
-    glGenRenderbuffers(static_cast<GLsizei>(count), reinterpret_cast<GLuint*>(ids));
-}
-
-void delete_opengl_renderbuffers(std::uint32_t count, const std::uint32_t* ids) noexcept
-{
-    glDeleteRenderbuffers(static_cast<GLsizei>(count), reinterpret_cast<const GLuint*>(ids));
-}
-
-void bind_opengl_renderbuffer(std::uint32_t target, std::uint32_t renderbuffer) noexcept
-{
-    glBindRenderbuffer(static_cast<GLenum>(target), static_cast<GLuint>(renderbuffer));
-}
-
-void set_opengl_renderbuffer_storage(
-    std::uint32_t target,
-    std::uint32_t internal_format,
-    std::int32_t width,
-    std::int32_t height) noexcept
-{
-    glRenderbufferStorage(
-        static_cast<GLenum>(target),
-        static_cast<GLenum>(internal_format),
-        static_cast<GLsizei>(width),
-        static_cast<GLsizei>(height));
-}
-
-void attach_opengl_framebuffer_renderbuffer(
-    std::uint32_t target,
-    std::uint32_t attachment,
-    std::uint32_t renderbuffer_target,
-    std::uint32_t renderbuffer) noexcept
-{
-    glFramebufferRenderbuffer(
-        static_cast<GLenum>(target),
-        static_cast<GLenum>(attachment),
-        static_cast<GLenum>(renderbuffer_target),
-        static_cast<GLuint>(renderbuffer));
-}
-
 GLuint allocate_canvas_depth_renderbuffer(int width, int height)
 {
-    const auto result = pp::renderer::gl::allocate_opengl_depth_renderbuffer(
+    return static_cast<GLuint>(pp::legacy::gl_renderbuffer::allocate_depth_renderbuffer(
         width,
         height,
-        pp::renderer::gl::OpenGlDepthRenderbufferAllocationDispatch {
-            .gen_renderbuffers = gen_opengl_renderbuffers,
-            .bind_renderbuffer = bind_opengl_renderbuffer,
-            .renderbuffer_storage = set_opengl_renderbuffer_storage,
-        });
-    if (!result.ok()) {
-        LOG("OpenGL canvas depth renderbuffer allocation failed: %s", result.status().message);
-        return 0U;
-    }
-    return static_cast<GLuint>(result.value());
+        "OpenGL canvas depth renderbuffer allocation"));
 }
 
 void attach_canvas_depth_renderbuffer(GLuint renderbuffer)
 {
-    const auto status = pp::renderer::gl::attach_opengl_depth_renderbuffer(
+    pp::legacy::gl_renderbuffer::attach_depth_renderbuffer(
         static_cast<std::uint32_t>(renderbuffer),
-        pp::renderer::gl::OpenGlDepthRenderbufferAttachmentDispatch {
-            .framebuffer_renderbuffer = attach_opengl_framebuffer_renderbuffer,
-        });
-    if (!status.ok())
-        LOG("OpenGL canvas depth renderbuffer attachment failed: %s", status.message);
+        "OpenGL canvas depth renderbuffer attachment");
 }
 
 void delete_canvas_renderbuffer(GLuint renderbuffer)
 {
-    const auto status = pp::renderer::gl::delete_opengl_renderbuffer(
+    pp::legacy::gl_renderbuffer::delete_renderbuffer(
         static_cast<std::uint32_t>(renderbuffer),
-        pp::renderer::gl::OpenGlRenderbufferDeleteDispatch {
-            .delete_renderbuffers = delete_opengl_renderbuffers,
-        });
-    if (!status.ok())
-        LOG("OpenGL canvas renderbuffer delete failed: %s", status.message);
+        "OpenGL canvas renderbuffer delete");
 }
 
 }

src/legacy_gl_renderbuffer_dispatch.h

@@ -0,0 +1,90 @@
+#pragma once
+
+#include <cstdint>
+
+#include "log.h"
+#include "renderer_gl/opengl_capabilities.h"
+
+namespace pp::legacy::gl_renderbuffer {
+
+inline void gen_opengl_renderbuffers(std::uint32_t count, std::uint32_t* ids) noexcept
+{
+    glGenRenderbuffers(static_cast<GLsizei>(count), reinterpret_cast<GLuint*>(ids));
+}
+
+inline void delete_opengl_renderbuffers(std::uint32_t count, const std::uint32_t* ids) noexcept
+{
+    glDeleteRenderbuffers(static_cast<GLsizei>(count), reinterpret_cast<const GLuint*>(ids));
+}
+
+inline void bind_opengl_renderbuffer(std::uint32_t target, std::uint32_t renderbuffer) noexcept
+{
+    glBindRenderbuffer(static_cast<GLenum>(target), static_cast<GLuint>(renderbuffer));
+}
+
+inline void set_opengl_renderbuffer_storage(
+    std::uint32_t target,
+    std::uint32_t internal_format,
+    std::int32_t width,
+    std::int32_t height) noexcept
+{
+    glRenderbufferStorage(
+        static_cast<GLenum>(target),
+        static_cast<GLenum>(internal_format),
+        static_cast<GLsizei>(width),
+        static_cast<GLsizei>(height));
+}
+
+inline void attach_opengl_framebuffer_renderbuffer(
+    std::uint32_t target,
+    std::uint32_t attachment,
+    std::uint32_t renderbuffer_target,
+    std::uint32_t renderbuffer) noexcept
+{
+    glFramebufferRenderbuffer(
+        static_cast<GLenum>(target),
+        static_cast<GLenum>(attachment),
+        static_cast<GLenum>(renderbuffer_target),
+        static_cast<GLuint>(renderbuffer));
+}
+
+inline std::uint32_t allocate_depth_renderbuffer(std::int32_t width, std::int32_t height, const char* context)
+{
+    const auto result = pp::renderer::gl::allocate_opengl_depth_renderbuffer(
+        width,
+        height,
+        pp::renderer::gl::OpenGlDepthRenderbufferAllocationDispatch {
+            .gen_renderbuffers = gen_opengl_renderbuffers,
+            .bind_renderbuffer = bind_opengl_renderbuffer,
+            .renderbuffer_storage = set_opengl_renderbuffer_storage,
+        });
+    if (!result.ok()) {
+        LOG("%s failed because: %s", context, result.status().message);
+        return 0U;
+    }
+    return result.value();
+}
+
+inline void attach_depth_renderbuffer(std::uint32_t renderbuffer, const char* context)
+{
+    const auto status = pp::renderer::gl::attach_opengl_depth_renderbuffer(
+        renderbuffer,
+        pp::renderer::gl::OpenGlDepthRenderbufferAttachmentDispatch {
+            .framebuffer_renderbuffer = attach_opengl_framebuffer_renderbuffer,
+        });
+    if (!status.ok())
+        LOG("%s failed because: %s", context, status.message);
+}
+
+inline void delete_renderbuffer(std::uint32_t renderbuffer, const char* context)
+{
+    const auto status = pp::renderer::gl::delete_opengl_renderbuffer(
+        renderbuffer,
+        pp::renderer::gl::OpenGlRenderbufferDeleteDispatch {
+            .delete_renderbuffers = delete_opengl_renderbuffers,
+        });
+    if (!status.ok())
+        LOG("%s failed because: %s", context, status.message);
+}
+
+} // namespace pp::legacy::gl_renderbuffer

src/rtt.cpp

@@ -3,6 +3,7 @@
 #include "rtt.h"
 #include "util.h"
 #include "app.h"
+#include "legacy_gl_renderbuffer_dispatch.h"
 #include "renderer_gl/opengl_capabilities.h"
 
 #include <cstdint>
@@ -14,11 +15,6 @@ namespace {
     return static_cast<GLenum>(pp::renderer::gl::texture_2d_target());
 }
 
-[[nodiscard]] GLenum renderbuffer_target() noexcept
-{
-    return static_cast<GLenum>(pp::renderer::gl::renderbuffer_target());
-}
-
 [[nodiscard]] GLenum framebuffer_target() noexcept
 {
     return static_cast<GLenum>(pp::renderer::gl::framebuffer_target());
@@ -120,34 +116,6 @@ void set_opengl_texture_parameter_f(std::uint32_t target, std::uint32_t paramete
     glTexParameterf(static_cast<GLenum>(target), static_cast<GLenum>(parameter), static_cast<GLfloat>(value));
 }
 
-void gen_opengl_renderbuffers(std::uint32_t count, std::uint32_t* ids) noexcept
-{
-    glGenRenderbuffers(static_cast<GLsizei>(count), reinterpret_cast<GLuint*>(ids));
-}
-
-void delete_opengl_renderbuffers(std::uint32_t count, const std::uint32_t* ids) noexcept
-{
-    glDeleteRenderbuffers(static_cast<GLsizei>(count), reinterpret_cast<const GLuint*>(ids));
-}
-
-void bind_opengl_renderbuffer(std::uint32_t target, std::uint32_t renderbuffer) noexcept
-{
-    glBindRenderbuffer(static_cast<GLenum>(target), static_cast<GLuint>(renderbuffer));
-}
-
-void set_opengl_renderbuffer_storage(
-    std::uint32_t target,
-    std::uint32_t internal_format,
-    std::int32_t width,
-    std::int32_t height) noexcept
-{
-    glRenderbufferStorage(
-        static_cast<GLenum>(target),
-        static_cast<GLenum>(internal_format),
-        static_cast<GLsizei>(width),
-        static_cast<GLsizei>(height));
-}
-
 void gen_opengl_framebuffers(std::uint32_t count, std::uint32_t* ids) noexcept
 {
     glGenFramebuffers(static_cast<GLsizei>(count), reinterpret_cast<GLuint*>(ids));
@@ -173,19 +141,6 @@ void attach_opengl_framebuffer_texture_2d(
         static_cast<GLint>(level));
 }
 
-void attach_opengl_framebuffer_renderbuffer(
-    std::uint32_t target,
-    std::uint32_t attachment,
-    std::uint32_t renderbuffer_target,
-    std::uint32_t renderbuffer) noexcept
-{
-    glFramebufferRenderbuffer(
-        static_cast<GLenum>(target),
-        static_cast<GLenum>(attachment),
-        static_cast<GLenum>(renderbuffer_target),
-        static_cast<GLuint>(renderbuffer));
-}
-
 std::uint32_t check_opengl_framebuffer_status(std::uint32_t target) noexcept
 {
     return static_cast<std::uint32_t>(glCheckFramebufferStatus(static_cast<GLenum>(target)));
@@ -400,13 +355,9 @@ void RTT::destroy()
     {
         if (rboID)
         {
-            const auto status = pp::renderer::gl::delete_opengl_renderbuffer(
+            pp::legacy::gl_renderbuffer::delete_renderbuffer(
                 static_cast<std::uint32_t>(rboID),
-                pp::renderer::gl::OpenGlRenderbufferDeleteDispatch {
-                    .delete_renderbuffers = delete_opengl_renderbuffers,
-                });
-            if (!status.ok())
-                LOG("RTT::destroy renderbuffer delete failed because: %s", status.message);
+                "RTT::destroy renderbuffer delete");
         }
         if (texID)
         {
@@ -587,21 +538,16 @@ bool RTT::create(int width, int height, int tex/* = -1*/, GLint internal_format,
         // Create a renderbuffer object to store depth info
         if (depth_buffer)
         {
-            const auto renderbuffer = pp::renderer::gl::allocate_opengl_depth_renderbuffer(
+            const auto renderbuffer = pp::legacy::gl_renderbuffer::allocate_depth_renderbuffer(
                 width,
                 height,
-                pp::renderer::gl::OpenGlDepthRenderbufferAllocationDispatch {
-                    .gen_renderbuffers = gen_opengl_renderbuffers,
-                    .bind_renderbuffer = bind_opengl_renderbuffer,
-                    .renderbuffer_storage = set_opengl_renderbuffer_storage,
-                });
-            if (!renderbuffer.ok())
+                "RTT::create depth renderbuffer allocation");
+            if (renderbuffer == 0U)
             {
-                LOG("RTT::create depth renderbuffer allocation failed because: %s", renderbuffer.status().message);
                 status = 0;
                 return;
             }
-            rboID = static_cast<GLuint>(renderbuffer.value());
+            rboID = static_cast<GLuint>(renderbuffer);
         }
 
         // Create a framebuffer object
@@ -613,7 +559,7 @@ bool RTT::create(int width, int height, int tex/* = -1*/, GLint internal_format,
                 .get_integer = query_opengl_integer,
                 .bind_framebuffer = bind_opengl_framebuffer,
                 .framebuffer_texture_2d = attach_opengl_framebuffer_texture_2d,
-                .framebuffer_renderbuffer = attach_opengl_framebuffer_renderbuffer,
+                .framebuffer_renderbuffer = pp::legacy::gl_renderbuffer::attach_opengl_framebuffer_renderbuffer,
                 .check_framebuffer_status = check_opengl_framebuffer_status,
             });
         if (!framebuffer.ok())