Skip to content

Commit e95ffa9

Browse files
committed
add draft context
1 parent ddd1fe7 commit e95ffa9

File tree

6 files changed

+31
-20
lines changed

6 files changed

+31
-20
lines changed

src/ruis/render/opengl/context.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "context.hpp"

src/ruis/render/opengl/context.hpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#pragma once
2+
3+
#include <ruis/render/context.hpp>
4+
5+
namespace ruis::render::opengl{
6+
7+
class context : public ruis::render::context{
8+
public:
9+
10+
};
11+
12+
}

src/ruis/render/opengl/factory.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
4141

4242
using namespace ruis::render::opengl;
4343

44-
factory::factory()
44+
factory::factory(utki::shared_ref<ruis::render::context> render_context) :
45+
ruis::render::factory(std::move(render_context))
4546
{
4647
// check that the OpenGL version we have supports shaders
4748
if (!GLEW_ARB_vertex_shader || !GLEW_ARB_fragment_shader) {

src/ruis/render/opengl/factory.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace ruis::render::opengl {
2828
class factory : public ruis::render::factory
2929
{
3030
public:
31-
factory();
31+
factory(utki::shared_ref<ruis::render::context> render_context);
3232

3333
factory(const factory&) = delete;
3434
factory& operator=(const factory&) = delete;

src/ruis/render/opengl/renderer.cpp

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2828

2929
using namespace ruis::render::opengl;
3030

31-
namespace {
32-
unsigned get_max_texture_size()
33-
{
34-
// the val variable is initialized via output argument, so no need to initialize
35-
// it here
36-
37-
// NOLINTNEXTLINE(cppcoreguidelines-init-variables)
38-
GLint val;
39-
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &val);
40-
ASSERT(val > 0)
41-
return unsigned(val);
42-
}
43-
} // namespace
31+
// namespace {
32+
// unsigned get_max_texture_size()
33+
// {
34+
// // the val variable is initialized via output argument, so no need to initialize
35+
// // it here
36+
37+
// // NOLINTNEXTLINE(cppcoreguidelines-init-variables)
38+
// GLint val;
39+
// glGetIntegerv(GL_MAX_TEXTURE_SIZE, &val);
40+
// ASSERT(val > 0)
41+
// return unsigned(val);
42+
// }
43+
// } // namespace
4444

4545
#ifdef DEBUG
4646
namespace {
@@ -62,8 +62,7 @@ void GLAPIENTRY opengl_error_callback(
6262
renderer::renderer(std::unique_ptr<ruis::render::opengl::factory> factory) :
6363
ruis::render::renderer(
6464
std::move(factory),
65-
{.max_texture_size = get_max_texture_size(),
66-
.initial_matrix = ruis::matrix4()
65+
{.initial_matrix = ruis::matrix4()
6766
// OpenGL identity matrix:
6867
// viewport edges: left = -1, right = 1, top = 1, bottom = -1
6968
// z-axis towards viewer

src/ruis/render/opengl/renderer.hpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ class renderer : public ruis::render::renderer
3535
GLuint default_framebuffer;
3636

3737
public:
38-
renderer(
39-
std::unique_ptr<ruis::render::opengl::factory> factory = std::make_unique<ruis::render::opengl::factory>()
40-
);
38+
renderer(std::unique_ptr<ruis::render::opengl::factory> factory);
4139

4240
renderer(const renderer&) = delete;
4341
renderer& operator=(const renderer&) = delete;

0 commit comments

Comments
 (0)