sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Graphics: Fix PredefinedShaderBinding enum

Browse Source
This commit is contained in:
Jérôme Leclercq
2020-10-31 16:27:35 +01:00
parent a02c300c0c
commit 8027ae9abe
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/Nazara/Graphics/Enums.hpp
View File

@@ -17,16 +17,17 @@ namespace Nz
Volume
};
enum PredefinedShaderBinding
enum class PredefinedShaderBinding
{
PredefinedShaderBinding_TexOverlay,
PredefinedShaderBinding_UboInstanceData,
PredefinedShaderBinding_UboLighData,
PredefinedShaderBinding_UboViewerData,
TexOverlay,
UboInstanceData,
UboLighData,
UboViewerData,
PredefinedShaderBinding_Max = PredefinedShaderBinding_UboViewerData
Max = UboViewerData
};
constexpr std::size_t PredefinedShaderBindingCount = static_cast<std::size_t>(PredefinedShaderBinding::Max) + 1;
}
#endif // NAZARA_ENUMS_GRAPHICS_HPP

2
include/Nazara/Graphics/MaterialSettings.hpp
View File

@@ -23,7 +23,7 @@ namespace Nz
{
public:
using DefaultShaders = std::array<std::shared_ptr<ShaderStage>, ShaderStageTypeCount>;
using PredefinedBinding = std::array<std::size_t, PredefinedShaderBinding_Max + 1>;
using PredefinedBinding = std::array<std::size_t, PredefinedShaderBindingCount>;
struct SharedUniformBlock;
struct Texture;