From 4b41e20000996ca736e077ccbce6cd2135850bcd Mon Sep 17 00:00:00 2001 From: sfan5 Date: Fri, 24 Oct 2025 15:53:19 +0200 Subject: [PATCH] Remove unused drawtype shader constant might lead to better material merging --- src/client/game.cpp | 22 +--------------------- src/client/shader.cpp | 2 +- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/src/client/game.cpp b/src/client/game.cpp index 5b86883446..24cd31d3ea 100644 --- a/src/client/game.cpp +++ b/src/client/game.cpp @@ -429,33 +429,13 @@ public: 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 - [[maybe_unused]] const auto drawtype = - static_cast(std::get(constants["DRAWTYPE"])); [[maybe_unused]] const auto material_type = static_cast(std::get(constants["MATERIAL_TYPE"])); #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_ALPHA); PROVIDE(TILE_MATERIAL_LIQUID_TRANSPARENT); diff --git a/src/client/shader.cpp b/src/client/shader.cpp index c54f1e268c..ad4a5e670e 100644 --- a/src/client/shader.cpp +++ b/src/client/shader.cpp @@ -791,7 +791,7 @@ u32 IShaderSource::getShader(const std::string &name, { ShaderConstants input_const; input_const["MATERIAL_TYPE"] = (int)material_type; - input_const["DRAWTYPE"] = (int)drawtype; + (void) drawtype; // unused video::E_MATERIAL_TYPE base_mat = video::EMT_SOLID; switch (material_type) {