MadeOfJelly/MushMachine
MadeOfJelly/MushMachine
2
2
Fork 0
mirror of https://github.com/MadeOfJelly/MushMachine.git synced 2024-09-21 12:35:36 +02:00
Code Issues Projects Releases Wiki Activity

add a map range option to ogl (instance) buffer

Browse Source
This commit is contained in:
Green Sky 2021-10-20 02:51:53 +02:00
parent 8e74256670
commit 5d74c3298d
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
framework/opengl_primitives/src/mm/opengl/frame_buffer_object.cpp
View File

@ -24,6 +24,7 @@ void FrameBufferObject::bind(Target target) const {
} }
} }
// TODO: refactor, make depth and stencil set-able
void FrameBufferObject::clear(float r, float g, float b, float a, GLbitfield target_mask) { void FrameBufferObject::clear(float r, float g, float b, float a, GLbitfield target_mask) {
bind(FrameBufferObject::RW); bind(FrameBufferObject::RW);

31
framework/opengl_primitives/src/mm/opengl/instance_buffer.hpp
View File

@ -19,7 +19,7 @@ namespace MM::OpenGL {
class InstanceBuffer { class InstanceBuffer {
private: private:
GLuint _handle; GLuint _handle;
size_t _size; std::size_t _size;
public: public:
explicit InstanceBuffer(void) : _handle(0), _size(0) { explicit InstanceBuffer(void) : _handle(0), _size(0) {
@ -43,21 +43,21 @@ namespace MM::OpenGL {
glBindBufferBase(target, index, _handle); glBindBufferBase(target, index, _handle);
} }
void resize(size_t size, GLenum usage) { void resize(std::size_t size, GLenum usage) {
glBindBuffer(GL_ARRAY_BUFFER, _handle); glBindBuffer(GL_ARRAY_BUFFER, _handle);
glBufferData(GL_ARRAY_BUFFER, size * sizeof(TInstance), nullptr, usage); glBufferData(GL_ARRAY_BUFFER, size * sizeof(TInstance), nullptr, usage);
_size = size; _size = size;
} }
size_t getSize(void) const { std::size_t getSize(void) const {
return _size; return _size;
} }
size_t getSizeBytes(void) const { std::size_t getSizeBytes(void) const {
return _size * sizeof(TInstance); return _size * sizeof(TInstance);
} }
TInstance* map(size_t size, GLenum usage = GL_DYNAMIC_DRAW, bool shrink = false) { TInstance* map(std::size_t size, GLenum usage = GL_DYNAMIC_DRAW, bool shrink = false) {
if (size > _size || (shrink && (size < _size))) if (size > _size || (shrink && (size < _size)))
resize(size, usage); resize(size, usage);
@ -71,12 +71,21 @@ namespace MM::OpenGL {
GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_BUFFER_BIT GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_BUFFER_BIT
) )
); );
//auto* res = static_cast<TInstance*>(
//glMapBuffer( return res;
//GL_ARRAY_BUFFER, }
//GL_WRITE_ONLY
//) TInstance* mapRange(std::size_t offset, std::size_t size, GLbitfield access = GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_RANGE_BIT) {
//); glBindBuffer(GL_ARRAY_BUFFER, _handle);
auto* res = static_cast<TInstance*>(
glMapBufferRange(
GL_ARRAY_BUFFER,
offset * sizeof(TInstance),
size * sizeof(TInstance),
access
)
);
return res; return res;
} }

6
framework/opengl_renderer/src/mm/opengl/render_tasks/simple_rect.cpp
View File

@ -56,17 +56,14 @@ SimpleRect::~SimpleRect(void) {
void SimpleRect::render(Services::OpenGLRenderer& rs, Engine& engine) { void SimpleRect::render(Services::OpenGLRenderer& rs, Engine& engine) {
ZoneScopedN("MM::OpenGL::RenderTasks::SimpleRect::render"); ZoneScopedN("MM::OpenGL::RenderTasks::SimpleRect::render");
rs.targets[target_fbo]->bind(FrameBufferObject::W); rs.targets[target_fbo]->bind(FrameBufferObject::RW);
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
glDepthFunc(GL_LESS); glDepthFunc(GL_LESS);
_shader->bind(); _shader->bind();
_vertexBuffer->bind(GL_ARRAY_BUFFER);
_vao->bind(); _vao->bind();
//_shader->setUniform4f("_color", default_color);
auto& scene = engine.tryService<MM::Services::SceneServiceInterface>()->getScene(); auto& scene = engine.tryService<MM::Services::SceneServiceInterface>()->getScene();
Camera3D* cam = scene.try_ctx<Camera3D>(); Camera3D* cam = scene.try_ctx<Camera3D>();
@ -94,7 +91,6 @@ void SimpleRect::render(Services::OpenGLRenderer& rs, Engine& engine) {
} }
_vao->unbind(); _vao->unbind();
_vertexBuffer->unbind(GL_ARRAY_BUFFER);
_shader->unbind(); _shader->unbind();
} }