diff --git a/src/graphics/materials.cpp b/src/graphics/materials.cpp index 9a68cd3ea..e6a5d6544 100644 --- a/src/graphics/materials.cpp +++ b/src/graphics/materials.cpp @@ -746,7 +746,6 @@ const std::tuple SkinnedSolid::FirstPassTextures = std::tuple(1); const std::tuple SkinnedSolid::SecondPassTextures = std::tuple(0, 1, 2); -const std::tuple<> SkinnedSolid::ShadowTextures; const std::tuple SkinnedSolid::RSMTextures = std::tuple(0); // ---------------------------------------------------------------------------- @@ -775,7 +774,6 @@ const std::tuple SkinnedNormalMat::FirstPassTextures = std::tuple(3, 1); const std::tuple SkinnedNormalMat::SecondPassTextures = std::tuple(0, 1, 2); -const std::tuple<> SkinnedNormalMat::ShadowTextures; const std::tuple SkinnedNormalMat::RSMTextures = std::tuple(0); // ---------------------------------------------------------------------------- @@ -784,7 +782,6 @@ const std::tuple DefaultMaterial::FirstPassTextures = std::tuple(1); const std::tuple DefaultMaterial::SecondPassTextures = std::tuple(0, 1, 2); -const std::tuple<> DefaultMaterial::ShadowTextures; const std::tuple DefaultMaterial::RSMTextures = std::tuple(0); // ---------------------------------------------------------------------------- @@ -800,7 +797,6 @@ const std::tuple AlphaRef::RSMTextures = std::tuple(0); const InstanceType SphereMap::Instance = InstanceTypeThreeTex; const std::tuple SphereMap::FirstPassTextures = std::tuple(1); const std::tuple SphereMap::SecondPassTextures = std::tuple(0); -const std::tuple<> SphereMap::ShadowTextures; const std::tuple SphereMap::RSMTextures = std::tuple(0); // ---------------------------------------------------------------------------- @@ -826,7 +822,6 @@ const std::tuple NormalMat::FirstPassTextures = std::tuple(3, 1); const std::tuple NormalMat::SecondPassTextures = std::tuple(0, 1, 2); -const std::tuple<> NormalMat::ShadowTextures; const std::tuple NormalMat::RSMTextures = std::tuple(0); // ---------------------------------------------------------------------------- @@ -834,7 +829,6 @@ const InstanceType DetailMat::Instance = InstanceTypeFourTex; const std::tuple DetailMat::FirstPassTextures = std::tuple(1); const std::tuple DetailMat::SecondPassTextures = std::tuple(0, 3, 1); -const std::tuple<> DetailMat::ShadowTextures; const std::tuple DetailMat::RSMTextures = std::tuple(0); // ---------------------------------------------------------------------------- @@ -843,7 +837,6 @@ const std::tuple SplattingMat::FirstPassTextures const std::tuple SplattingMat::SecondPassTextures = std::tuple(1, 3, 4, 5, 6); -const std::tuple<> SplattingMat::ShadowTextures; const std::tuple SplattingMat::RSMTextures = std::tuple(1, 3, 4, 5, 6); diff --git a/src/graphics/materials.hpp b/src/graphics/materials.hpp index 961cbe9f0..d8f907c5c 100644 --- a/src/graphics/materials.hpp +++ b/src/graphics/materials.hpp @@ -445,7 +445,7 @@ struct SkinnedSolid static const enum InstanceType Instance; static const std::tuple FirstPassTextures; static const std::tuple SecondPassTextures; - static const std::tuple<> ShadowTextures; + static const std::tuple<> constexpr ShadowTextures {}; static const std::tuple RSMTextures; }; // SkinnedSolid @@ -487,7 +487,7 @@ struct SkinnedNormalMat static const enum InstanceType Instance; static const std::tuple FirstPassTextures; static const std::tuple SecondPassTextures; - static const std::tuple<> ShadowTextures; + static const std::tuple<> constexpr ShadowTextures {}; static const std::tuple RSMTextures; }; // SkinnedNormalMat @@ -530,7 +530,7 @@ struct DefaultMaterial static const enum InstanceType Instance; static const std::tuple FirstPassTextures; static const std::tuple SecondPassTextures; - static const std::tuple<> ShadowTextures; + static const std::tuple<> constexpr ShadowTextures {}; static const std::tuple RSMTextures; }; // DefaultMaterial @@ -573,7 +573,7 @@ struct SphereMap static const enum InstanceType Instance; static const std::tuple FirstPassTextures; static const std::tuple SecondPassTextures; - static const std::tuple<> ShadowTextures; + static const std::tuple<> constexpr ShadowTextures {}; static const std::tuple RSMTextures; }; // SphereMap @@ -639,7 +639,7 @@ struct NormalMat static const enum InstanceType Instance; static const std::tuple FirstPassTextures; static const std::tuple SecondPassTextures; - static const std::tuple<> ShadowTextures; + static const std::tuple<> constexpr ShadowTextures {}; static const std::tuple RSMTextures; }; // NormalMat @@ -661,7 +661,7 @@ struct DetailMat static const enum InstanceType Instance; static const std::tuple FirstPassTextures; static const std::tuple SecondPassTextures; - static const std::tuple<> ShadowTextures; + static const std::tuple<> constexpr ShadowTextures {}; static const std::tuple RSMTextures; }; // DetailMat @@ -681,7 +681,7 @@ struct SplattingMat static const std::tuple FirstPassTextures; static const std::tuple SecondPassTextures; - static const std::tuple<> ShadowTextures; + static const std::tuple<> constexpr ShadowTextures {}; static const std::tuple RSMTextures; }; // SplattingMat