Share retained sampler and pixel-buffer dispatch bridges

src/texture.cpp

@@ -4,70 +4,12 @@
 #include "util.h"
 #include "app.h"
 #include "legacy_gl_framebuffer_dispatch.h"
+#include "legacy_gl_sampler_dispatch.h"
 #include "legacy_gl_texture_dispatch.h"
 #include "renderer_gl/opengl_capabilities.h"
 
 #include <cstdint>
 
-namespace {
-
-void gen_opengl_samplers(std::uint32_t count, std::uint32_t* ids) noexcept
-{
-#if USE_SAMPLER
-    glGenSamplers(static_cast<GLsizei>(count), reinterpret_cast<GLuint*>(ids));
-#else
-    for (std::uint32_t i = 0U; i < count; ++i) {
-        ids[i] = 0U;
-    }
-#endif
-}
-
-void set_opengl_sampler_parameter_i(
-    std::uint32_t sampler,
-    std::uint32_t parameter,
-    std::int32_t value) noexcept
-{
-#if USE_SAMPLER
-    glSamplerParameteri(
-        static_cast<GLuint>(sampler),
-        static_cast<GLenum>(parameter),
-        static_cast<GLint>(value));
-#else
-    (void)sampler;
-    (void)parameter;
-    (void)value;
-#endif
-}
-
-void set_opengl_sampler_parameter_fv(
-    std::uint32_t sampler,
-    std::uint32_t parameter,
-    const float* values) noexcept
-{
-#if USE_SAMPLER && !defined(__GLES__)
-    glSamplerParameterfv(
-        static_cast<GLuint>(sampler),
-        static_cast<GLenum>(parameter),
-        values);
-#else
-    (void)sampler;
-    (void)parameter;
-    (void)values;
-#endif
-}
-
-void bind_opengl_sampler(std::uint32_t unit, std::uint32_t sampler) noexcept
-{
-#if USE_SAMPLER
-    glBindSampler(static_cast<GLuint>(unit), static_cast<GLuint>(sampler));
-#else
-    (void)unit;
-    (void)sampler;
-#endif
-}
-
-}
-
 std::map<uint16_t, Texture2D> TextureManager::m_textures;
 std::array<int, 6> TextureCube::m_faces_map {
     static_cast<int>(pp::renderer::gl::cube_face_texture_target(0U)),
@@ -419,19 +361,15 @@ bool Sampler::create(GLint filter, GLint wrap)
         const auto parameters = pp::renderer::gl::sampler_parameters_for_filter_wrap(
             static_cast<std::uint32_t>(filter),
             static_cast<std::uint32_t>(wrap));
-        const auto sampler = pp::renderer::gl::create_opengl_sampler(
+        const auto sampler = pp::legacy::gl_sampler::create_sampler(
             parameters,
-            pp::renderer::gl::OpenGlSamplerCreateDispatch {
-                .gen_samplers = gen_opengl_samplers,
-                .sampler_parameter_i = set_opengl_sampler_parameter_i,
-            });
-        if (!sampler.ok())
+            "Sampler::create()");
+        if (sampler == 0U)
         {
             ret = false;
-            LOG("Sampler::create() failed because: %s", sampler.status().message);
             return;
         }
-        id = static_cast<GLuint>(sampler.value());
+        id = static_cast<GLuint>(sampler);
         ret = true;
     });
     return ret;
@@ -456,14 +394,10 @@ void Sampler::set(GLint filter, GLint wrap)
         const auto parameters = pp::renderer::gl::sampler_parameters_for_filter_wrap(
             static_cast<std::uint32_t>(filter),
             static_cast<std::uint32_t>(wrap));
-        const auto status = pp::renderer::gl::set_opengl_sampler_parameters(
+        pp::legacy::gl_sampler::set_sampler_parameters(
             static_cast<std::uint32_t>(id),
             parameters,
-            pp::renderer::gl::OpenGlSamplerParameterDispatch {
-                .sampler_parameter_i = set_opengl_sampler_parameter_i,
-            });
-        if (!status.ok())
-            LOG("Sampler::set() failed because: %s", status.message);
+            "Sampler::set()");
     });
 }
 
@@ -486,54 +420,38 @@ void Sampler::set_filter(GLint filter_min, GLint filter_mag)
         const auto parameters = pp::renderer::gl::sampler_filter_parameters(
             static_cast<std::uint32_t>(filter_min),
             static_cast<std::uint32_t>(filter_mag));
-        const auto status = pp::renderer::gl::set_opengl_sampler_parameters(
+        pp::legacy::gl_sampler::set_sampler_parameters(
             static_cast<std::uint32_t>(id),
             parameters,
-            pp::renderer::gl::OpenGlSamplerParameterDispatch {
-                .sampler_parameter_i = set_opengl_sampler_parameter_i,
-            });
-        if (!status.ok())
-            LOG("Sampler::set_filter() failed because: %s", status.message);
+            "Sampler::set_filter()");
     });
 }
 void Sampler::set_border(glm::vec4 rgba)
 {
     App::I->render_task([this, rgba]
     {
-        const auto status = pp::renderer::gl::set_opengl_sampler_border_color(
+        pp::legacy::gl_sampler::set_sampler_border_color(
             static_cast<std::uint32_t>(id),
             pp::renderer::gl::sampler_border_color_parameter_name(),
             glm::value_ptr(rgba),
-            pp::renderer::gl::OpenGlSamplerBorderDispatch {
-                .sampler_parameter_fv = set_opengl_sampler_parameter_fv,
-            });
-        if (!status.ok())
-            LOG("Sampler::set_border() failed because: %s", status.message);
+            "Sampler::set_border()");
     });
 }
 void Sampler::bind(int unit) const
 {
     assert(App::I->is_render_thread());
     current_unit = unit;
-    const auto status = pp::renderer::gl::bind_opengl_sampler_object(
+    pp::legacy::gl_sampler::bind_sampler(
         static_cast<std::uint32_t>(unit),
         static_cast<std::uint32_t>(id),
-        pp::renderer::gl::OpenGlSamplerBindDispatch {
-            .bind_sampler = bind_opengl_sampler,
-        });
-    if (!status.ok())
-        LOG("Sampler::bind() failed because: %s", status.message);
+        "Sampler::bind()");
 }
 void Sampler::unbind()
 {
     assert(App::I->is_render_thread());
-    const auto status = pp::renderer::gl::bind_opengl_sampler_object(
+    pp::legacy::gl_sampler::bind_sampler(
         static_cast<std::uint32_t>(current_unit),
         0U,
-        pp::renderer::gl::OpenGlSamplerBindDispatch {
-            .bind_sampler = bind_opengl_sampler,
-        });
-    if (!status.ok())
-        LOG("Sampler::unbind() failed because: %s", status.message);
+        "Sampler::unbind()");
 }