context::create_shaders()

Author: igagis

src/ruis/render/opengl/context.cpp

@@ -19,4 +19,32 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 /* ================ LICENSE END ================ */
 
-#include "context.hpp"
+#include "context.hpp"
+
+#include "shaders/shader_color.hpp"
+#include "shaders/shader_color_pos_lum.hpp"
+#include "shaders/shader_color_pos_tex.hpp"
+#include "shaders/shader_color_pos_tex_alpha.hpp"
+#include "shaders/shader_pos_clr.hpp"
+#include "shaders/shader_pos_tex.hpp"
+
+using namespace ruis::render::opengl;
+
+utki::shared_ref<ruis::render::context::shaders> context::create_shaders()
+{
+	// TODO: are those lint supressions still valid?
+	auto ret = utki::make_shared<ruis::render::context::shaders>();
+	// NOLINTNEXTLINE(bugprone-unused-return-value, "false positive")
+	ret.get().pos_tex = std::make_unique<shader_pos_tex>();
+	// NOLINTNEXTLINE(bugprone-unused-return-value, "false positive")
+	ret.get().color_pos = std::make_unique<shader_color>();
+	// NOLINTNEXTLINE(bugprone-unused-return-value, "false positive")
+	ret.get().pos_clr = std::make_unique<shader_pos_clr>();
+	// NOLINTNEXTLINE(bugprone-unused-return-value, "false positive")
+	ret.get().color_pos_tex = std::make_unique<shader_color_pos_tex>();
+	// NOLINTNEXTLINE(bugprone-unused-return-value, "false positive")
+	ret.get().color_pos_tex_alpha = std::make_unique<shader_color_pos_tex_alpha>();
+	// NOLINTNEXTLINE(bugprone-unused-return-value, "false positive")
+	ret.get().color_pos_lum = std::make_unique<shader_color_pos_lum>();
+	return ret;
+}

src/ruis/render/opengl/context.hpp

@@ -28,6 +28,7 @@ namespace ruis::render::opengl {
 class context : public ruis::render::context
 {
 public:
+	utki::shared_ref<shaders> create_shaders() override;
 };
 
 } // namespace ruis::render::opengl

src/ruis/render/opengl/factory.cpp

@@ -23,13 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include <GL/glew.h>
 
-#include "shaders/shader_color.hpp"
-#include "shaders/shader_color_pos_lum.hpp"
-#include "shaders/shader_color_pos_tex.hpp"
-#include "shaders/shader_color_pos_tex_alpha.hpp"
-#include "shaders/shader_pos_clr.hpp"
-#include "shaders/shader_pos_tex.hpp"
-
 #include "frame_buffer.hpp"
 #include "index_buffer.hpp"
 #include "texture_2d.hpp"
@@ -245,25 +238,6 @@ utki::shared_ref<ruis::render::index_buffer> factory::create_index_buffer(utki::
 	);
 }
 
-utki::shared_ref<ruis::render::factory::shaders> factory::create_shaders()
-{
-	// TODO: are those lint supressions still valid?
-	auto ret = utki::make_shared<ruis::render::factory::shaders>();
-	// NOLINTNEXTLINE(bugprone-unused-return-value, "false positive")
-	ret.get().pos_tex = std::make_unique<shader_pos_tex>();
-	// NOLINTNEXTLINE(bugprone-unused-return-value, "false positive")
-	ret.get().color_pos = std::make_unique<shader_color>();
-	// NOLINTNEXTLINE(bugprone-unused-return-value, "false positive")
-	ret.get().pos_clr = std::make_unique<shader_pos_clr>();
-	// NOLINTNEXTLINE(bugprone-unused-return-value, "false positive")
-	ret.get().color_pos_tex = std::make_unique<shader_color_pos_tex>();
-	// NOLINTNEXTLINE(bugprone-unused-return-value, "false positive")
-	ret.get().color_pos_tex_alpha = std::make_unique<shader_color_pos_tex_alpha>();
-	// NOLINTNEXTLINE(bugprone-unused-return-value, "false positive")
-	ret.get().color_pos_lum = std::make_unique<shader_color_pos_lum>();
-	return ret;
-}
-
 utki::shared_ref<ruis::render::frame_buffer> factory::create_framebuffer( //
 	std::shared_ptr<ruis::render::texture_2d> color,
 	std::shared_ptr<ruis::render::texture_depth> depth,

src/ruis/render/opengl/factory.hpp

@@ -85,8 +85,6 @@ class factory : public ruis::render::factory
 		ruis::render::vertex_array::mode mode
 	) override;
 
-	utki::shared_ref<shaders> create_shaders() override;
-
 	utki::shared_ref<ruis::render::frame_buffer> create_framebuffer( //
 		std::shared_ptr<ruis::render::texture_2d> color,
 		std::shared_ptr<ruis::render::texture_depth> depth,