Use GL samplers

Author: floppyhammer

pathfinder/gpu/gl/command_encoder.cpp

@@ -9,6 +9,7 @@
 #include "framebuffer.h"
 #include "render_pass.h"
 #include "render_pipeline.h"
+#include "sampler.h"
 
 namespace Pathfinder {
 
@@ -177,29 +178,11 @@ bool CommandEncoderGl::finish() {
                             auto texture_gl = static_cast<TextureGl *>(descriptor.texture.get());
 
                             glActiveTexture(GL_TEXTURE0 + binding_point);
-
-                            auto sampler_descriptor = descriptor.sampler->get_descriptor();
-
                             glBindTexture(GL_TEXTURE_2D, texture_gl->get_texture_id());
 
-                            // Set texture sampler.
-                            // --------------------------------------------------------------
-                            // Set wrapping parameters.
-                            glTexParameteri(GL_TEXTURE_2D,
-                                            GL_TEXTURE_WRAP_S,
-                                            to_gl_sampler_address_mode(sampler_descriptor.address_mode_u));
-                            glTexParameteri(GL_TEXTURE_2D,
-                                            GL_TEXTURE_WRAP_T,
-                                            to_gl_sampler_address_mode(sampler_descriptor.address_mode_v));
-
-                            // Set filtering parameters.
-                            glTexParameteri(GL_TEXTURE_2D,
-                                            GL_TEXTURE_MIN_FILTER,
-                                            to_gl_sampler_filter(sampler_descriptor.min_filter));
-                            glTexParameteri(GL_TEXTURE_2D,
-                                            GL_TEXTURE_MAG_FILTER,
-                                            to_gl_sampler_filter(sampler_descriptor.mag_filter));
-                            // --------------------------------------------------------------
+                            // Set sampler.
+                            auto sampler_gl = static_cast<SamplerGl *>(descriptor.sampler.get());
+                            glBindSampler(binding_point, sampler_gl->get_handle());
 
                             gl_check_error("bind texture");
                         } break;

pathfinder/gpu/gl/device.cpp

@@ -7,6 +7,7 @@
 #include "framebuffer.h"
 #include "render_pass.h"
 #include "render_pipeline.h"
+#include "sampler.h"
 #include "shader_module.h"
 
 namespace Pathfinder {
@@ -50,7 +51,7 @@ std::shared_ptr<Texture> DeviceGl::wrap_texture(uint32_t external_gl_id, const T
 }
 
 std::shared_ptr<Sampler> DeviceGl::create_sampler(SamplerDescriptor descriptor) {
-    return std::shared_ptr<Sampler>(new Sampler(descriptor));
+    return std::shared_ptr<SamplerGl>(new SamplerGl(descriptor));
 }
 
 std::shared_ptr<CommandEncoder> DeviceGl::create_command_encoder(const std::string &label) {

pathfinder/gpu/gl/sampler.cpp

@@ -0,0 +1,20 @@
+#include "sampler.h"
+
+#include "base.h"
+
+namespace Pathfinder {
+
+SamplerGl::SamplerGl(SamplerDescriptor descriptor) : Sampler(descriptor) {
+    glGenSamplers(1, &id_);
+
+    glSamplerParameteri(id_, GL_TEXTURE_WRAP_S, to_gl_sampler_address_mode(descriptor.address_mode_u));
+    glSamplerParameteri(id_, GL_TEXTURE_WRAP_T, to_gl_sampler_address_mode(descriptor.address_mode_v));
+    glSamplerParameteri(id_, GL_TEXTURE_MIN_FILTER, to_gl_sampler_filter(descriptor.min_filter));
+    glSamplerParameteri(id_, GL_TEXTURE_MAG_FILTER, to_gl_sampler_filter(descriptor.mag_filter));
+}
+
+SamplerGl::~SamplerGl() {
+    glDeleteSamplers(1, &id_);
+}
+
+} // namespace Pathfinder

pathfinder/gpu/gl/sampler.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#include <cstdint>
+
+#include "../texture.h"
+
+namespace Pathfinder {
+
+class SamplerGl : public Sampler {
+public:
+    explicit SamplerGl(SamplerDescriptor descriptor);
+
+    ~SamplerGl() override;
+
+    uint32_t get_handle() const {
+        return id_;
+    }
+
+private:
+    uint32_t id_{};
+};
+
+} // namespace Pathfinder