Skip to content

Commit 798b1b8

Browse files
committed
shared_ref<shaders>
1 parent 34ece8e commit 798b1b8

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

src/ruis/render/opengl/factory.cpp

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -245,21 +245,22 @@ utki::shared_ref<ruis::render::index_buffer> factory::create_index_buffer(utki::
245245
);
246246
}
247247

248-
std::unique_ptr<ruis::render::factory::shaders> factory::create_shaders()
248+
utki::shared_ref<ruis::render::factory::shaders> factory::create_shaders()
249249
{
250-
auto ret = std::make_unique<ruis::render::factory::shaders>();
250+
// TODO: are those lint supressions still valid?
251+
auto ret = utki::make_shared<ruis::render::factory::shaders>();
251252
// NOLINTNEXTLINE(bugprone-unused-return-value, "false positive")
252-
ret->pos_tex = std::make_unique<shader_pos_tex>();
253+
ret.get().pos_tex = std::make_unique<shader_pos_tex>();
253254
// NOLINTNEXTLINE(bugprone-unused-return-value, "false positive")
254-
ret->color_pos = std::make_unique<shader_color>();
255+
ret.get().color_pos = std::make_unique<shader_color>();
255256
// NOLINTNEXTLINE(bugprone-unused-return-value, "false positive")
256-
ret->pos_clr = std::make_unique<shader_pos_clr>();
257+
ret.get().pos_clr = std::make_unique<shader_pos_clr>();
257258
// NOLINTNEXTLINE(bugprone-unused-return-value, "false positive")
258-
ret->color_pos_tex = std::make_unique<shader_color_pos_tex>();
259+
ret.get().color_pos_tex = std::make_unique<shader_color_pos_tex>();
259260
// NOLINTNEXTLINE(bugprone-unused-return-value, "false positive")
260-
ret->color_pos_tex_alpha = std::make_unique<shader_color_pos_tex_alpha>();
261+
ret.get().color_pos_tex_alpha = std::make_unique<shader_color_pos_tex_alpha>();
261262
// NOLINTNEXTLINE(bugprone-unused-return-value, "false positive")
262-
ret->color_pos_lum = std::make_unique<shader_color_pos_lum>();
263+
ret.get().color_pos_lum = std::make_unique<shader_color_pos_lum>();
263264
return ret;
264265
}
265266

src/ruis/render/opengl/factory.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class factory : public ruis::render::factory
8585
ruis::render::vertex_array::mode mode
8686
) override;
8787

88-
std::unique_ptr<shaders> create_shaders() override;
88+
utki::shared_ref<shaders> create_shaders() override;
8989

9090
utki::shared_ref<ruis::render::frame_buffer> create_framebuffer( //
9191
std::shared_ptr<ruis::render::texture_2d> color,

0 commit comments

Comments
 (0)