18
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-20 20:54:59 +01:00

refactor(renderer): a material's textures let go of in one place, for every backend

Unload_Material walked the textures of a material and of its variants the
same way in both opengl renderers, and Sonar counted its declarations, set
into the long run of overrides the two headers share, as duplicated: 5.2%
of the new code, 3% allowed. The walk is gfx_renderer's now, over
IMaterial::GetAllTextures and the backend's Unload_Texture. Materials that
don't tell their textures, the Vulkan renderer's, give none, and are left
alone as before.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
maj00r
2026-11-16 15:59:57 +01:00
parent b832d2fab9
commit bcecfe2964
8 changed files with 24 additions and 32 deletions

View File

@@ -3,6 +3,7 @@
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <string> #include <string>
#include <optional> #include <optional>
#include <vector>
#include "ITexture.h" #include "ITexture.h"
@@ -17,6 +18,11 @@ struct IMaterial
virtual std::optional<float> GetSelfillum() const = 0; virtual std::optional<float> GetSelfillum() const = 0;
virtual int GetShadowRank() const = 0; virtual int GetShadowRank() const = 0;
virtual texture_handle GetTexture(int slot) const = 0; virtual texture_handle GetTexture(int slot) const = 0;
// every texture the material draws with, those of all its variants included. materials which don't tell give none
virtual std::vector<texture_handle> GetAllTextures() const
{
return {};
}
static IMaterial *null_material() static IMaterial *null_material()
{ {
struct NullMaterial : public IMaterial struct NullMaterial : public IMaterial

View File

@@ -66,6 +66,13 @@ struct opengl_material : public IMaterial {
{ {
return textures[slot]; return textures[slot];
} }
virtual std::vector<texture_handle> GetAllTextures() const override
{
std::vector<texture_handle> all(textures.begin(), textures.end());
for (auto const &variant : texture_variants)
all.insert(all.end(), variant.begin(), variant.end());
return all;
}
// returns texture set to use for model instance identified by provided variant id // returns texture set to use for model instance identified by provided variant id
texture_set const &GetTextures(std::uint32_t const Variant) const texture_set const &GetTextures(std::uint32_t const Variant) const
{ {

View File

@@ -2575,18 +2575,6 @@ void opengl33_renderer::Unload_Texture(texture_handle const Texture)
m_textures.unload(Texture); m_textures.unload(Texture);
} }
void opengl33_renderer::Unload_Material(material_handle const Material)
{
if (Material == null_handle)
return;
auto const &material{m_materials.material(Material)};
for (auto const texture : material.textures)
m_textures.unload(texture);
for (auto const &variant : material.texture_variants)
for (auto const texture : variant)
m_textures.unload(texture);
}
void opengl33_renderer::Update_AnimModel(TAnimModel *model) void opengl33_renderer::Update_AnimModel(TAnimModel *model)
{ {
model->RaAnimate(m_framestamp); model->RaAnimate(m_framestamp);

View File

@@ -112,8 +112,6 @@ class opengl33_renderer : public gfx_renderer {
Texture( texture_handle const Texture ) const override; Texture( texture_handle const Texture ) const override;
void void
Unload_Texture( texture_handle const Texture ) override; Unload_Texture( texture_handle const Texture ) override;
void
Unload_Material( material_handle const Material ) override;
// utility methods // utility methods
void void
Pick_Control_Callback( std::function<void( TSubModel const *, const glm::vec2 )> Callback ) override; Pick_Control_Callback( std::function<void( TSubModel const *, const glm::vec2 )> Callback ) override;

View File

@@ -1928,21 +1928,6 @@ opengl_renderer::Unload_Texture( texture_handle const Texture ) {
m_textures.unload( Texture ); m_textures.unload( Texture );
} }
void
opengl_renderer::Unload_Material( material_handle const Material ) {
if( Material == null_handle ) { return; }
auto const &material { m_materials.material( Material ) };
for( auto const texture : material.textures ) {
m_textures.unload( texture );
}
for( auto const &variant : material.texture_variants ) {
for( auto const texture : variant ) {
m_textures.unload( texture );
}
}
}
void void
opengl_renderer::Pick_Control_Callback( std::function<void( TSubModel const *, const glm::vec2 )> Callback ) { opengl_renderer::Pick_Control_Callback( std::function<void( TSubModel const *, const glm::vec2 )> Callback ) {

View File

@@ -97,8 +97,6 @@ public:
Texture( texture_handle const Texture ) const override; Texture( texture_handle const Texture ) const override;
void void
Unload_Texture( texture_handle const Texture ) override; Unload_Texture( texture_handle const Texture ) override;
void
Unload_Material( material_handle const Material ) override;
// utility methods // utility methods
void void
Pick_Control_Callback( std::function<void( TSubModel const *, const glm::vec2 )> Callback ) override; Pick_Control_Callback( std::function<void( TSubModel const *, const glm::vec2 )> Callback ) override;

View File

@@ -39,6 +39,16 @@ gfx_renderer_factory *gfx_renderer_factory::get_instance()
gfx_renderer_factory *gfx_renderer_factory::instance; gfx_renderer_factory *gfx_renderer_factory::instance;
void gfx_renderer::Unload_Material( material_handle const Material )
{
if( Material == null_handle ) {
return;
}
for( auto const texture : this->Material( Material )->GetAllTextures() ) {
Unload_Texture( texture );
}
}
material_handle gfx_renderer::Terrain_Material( material_handle const Reuse, std::vector<gfx::terrain_layer> const &Layers, int const Samples, std::uint8_t const *Weights, glm::vec3 const &Placement ) material_handle gfx_renderer::Terrain_Material( material_handle const Reuse, std::vector<gfx::terrain_layer> const &Layers, int const Samples, std::uint8_t const *Weights, glm::vec3 const &Placement )
{ {
// without blending the chunk gets the material which covers the most of it // without blending the chunk gets the material which covers the most of it

View File

@@ -106,7 +106,7 @@ public:
// texture picker scrolled past. backends which keep their textures otherwise leave it // texture picker scrolled past. backends which keep their textures otherwise leave it
virtual void Unload_Texture( texture_handle const Texture ) {} virtual void Unload_Texture( texture_handle const Texture ) {}
// the same for all the textures of a material, those of its variants with them // the same for all the textures of a material, those of its variants with them
virtual void Unload_Material( material_handle const Material ) {} void Unload_Material( material_handle const Material );
// utility methods // utility methods
virtual void Pick_Control_Callback( std::function<void( TSubModel const *, const glm::vec2 )> Callback ) = 0; virtual void Pick_Control_Callback( std::function<void( TSubModel const *, const glm::vec2 )> Callback ) = 0;
virtual void Pick_Node_Callback( std::function<void( scene::basic_node * )> Callback ) = 0; virtual void Pick_Node_Callback( std::function<void( scene::basic_node * )> Callback ) = 0;