From e4febb4200842722e0bd1d272c0cca3da28feadb Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Thu, 19 Nov 2026 04:45:47 +0200 Subject: [PATCH] render: move make_* into null::factory Follow-up to ruis issue #190: the shareable-object make_* functions now live on a new null::factory (a no-op factory mirroring null::context). null::context takes an injected factory and no longer creates objects. --- src/ruis/render/null/context.cpp | 139 --------------------- src/ruis/render/null/context.hpp | 66 ++-------- src/ruis/render/null/factory.cpp | 164 +++++++++++++++++++++++++ src/ruis/render/null/factory.hpp | 88 +++++++++++++ src/ruis/render/null/index_buffer.cpp | 4 +- src/ruis/render/null/index_buffer.hpp | 4 +- src/ruis/render/null/texture_2d.cpp | 4 +- src/ruis/render/null/texture_2d.hpp | 6 +- src/ruis/render/null/texture_cube.cpp | 2 +- src/ruis/render/null/texture_cube.hpp | 2 +- src/ruis/render/null/texture_depth.cpp | 2 +- src/ruis/render/null/texture_depth.hpp | 2 +- src/ruis/render/null/vertex_array.cpp | 2 +- src/ruis/render/null/vertex_array.hpp | 2 +- src/ruis/render/null/vertex_buffer.cpp | 8 +- src/ruis/render/null/vertex_buffer.hpp | 8 +- 16 files changed, 282 insertions(+), 221 deletions(-) create mode 100644 src/ruis/render/null/factory.cpp create mode 100644 src/ruis/render/null/factory.hpp diff --git a/src/ruis/render/null/context.cpp b/src/ruis/render/null/context.cpp index 03b32ee..670af29 100644 --- a/src/ruis/render/null/context.cpp +++ b/src/ruis/render/null/context.cpp @@ -22,12 +22,6 @@ along with this program. If not, see . #include "context.hpp" #include "frame_buffer.hpp" -#include "index_buffer.hpp" -#include "texture_2d.hpp" -#include "texture_cube.hpp" -#include "texture_depth.hpp" -#include "vertex_array.hpp" -#include "vertex_buffer.hpp" using namespace ruis::render::null; @@ -44,136 +38,3 @@ utki::shared_ref context::make_framebuffer( std::move(stencil) ); } - -utki::shared_ref context::make_index_buffer(utki::span indices) const -{ - return utki::make_shared( - this->get_shared_ref(), // - indices - ); -} - -utki::shared_ref context::make_index_buffer(utki::span indices) const -{ - return utki::make_shared( - this->get_shared_ref(), // - indices - ); -} - -utki::shared_ref context::make_texture_2d( - rasterimage::format format, - rasterimage::dimensioned::dimensions_type dims, - texture_2d_parameters params -) const -{ - return utki::make_shared( - this->get_shared_ref(), // - rasterimage::image_variant(dims, format), - std::move(params) - ); -} - -utki::shared_ref context::make_texture_2d( - const rasterimage::image_variant& imvar, - texture_2d_parameters params -) const -{ - return utki::make_shared( - this->get_shared_ref(), // - imvar, - std::move(params) - ); -} - -utki::shared_ref context::make_texture_2d( - rasterimage::image_variant&& imvar, - texture_2d_parameters params -) const -{ - return utki::make_shared( - this->get_shared_ref(), // - std::move(imvar), - std::move(params) - ); -} - -utki::shared_ref context::make_texture_depth(r4::vector2 dims) const -{ - return utki::make_shared( - this->get_shared_ref(), // - dims - ); -} - -utki::shared_ref context::make_texture_cube( - rasterimage::image_variant&& positive_x, - rasterimage::image_variant&& negative_x, - rasterimage::image_variant&& positive_y, - rasterimage::image_variant&& negative_y, - rasterimage::image_variant&& positive_z, - rasterimage::image_variant&& negative_z -) const -{ - return utki::make_shared( - this->get_shared_ref(), // - std::move(positive_x), - std::move(negative_x), - std::move(positive_y), - std::move(negative_y), - std::move(positive_z), - std::move(negative_z) - ); -} - -utki::shared_ref context::make_vertex_array( - std::vector> buffers, - utki::shared_ref indices, - ruis::render::vertex_array::mode rendering_mode -) const -{ - return utki::make_shared( - this->get_shared_ref(), // - std::move(buffers), - std::move(indices), - rendering_mode - ); -} - -utki::shared_ref context::make_vertex_buffer(utki::span vertices) const -{ - return utki::make_shared( - this->get_shared_ref(), // - vertices - ); -} - -utki::shared_ref context::make_vertex_buffer( // - utki::span> vertices -) const -{ - return utki::make_shared( - this->get_shared_ref(), // - vertices - ); -} - -utki::shared_ref context::make_vertex_buffer( // - utki::span> vertices -) const -{ - return utki::make_shared( - this->get_shared_ref(), // - vertices - ); -} - -utki::shared_ref context::make_vertex_buffer( // - utki::span> vertices -) const -{ - return utki::make_shared( - this->get_shared_ref(), // - vertices - ); -} diff --git a/src/ruis/render/null/context.hpp b/src/ruis/render/null/context.hpp index 9cf1bd8..773ef46 100644 --- a/src/ruis/render/null/context.hpp +++ b/src/ruis/render/null/context.hpp @@ -24,16 +24,21 @@ along with this program. If not, see . #include #include +#include "factory.hpp" + namespace ruis::render::null { class context : public ruis::render::context { public: context( - utki::shared_ref native_window = utki::make_shared() + utki::shared_ref native_window = + utki::make_shared(), // + utki::shared_ref factory = utki::make_shared() ) : ruis::render::context( std::move(native_window), // + std::move(factory), // parameters() ) {} @@ -41,69 +46,12 @@ class context : public ruis::render::context // =============================== // ====== factory functions ====== - utki::shared_ref make_shaders() const override - { - return utki::make_shared(); - } - utki::shared_ref make_framebuffer( std::shared_ptr color, std::shared_ptr depth, std::shared_ptr stencil ) override; - utki::shared_ref make_index_buffer(utki::span indices) const override; - utki::shared_ref make_index_buffer(utki::span indices) const override; - - utki::shared_ref make_texture_2d( - rasterimage::format format, - rasterimage::dimensioned::dimensions_type dims, - texture_2d_parameters params - ) const override; - - utki::shared_ref make_texture_2d( - const rasterimage::image_variant& imvar, - texture_2d_parameters params - ) const override; - - utki::shared_ref make_texture_2d( - rasterimage::image_variant&& imvar, - texture_2d_parameters params - ) const override; - - utki::shared_ref make_texture_depth(r4::vector2 dims) const override; - - utki::shared_ref make_texture_cube( - rasterimage::image_variant&& positive_x, - rasterimage::image_variant&& negative_x, - rasterimage::image_variant&& positive_y, - rasterimage::image_variant&& negative_y, - rasterimage::image_variant&& positive_z, - rasterimage::image_variant&& negative_z - ) const override; - - utki::shared_ref make_vertex_array( - std::vector> buffers, - utki::shared_ref indices, - ruis::render::vertex_array::mode rendering_mode - ) const override; - - utki::shared_ref make_vertex_buffer( // - utki::span vertices - ) const override; - - utki::shared_ref make_vertex_buffer( // - utki::span> vertices - ) const override; - - utki::shared_ref make_vertex_buffer( // - utki::span> vertices - ) const override; - - utki::shared_ref make_vertex_buffer( // - utki::span> vertices - ) const override; - // ===================================== // ====== state control functions ====== @@ -159,4 +107,4 @@ class context : public ruis::render::context void enable_depth(bool enable) override {} }; -} // namespace ruis::render::null \ No newline at end of file +} // namespace ruis::render::null diff --git a/src/ruis/render/null/factory.cpp b/src/ruis/render/null/factory.cpp new file mode 100644 index 0000000..4170573 --- /dev/null +++ b/src/ruis/render/null/factory.cpp @@ -0,0 +1,164 @@ +/* +ruis-render-null - null renderer + +Copyright (C) 2024-2024 Ivan Gagis + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +/* ================ LICENSE END ================ */ + +#include "factory.hpp" + +#include "index_buffer.hpp" +#include "texture_2d.hpp" +#include "texture_cube.hpp" +#include "texture_depth.hpp" +#include "vertex_array.hpp" +#include "vertex_buffer.hpp" + +using namespace ruis::render::null; + +utki::shared_ref factory::make_index_buffer(utki::span indices) const +{ + return utki::make_shared( + this->get_shared_ref(), // + indices + ); +} + +utki::shared_ref factory::make_index_buffer(utki::span indices) const +{ + return utki::make_shared( + this->get_shared_ref(), // + indices + ); +} + +utki::shared_ref factory::make_texture_2d( + rasterimage::format format, + rasterimage::dimensioned::dimensions_type dims, + texture_2d_parameters params +) const +{ + return utki::make_shared( + this->get_shared_ref(), // + rasterimage::image_variant(dims, format), + std::move(params) + ); +} + +utki::shared_ref factory::make_texture_2d( + const rasterimage::image_variant& imvar, + texture_2d_parameters params +) const +{ + return utki::make_shared( + this->get_shared_ref(), // + imvar, + std::move(params) + ); +} + +utki::shared_ref factory::make_texture_2d( + rasterimage::image_variant&& imvar, + texture_2d_parameters params +) const +{ + return utki::make_shared( + this->get_shared_ref(), // + std::move(imvar), + std::move(params) + ); +} + +utki::shared_ref factory::make_texture_depth(r4::vector2 dims) const +{ + return utki::make_shared( + this->get_shared_ref(), // + dims + ); +} + +utki::shared_ref factory::make_texture_cube( + rasterimage::image_variant&& positive_x, + rasterimage::image_variant&& negative_x, + rasterimage::image_variant&& positive_y, + rasterimage::image_variant&& negative_y, + rasterimage::image_variant&& positive_z, + rasterimage::image_variant&& negative_z +) const +{ + return utki::make_shared( + this->get_shared_ref(), // + std::move(positive_x), + std::move(negative_x), + std::move(positive_y), + std::move(negative_y), + std::move(positive_z), + std::move(negative_z) + ); +} + +utki::shared_ref factory::make_vertex_array( + std::vector> buffers, + utki::shared_ref indices, + ruis::render::vertex_array::mode rendering_mode +) const +{ + return utki::make_shared( + this->get_shared_ref(), // + std::move(buffers), + std::move(indices), + rendering_mode + ); +} + +utki::shared_ref factory::make_vertex_buffer(utki::span vertices) const +{ + return utki::make_shared( + this->get_shared_ref(), // + vertices + ); +} + +utki::shared_ref factory::make_vertex_buffer( // + utki::span> vertices +) const +{ + return utki::make_shared( + this->get_shared_ref(), // + vertices + ); +} + +utki::shared_ref factory::make_vertex_buffer( // + utki::span> vertices +) const +{ + return utki::make_shared( + this->get_shared_ref(), // + vertices + ); +} + +utki::shared_ref factory::make_vertex_buffer( // + utki::span> vertices +) const +{ + return utki::make_shared( + this->get_shared_ref(), // + vertices + ); +} diff --git a/src/ruis/render/null/factory.hpp b/src/ruis/render/null/factory.hpp new file mode 100644 index 0000000..b3a35d2 --- /dev/null +++ b/src/ruis/render/null/factory.hpp @@ -0,0 +1,88 @@ +/* +ruis-render-null - null renderer + +Copyright (C) 2024-2024 Ivan Gagis + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +/* ================ LICENSE END ================ */ + +#pragma once + +#include +#include + +namespace ruis::render::null { + +class factory : public ruis::render::factory +{ +public: + factory() = default; + + utki::shared_ref make_shaders() const override + { + return utki::make_shared(); + } + + utki::shared_ref make_index_buffer(utki::span indices) const override; + utki::shared_ref make_index_buffer(utki::span indices) const override; + + utki::shared_ref make_texture_2d( + rasterimage::format format, + rasterimage::dimensioned::dimensions_type dims, + texture_2d_parameters params + ) const override; + + utki::shared_ref make_texture_2d(const rasterimage::image_variant& imvar, texture_2d_parameters params) + const override; + + utki::shared_ref make_texture_2d(rasterimage::image_variant&& imvar, texture_2d_parameters params) + const override; + + utki::shared_ref make_texture_depth(r4::vector2 dims) const override; + + utki::shared_ref make_texture_cube( + rasterimage::image_variant&& positive_x, + rasterimage::image_variant&& negative_x, + rasterimage::image_variant&& positive_y, + rasterimage::image_variant&& negative_y, + rasterimage::image_variant&& positive_z, + rasterimage::image_variant&& negative_z + ) const override; + + utki::shared_ref make_vertex_array( + std::vector> buffers, + utki::shared_ref indices, + vertex_array::mode rendering_mode + ) const override; + + utki::shared_ref make_vertex_buffer( // + utki::span vertices + ) const override; + + utki::shared_ref make_vertex_buffer( // + utki::span> vertices + ) const override; + + utki::shared_ref make_vertex_buffer( // + utki::span> vertices + ) const override; + + utki::shared_ref make_vertex_buffer( // + utki::span> vertices + ) const override; +}; + +} // namespace ruis::render::null diff --git a/src/ruis/render/null/index_buffer.cpp b/src/ruis/render/null/index_buffer.cpp index 0f65b51..0edc310 100644 --- a/src/ruis/render/null/index_buffer.cpp +++ b/src/ruis/render/null/index_buffer.cpp @@ -24,7 +24,7 @@ along with this program. If not, see . using namespace ruis::render::null; index_buffer::index_buffer( - const utki::shared_ref& rendering_context, // + const utki::shared_ref& rendering_context, // utki::span indices ) : ruis::render::index_buffer(rendering_context), @@ -32,7 +32,7 @@ index_buffer::index_buffer( {} index_buffer::index_buffer( - const utki::shared_ref& rendering_context, // + const utki::shared_ref& rendering_context, // utki::span indices ) : ruis::render::index_buffer(rendering_context), diff --git a/src/ruis/render/null/index_buffer.hpp b/src/ruis/render/null/index_buffer.hpp index 40c1a44..7b13151 100644 --- a/src/ruis/render/null/index_buffer.hpp +++ b/src/ruis/render/null/index_buffer.hpp @@ -39,11 +39,11 @@ class index_buffer : public ruis::render::index_buffer indices; index_buffer( - const utki::shared_ref& rendering_context, // + const utki::shared_ref& rendering_context, // utki::span indices ); index_buffer( - const utki::shared_ref& rendering_context, // + const utki::shared_ref& rendering_context, // utki::span indices ); }; diff --git a/src/ruis/render/null/texture_2d.cpp b/src/ruis/render/null/texture_2d.cpp index 42e0bc0..6215709 100644 --- a/src/ruis/render/null/texture_2d.cpp +++ b/src/ruis/render/null/texture_2d.cpp @@ -24,9 +24,9 @@ along with this program. If not, see . using namespace ruis::render::null; texture_2d::texture_2d( - const utki::shared_ref& rendering_context, // + const utki::shared_ref& rendering_context, // rasterimage::image_variant image, - ruis::render::context::texture_2d_parameters params + ruis::render::factory::texture_2d_parameters params ) : ruis::render::texture_2d( rendering_context, // diff --git a/src/ruis/render/null/texture_2d.hpp b/src/ruis/render/null/texture_2d.hpp index ed915d9..da40a97 100644 --- a/src/ruis/render/null/texture_2d.hpp +++ b/src/ruis/render/null/texture_2d.hpp @@ -30,13 +30,13 @@ namespace ruis::render::null { class texture_2d : public ruis::render::texture_2d { public: - const ruis::render::context::texture_2d_parameters params; + const ruis::render::factory::texture_2d_parameters params; const rasterimage::image_variant image; texture_2d( - const utki::shared_ref& rendering_context, // + const utki::shared_ref& rendering_context, // rasterimage::image_variant image, - ruis::render::context::texture_2d_parameters params + ruis::render::factory::texture_2d_parameters params ); }; diff --git a/src/ruis/render/null/texture_cube.cpp b/src/ruis/render/null/texture_cube.cpp index ff5d125..34e746c 100644 --- a/src/ruis/render/null/texture_cube.cpp +++ b/src/ruis/render/null/texture_cube.cpp @@ -24,7 +24,7 @@ along with this program. If not, see . using namespace ruis::render::null; texture_cube::texture_cube( - const utki::shared_ref& rendering_context, // + const utki::shared_ref& rendering_context, // rasterimage::image_variant&& positive_x, rasterimage::image_variant&& negative_x, rasterimage::image_variant&& positive_y, diff --git a/src/ruis/render/null/texture_cube.hpp b/src/ruis/render/null/texture_cube.hpp index ad42880..fd24d09 100644 --- a/src/ruis/render/null/texture_cube.hpp +++ b/src/ruis/render/null/texture_cube.hpp @@ -37,7 +37,7 @@ class texture_cube : public ruis::render::texture_cube const rasterimage::image_variant negative_z; texture_cube( - const utki::shared_ref& rendering_context, // + const utki::shared_ref& rendering_context, // rasterimage::image_variant&& positive_x, rasterimage::image_variant&& negative_x, rasterimage::image_variant&& positive_y, diff --git a/src/ruis/render/null/texture_depth.cpp b/src/ruis/render/null/texture_depth.cpp index 721c0b5..b849542 100644 --- a/src/ruis/render/null/texture_depth.cpp +++ b/src/ruis/render/null/texture_depth.cpp @@ -24,7 +24,7 @@ along with this program. If not, see . using namespace ruis::render::null; texture_depth::texture_depth( - const utki::shared_ref& rendering_context, // + const utki::shared_ref& rendering_context, // r4::vector2 dims ) : ruis::render::texture_depth( diff --git a/src/ruis/render/null/texture_depth.hpp b/src/ruis/render/null/texture_depth.hpp index 59e19cc..7d6298b 100644 --- a/src/ruis/render/null/texture_depth.hpp +++ b/src/ruis/render/null/texture_depth.hpp @@ -29,7 +29,7 @@ class texture_depth : public ruis::render::texture_depth { public: texture_depth( - const utki::shared_ref& rendering_context, // + const utki::shared_ref& rendering_context, // r4::vector2 dims ); }; diff --git a/src/ruis/render/null/vertex_array.cpp b/src/ruis/render/null/vertex_array.cpp index 00a7fc6..ecaad67 100644 --- a/src/ruis/render/null/vertex_array.cpp +++ b/src/ruis/render/null/vertex_array.cpp @@ -24,7 +24,7 @@ along with this program. If not, see . using namespace ruis::render::null; vertex_array::vertex_array( - const utki::shared_ref& rendering_context, // + const utki::shared_ref& rendering_context, // std::vector> buffers, utki::shared_ref indices, ruis::render::vertex_array::mode rendering_mode diff --git a/src/ruis/render/null/vertex_array.hpp b/src/ruis/render/null/vertex_array.hpp index bdbfae5..82d10da 100644 --- a/src/ruis/render/null/vertex_array.hpp +++ b/src/ruis/render/null/vertex_array.hpp @@ -32,7 +32,7 @@ class vertex_array : public ruis::render::vertex_array { public: vertex_array( - const utki::shared_ref& rendering_context, // + const utki::shared_ref& rendering_context, // std::vector> buffers, utki::shared_ref indices, ruis::render::vertex_array::mode rendering_mode diff --git a/src/ruis/render/null/vertex_buffer.cpp b/src/ruis/render/null/vertex_buffer.cpp index 7708d63..210b65c 100644 --- a/src/ruis/render/null/vertex_buffer.cpp +++ b/src/ruis/render/null/vertex_buffer.cpp @@ -24,7 +24,7 @@ along with this program. If not, see . using namespace ruis::render::null; vertex_buffer::vertex_buffer( - const utki::shared_ref& rendering_context, // + const utki::shared_ref& rendering_context, // utki::span vertices ) : ruis::render::vertex_buffer( @@ -35,7 +35,7 @@ vertex_buffer::vertex_buffer( {} vertex_buffer::vertex_buffer( - const utki::shared_ref& rendering_context, // + const utki::shared_ref& rendering_context, // utki::span> vertices ) : ruis::render::vertex_buffer( @@ -46,7 +46,7 @@ vertex_buffer::vertex_buffer( {} vertex_buffer::vertex_buffer( - const utki::shared_ref& rendering_context, // + const utki::shared_ref& rendering_context, // utki::span> vertices ) : ruis::render::vertex_buffer( @@ -57,7 +57,7 @@ vertex_buffer::vertex_buffer( {} vertex_buffer::vertex_buffer( - const utki::shared_ref& rendering_context, // + const utki::shared_ref& rendering_context, // utki::span> vertices ) : ruis::render::vertex_buffer( diff --git a/src/ruis/render/null/vertex_buffer.hpp b/src/ruis/render/null/vertex_buffer.hpp index 46da996..dc42b89 100644 --- a/src/ruis/render/null/vertex_buffer.hpp +++ b/src/ruis/render/null/vertex_buffer.hpp @@ -41,19 +41,19 @@ class vertex_buffer : public ruis::render::vertex_buffer vertices; vertex_buffer( - const utki::shared_ref& rendering_context, // + const utki::shared_ref& rendering_context, // utki::span vertices ); vertex_buffer( - const utki::shared_ref& rendering_context, // + const utki::shared_ref& rendering_context, // utki::span> vertices ); vertex_buffer( - const utki::shared_ref& rendering_context, // + const utki::shared_ref& rendering_context, // utki::span> vertices ); vertex_buffer( - const utki::shared_ref& rendering_context, // + const utki::shared_ref& rendering_context, // utki::span> vertices ); };