thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 20:11:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'rhi-gl-remove-deferred-delete' into 'master'

Browse source 
rhi gl: Remove the garbage disposal

See merge request KartKrew/Kart!1454
This commit is contained in:
Oni 2023-09-04 00:04:38 +00:00
commit cb0e2e178a
2 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/rhi/gl3_core/gl3_core_rhi.cpp
View file

@ -617,7 +617,8 @@ void GlCoreRhi::destroy_texture(rhi::Handle<rhi::Texture> handle)
SRB2_ASSERT(texture_slab_.is_valid(handle) == true); SRB2_ASSERT(texture_slab_.is_valid(handle) == true);
GlCoreTexture casted = texture_slab_.remove(handle); GlCoreTexture casted = texture_slab_.remove(handle);
GLuint name = casted.texture; GLuint name = casted.texture;
disposal_.push_back([this, name] { gl_->DeleteTextures(1, &name); }); gl_->DeleteTextures(1, &name);
GL_ASSERT;
} }
void GlCoreRhi::update_texture( void GlCoreRhi::update_texture(
@ -701,7 +702,8 @@ void GlCoreRhi::destroy_buffer(rhi::Handle<rhi::Buffer> handle)
GlCoreBuffer casted = buffer_slab_.remove(handle); GlCoreBuffer casted = buffer_slab_.remove(handle);
GLuint name = casted.buffer; GLuint name = casted.buffer;
disposal_.push_back([this, name] { gl_->DeleteBuffers(1, &name); }); gl_->DeleteBuffers(1, &name);
GL_ASSERT;
} }
void GlCoreRhi::update_buffer( void GlCoreRhi::update_buffer(
@ -864,7 +866,8 @@ void GlCoreRhi::destroy_renderbuffer(rhi::Handle<rhi::Renderbuffer> handle)
SRB2_ASSERT(renderbuffer_slab_.is_valid(handle) == true); SRB2_ASSERT(renderbuffer_slab_.is_valid(handle) == true);
GlCoreRenderbuffer casted = renderbuffer_slab_.remove(handle); GlCoreRenderbuffer casted = renderbuffer_slab_.remove(handle);
GLuint name = casted.renderbuffer; GLuint name = casted.renderbuffer;
disposal_.push_back([this, name] { gl_->DeleteRenderbuffers(1, &name); }); gl_->DeleteRenderbuffers(1, &name);
GL_ASSERT;
} }
rhi::Handle<rhi::Pipeline> GlCoreRhi::create_pipeline(const PipelineDesc& desc) rhi::Handle<rhi::Pipeline> GlCoreRhi::create_pipeline(const PipelineDesc& desc)
@ -1181,9 +1184,12 @@ void GlCoreRhi::destroy_pipeline(rhi::Handle<rhi::Pipeline> handle)
GLuint fragment_shader = casted.fragment_shader; GLuint fragment_shader = casted.fragment_shader;
GLuint program = casted.program; GLuint program = casted.program;
disposal_.push_back([this, fragment_shader] { gl_->DeleteShader(fragment_shader); }); gl_->DeleteProgram(program);
disposal_.push_back([this, vertex_shader] { gl_->DeleteShader(vertex_shader); }); GL_ASSERT;
disposal_.push_back([this, program] { gl_->DeleteProgram(program); }); gl_->DeleteShader(vertex_shader);
GL_ASSERT;
gl_->DeleteShader(fragment_shader);
GL_ASSERT;
} }
rhi::Handle<rhi::GraphicsContext> GlCoreRhi::begin_graphics() rhi::Handle<rhi::GraphicsContext> GlCoreRhi::begin_graphics()
@ -1867,16 +1873,9 @@ void GlCoreRhi::finish()
for (auto& fbset : framebuffers_) for (auto& fbset : framebuffers_)
{ {
gl_->DeleteFramebuffers(1, &fbset.second); gl_->DeleteFramebuffers(1, &fbset.second);
GL_ASSERT;
} }
framebuffers_.clear(); framebuffers_.clear();
for (auto it = disposal_.begin(); it != disposal_.end(); it++)
{
(*it)();
}
disposal_.clear();
GL_ASSERT;
} }
void GlCoreRhi::copy_framebuffer_to_texture( void GlCoreRhi::copy_framebuffer_to_texture(

2
src/rhi/gl3_core/gl3_core_rhi.hpp
View file

@ -165,8 +165,6 @@ class GlCoreRhi final : public Rhi
uint8_t stencil_back_compare_mask_ = 0xFF; uint8_t stencil_back_compare_mask_ = 0xFF;
uint8_t stencil_back_write_mask_ = 0xFF; uint8_t stencil_back_write_mask_ = 0xFF;
std::vector<std::function<void()>> disposal_;
public: public:
GlCoreRhi(std::unique_ptr<GlCorePlatform>&& platform, GlLoadFunc load_func); GlCoreRhi(std::unique_ptr<GlCorePlatform>&& platform, GlLoadFunc load_func);
virtual ~GlCoreRhi(); virtual ~GlCoreRhi();