stuff

Author: igagis

src/ruis/render/opengl/factory.cpp

@@ -180,26 +180,38 @@ utki::shared_ref<ruis::render::vertex_buffer> factory::create_vertex_buffer(
 	utki::span<const r4::vector4<float>> vertices
 )
 {
-	return utki::make_shared<vertex_buffer>(vertices);
+	return utki::make_shared<vertex_buffer>(
+		this->get_renderer(), //
+		vertices
+	);
 }
 
 utki::shared_ref<ruis::render::vertex_buffer> factory::create_vertex_buffer(
 	utki::span<const r4::vector3<float>> vertices
 )
 {
-	return utki::make_shared<vertex_buffer>(vertices);
+	return utki::make_shared<vertex_buffer>(
+		this->get_renderer(), //
+		vertices
+	);
 }
 
 utki::shared_ref<ruis::render::vertex_buffer> factory::create_vertex_buffer(
 	utki::span<const r4::vector2<float>> vertices
 )
 {
-	return utki::make_shared<vertex_buffer>(vertices);
+	return utki::make_shared<vertex_buffer>(
+		this->get_renderer(), //
+		vertices
+	);
 }
 
 utki::shared_ref<ruis::render::vertex_buffer> factory::create_vertex_buffer(utki::span<const float> vertices)
 {
-	return utki::make_shared<vertex_buffer>(vertices);
+	return utki::make_shared<vertex_buffer>(
+		this->get_renderer(), //
+		vertices
+	);
 }
 
 utki::shared_ref<ruis::render::vertex_array> factory::create_vertex_array(
@@ -209,7 +221,8 @@ utki::shared_ref<ruis::render::vertex_array> factory::create_vertex_array(
 )
 {
 	return utki::make_shared<vertex_array>(
-		std::move(buffers), //
+		this->get_renderer(), //
+		std::move(buffers),
 		std::move(indices),
 		mode
 	);

src/ruis/render/opengl/vertex_array.cpp

@@ -28,12 +28,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 using namespace ruis::render::opengl;
 
 vertex_array::vertex_array(
+	utki::shared_ref<ruis::render::renderer> renderer, //
 	buffers_type buffers,
 	utki::shared_ref<const ruis::render::index_buffer> indices,
 	mode rendering_mode
 ) :
 	ruis::render::vertex_array(
-		std::move(buffers), //
+		std::move(renderer), //
+		std::move(buffers),
 		std::move(indices),
 		rendering_mode
 	),

src/ruis/render/opengl/vertex_array.hpp

@@ -31,7 +31,12 @@ class vertex_array : public ruis::render::vertex_array
 public:
 	const GLuint vao;
 
-	vertex_array(buffers_type buffers, utki::shared_ref<const ruis::render::index_buffer> indices, mode rendering_mode);
+	vertex_array(
+		utki::shared_ref<ruis::render::renderer> renderer, //
+		buffers_type buffers,
+		utki::shared_ref<const ruis::render::index_buffer> indices,
+		mode rendering_mode
+	);
 
 	vertex_array(const vertex_array&) = delete;
 	vertex_array& operator=(const vertex_array&) = delete;

src/ruis/render/opengl/vertex_buffer.cpp

@@ -34,32 +34,56 @@ void vertex_buffer::init(GLsizeiptr size, const GLvoid* data)
 	assert_opengl_no_error();
 }
 
-vertex_buffer::vertex_buffer(utki::span<const r4::vector4<float>> vertices) :
-	ruis::render::vertex_buffer(vertices.size()),
+vertex_buffer::vertex_buffer(
+	utki::shared_ref<ruis::render::renderer> renderer, //
+	utki::span<const r4::vector4<float>> vertices
+) :
+	ruis::render::vertex_buffer(
+		std::move(renderer), //
+		vertices.size()
+	),
 	num_components(4),
 	type(GL_FLOAT)
 {
 	this->init(GLsizeiptr(vertices.size_bytes()), vertices.data());
 }
 
-vertex_buffer::vertex_buffer(utki::span<const r4::vector3<float>> vertices) :
-	ruis::render::vertex_buffer(vertices.size()),
+vertex_buffer::vertex_buffer(
+	utki::shared_ref<ruis::render::renderer> renderer, //
+	utki::span<const r4::vector3<float>> vertices
+) :
+	ruis::render::vertex_buffer(
+		std::move(renderer), //
+		vertices.size()
+	),
 	num_components(3),
 	type(GL_FLOAT)
 {
 	this->init(GLsizeiptr(vertices.size_bytes()), vertices.data());
 }
 
-vertex_buffer::vertex_buffer(utki::span<const r4::vector2<float>> vertices) :
-	ruis::render::vertex_buffer(vertices.size()),
+vertex_buffer::vertex_buffer(
+	utki::shared_ref<ruis::render::renderer> renderer, //
+	utki::span<const r4::vector2<float>> vertices
+) :
+	ruis::render::vertex_buffer(
+		std::move(renderer), //
+		vertices.size()
+	),
 	num_components(2),
 	type(GL_FLOAT)
 {
 	this->init(GLsizeiptr(vertices.size_bytes()), vertices.data());
 }
 
-vertex_buffer::vertex_buffer(utki::span<const float> vertices) :
-	ruis::render::vertex_buffer(vertices.size()),
+vertex_buffer::vertex_buffer(
+	utki::shared_ref<ruis::render::renderer> renderer, //
+	utki::span<const float> vertices
+) :
+	ruis::render::vertex_buffer(
+		std::move(renderer), //
+		vertices.size()
+	),
 	num_components(1),
 	type(GL_FLOAT)
 {

src/ruis/render/opengl/vertex_buffer.hpp

@@ -37,13 +37,25 @@ class vertex_buffer :
 	const GLint num_components;
 	const GLenum type;
 
-	vertex_buffer(utki::span<const r4::vector4<float>> vertices);
-
-	vertex_buffer(utki::span<const r4::vector3<float>> vertices);
-
-	vertex_buffer(utki::span<const r4::vector2<float>> vertices);
-
-	vertex_buffer(utki::span<const float> vertices);
+	vertex_buffer(
+		utki::shared_ref<ruis::render::renderer> renderer, //
+		utki::span<const r4::vector4<float>> vertices
+	);
+
+	vertex_buffer(
+		utki::shared_ref<ruis::render::renderer> renderer, //
+		utki::span<const r4::vector3<float>> vertices
+	);
+
+	vertex_buffer(
+		utki::shared_ref<ruis::render::renderer> renderer, //
+		utki::span<const r4::vector2<float>> vertices
+	);
+
+	vertex_buffer(
+		utki::shared_ref<ruis::render::renderer> renderer, //
+		utki::span<const float> vertices
+	);
 
 	vertex_buffer(const vertex_buffer&) = delete;
 	vertex_buffer& operator=(const vertex_buffer&) = delete;