tour/minetest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Constexpr ShaderInfo

Browse Source
This commit is contained in:
wozrer 2025-01-01 06:28:42 +03:00
parent 55504accc5
commit 0d9c9753e5
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/shader.cpp
View File

@ -506,7 +506,7 @@ void ShaderSource::rebuildShaders()
for (ShaderInfo &i : m_shaderinfo_cache) { for (ShaderInfo &i : m_shaderinfo_cache) {
ShaderInfo *info = &i; ShaderInfo *info = &i;
if (!info->name.empty()) { if (!info->name.empty()) {
*info = generateShader(info->name, info->material_type, info->drawtype); *info = generateShader(info->name.data(), info->material_type, info->drawtype);
} }
} }
} }

5
src/client/shader.h
View File

@ -29,14 +29,13 @@ std::string getShaderPath(const std::string &name_of_shader,
const std::string &filename); const std::string &filename);
struct ShaderInfo { struct ShaderInfo {
std::string name = ""; std::string_view name = "";
video::E_MATERIAL_TYPE base_material = video::EMT_SOLID; video::E_MATERIAL_TYPE base_material = video::EMT_SOLID;
video::E_MATERIAL_TYPE material = video::EMT_SOLID; video::E_MATERIAL_TYPE material = video::EMT_SOLID;
NodeDrawType drawtype = NDT_NORMAL; NodeDrawType drawtype = NDT_NORMAL;
MaterialType material_type = TILE_MATERIAL_BASIC; MaterialType material_type = TILE_MATERIAL_BASIC;
ShaderInfo() = default; constexpr ShaderInfo() = default;
virtual ~ShaderInfo() = default;
}; };
/* /*