luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-11-05 17:55:31 +01:00
Code Activity

Remove unused drawtype shader constant

Browse Source 
might lead to better material merging
This commit is contained in:
sfan5
2025-10-24 15:53:19 +02:00
parent 04a443e392
commit 4b41e20000
2 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/client/game.cpp
View File

@@ -429,33 +429,13 @@ public:
void onGenerate(const std::string &name, ShaderConstants &constants) override void onGenerate(const std::string &name, ShaderConstants &constants) override
{ {
if (constants.find("DRAWTYPE") == constants.end()) if (constants.find("MATERIAL_TYPE") == constants.end())
return; // not a node shader return; // not a node shader
[[maybe_unused]] const auto drawtype =
static_cast<NodeDrawType>(std::get<int>(constants["DRAWTYPE"]));
[[maybe_unused]] const auto material_type = [[maybe_unused]] const auto material_type =
static_cast<MaterialType>(std::get<int>(constants["MATERIAL_TYPE"])); static_cast<MaterialType>(std::get<int>(constants["MATERIAL_TYPE"]));
#define PROVIDE(constant) constants[ #constant ] = (int)constant #define PROVIDE(constant) constants[ #constant ] = (int)constant
PROVIDE(NDT_NORMAL);
PROVIDE(NDT_AIRLIKE);
PROVIDE(NDT_LIQUID);
PROVIDE(NDT_FLOWINGLIQUID);
PROVIDE(NDT_GLASSLIKE);
PROVIDE(NDT_ALLFACES);
PROVIDE(NDT_ALLFACES_OPTIONAL);
PROVIDE(NDT_TORCHLIKE);
PROVIDE(NDT_SIGNLIKE);
PROVIDE(NDT_PLANTLIKE);
PROVIDE(NDT_FENCELIKE);
PROVIDE(NDT_RAILLIKE);
PROVIDE(NDT_NODEBOX);
PROVIDE(NDT_GLASSLIKE_FRAMED);
PROVIDE(NDT_FIRELIKE);
PROVIDE(NDT_GLASSLIKE_FRAMED_OPTIONAL);
PROVIDE(NDT_PLANTLIKE_ROOTED);
PROVIDE(TILE_MATERIAL_BASIC); PROVIDE(TILE_MATERIAL_BASIC);
PROVIDE(TILE_MATERIAL_ALPHA); PROVIDE(TILE_MATERIAL_ALPHA);
PROVIDE(TILE_MATERIAL_LIQUID_TRANSPARENT); PROVIDE(TILE_MATERIAL_LIQUID_TRANSPARENT);

2
src/client/shader.cpp
View File

@@ -791,7 +791,7 @@ u32 IShaderSource::getShader(const std::string &name,
{ {
ShaderConstants input_const; ShaderConstants input_const;
input_const["MATERIAL_TYPE"] = (int)material_type; input_const["MATERIAL_TYPE"] = (int)material_type;
input_const["DRAWTYPE"] = (int)drawtype; (void) drawtype; // unused
video::E_MATERIAL_TYPE base_mat = video::EMT_SOLID; video::E_MATERIAL_TYPE base_mat = video::EMT_SOLID;
switch (material_type) { switch (material_type) {