Skip to content

Commit

Permalink
Render interface naming: Remove compiled from release functions
Browse files Browse the repository at this point in the history
  • Loading branch information
mikke89 committed Feb 5, 2024
1 parent 2fdf29d commit 3724e34
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions Backends/RmlUi_Renderer_GL3.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1592,7 +1592,7 @@ Rml::CompiledFilterHandle RenderInterface_GL3::CompileFilter(const Rml::String&
return {};
}

void RenderInterface_GL3::ReleaseCompiledFilter(Rml::CompiledFilterHandle filter)
void RenderInterface_GL3::ReleaseFilter(Rml::CompiledFilterHandle filter)
{
delete reinterpret_cast<CompiledFilter*>(filter);
}
Expand Down Expand Up @@ -1731,7 +1731,7 @@ void RenderInterface_GL3::RenderShader(Rml::CompiledShaderHandle shader_handle,
Gfx::CheckGLError("RenderShader");
}

void RenderInterface_GL3::ReleaseCompiledShader(Rml::CompiledShaderHandle shader_handle)
void RenderInterface_GL3::ReleaseShader(Rml::CompiledShaderHandle shader_handle)
{
delete reinterpret_cast<CompiledShader*>(shader_handle);
}
Expand Down
4 changes: 2 additions & 2 deletions Backends/RmlUi_Renderer_GL3.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@ class RenderInterface_GL3 : public Rml::RenderInterface {
Rml::CompiledFilterHandle SaveLayerAsMaskImage() override;

Rml::CompiledFilterHandle CompileFilter(const Rml::String& name, const Rml::Dictionary& parameters) override;
void ReleaseCompiledFilter(Rml::CompiledFilterHandle filter) override;
void ReleaseFilter(Rml::CompiledFilterHandle filter) override;

Rml::CompiledShaderHandle CompileShader(const Rml::String& name, const Rml::Dictionary& parameters) override;
void RenderShader(Rml::CompiledShaderHandle shader_handle, Rml::CompiledGeometryHandle geometry_handle, Rml::Vector2f translation,
Rml::TextureHandle texture) override;
void ReleaseCompiledShader(Rml::CompiledShaderHandle effect_handle) override;
void ReleaseShader(Rml::CompiledShaderHandle effect_handle) override;

// Can be passed to RenderGeometry() to enable texture rendering without changing the bound texture.
static constexpr Rml::TextureHandle TextureEnableWithoutBinding = Rml::TextureHandle(-1);
Expand Down
4 changes: 2 additions & 2 deletions Include/RmlUi/Core/RenderInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ class RMLUICORE_API RenderInterface : public NonCopyMoveable {
virtual CompiledFilterHandle CompileFilter(const String& name, const Dictionary& parameters);
/// Called by RmlUi when it no longer needs a previously compiled filter.
/// @param[in] filter The handle to a previously compiled filter.
virtual void ReleaseCompiledFilter(CompiledFilterHandle filter);
virtual void ReleaseFilter(CompiledFilterHandle filter);

/// Called by RmlUi when it wants to compile a new shader.
/// @param[in] name The name of the shader.
Expand All @@ -167,7 +167,7 @@ class RMLUICORE_API RenderInterface : public NonCopyMoveable {
virtual void RenderShader(CompiledShaderHandle shader, CompiledGeometryHandle geometry, Vector2f translation, TextureHandle texture);
/// Called by RmlUi when it no longer needs a previously compiled shader.
/// @param[in] shader The handle to a previously compiled shader.
virtual void ReleaseCompiledShader(CompiledShaderHandle shader);
virtual void ReleaseShader(CompiledShaderHandle shader);
};

} // namespace Rml
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/RenderInterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ CompiledFilterHandle RenderInterface::CompileFilter(const String& /*name*/, cons
return CompiledFilterHandle{};
}

void RenderInterface::ReleaseCompiledFilter(CompiledFilterHandle /*filter*/) {}
void RenderInterface::ReleaseFilter(CompiledFilterHandle /*filter*/) {}

CompiledShaderHandle RenderInterface::CompileShader(const String& /*name*/, const Dictionary& /*parameters*/)
{
Expand All @@ -81,6 +81,6 @@ void RenderInterface::RenderShader(CompiledShaderHandle /*shader*/, CompiledGeom
TextureHandle /*texture*/)
{}

void RenderInterface::ReleaseCompiledShader(CompiledShaderHandle /*shader*/) {}
void RenderInterface::ReleaseShader(CompiledShaderHandle /*shader*/) {}

} // namespace Rml
4 changes: 2 additions & 2 deletions Source/Core/RenderManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -341,15 +341,15 @@ void RenderManager::ReleaseResource(const CompiledFilter& filter)
{
RMLUI_ASSERT(filter.render_manager == this && filter.resource_handle != filter.InvalidHandle());

render_interface->ReleaseCompiledFilter(filter.resource_handle);
render_interface->ReleaseFilter(filter.resource_handle);
compiled_filter_count -= 1;
}

void RenderManager::ReleaseResource(const CompiledShader& shader)
{
RMLUI_ASSERT(shader.render_manager == this && shader.resource_handle != shader.InvalidHandle());

render_interface->ReleaseCompiledShader(shader.resource_handle);
render_interface->ReleaseShader(shader.resource_handle);
compiled_shader_count -= 1;
}

Expand Down
4 changes: 2 additions & 2 deletions Tests/Source/Common/TestsInterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ Rml::CompiledFilterHandle TestsRenderInterface::CompileFilter(const Rml::String&
return 1;
}

void TestsRenderInterface::ReleaseCompiledFilter(Rml::CompiledFilterHandle /*filter*/)
void TestsRenderInterface::ReleaseFilter(Rml::CompiledFilterHandle /*filter*/)
{
counters.release_filter += 1;
}
Expand All @@ -167,7 +167,7 @@ void TestsRenderInterface::RenderShader(Rml::CompiledShaderHandle /*shader*/, Rm
counters.render_shader += 1;
}

void TestsRenderInterface::ReleaseCompiledShader(Rml::CompiledShaderHandle /*shader*/)
void TestsRenderInterface::ReleaseShader(Rml::CompiledShaderHandle /*shader*/)
{
counters.release_shader += 1;
}
4 changes: 2 additions & 2 deletions Tests/Source/Common/TestsInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,12 @@ class TestsRenderInterface : public Rml::RenderInterface {
void SetTransform(const Rml::Matrix4f* transform) override;

Rml::CompiledFilterHandle CompileFilter(const Rml::String& name, const Rml::Dictionary& parameters) override;
void ReleaseCompiledFilter(Rml::CompiledFilterHandle filter) override;
void ReleaseFilter(Rml::CompiledFilterHandle filter) override;

Rml::CompiledShaderHandle CompileShader(const Rml::String& name, const Rml::Dictionary& parameters) override;
void RenderShader(Rml::CompiledShaderHandle shader, Rml::CompiledGeometryHandle geometry, Rml::Vector2f translation,
Rml::TextureHandle texture) override;
void ReleaseCompiledShader(Rml::CompiledShaderHandle shader) override;
void ReleaseShader(Rml::CompiledShaderHandle shader) override;

const Counters& GetCounters() const { return counters; }
void ResetCounters() { counters = {}; }
Expand Down

0 comments on commit 3724e34

Please sign in to comment.