diff options
| author |  Rodrigo Locatti | 2020-04-16 01:26:23 -0300 |
|---|---|---|
| committer |  GitHub | 2020-04-16 01:26:23 -0300 |
| commit | 4209dba1f698838ecfde0306f23c8e043cd4cb80 (patch) | |
| tree | e574e99c367042d1ebbef6f44a5931115acba30a /src | |
| parent | Merge pull request #3687 from lioncash/constness (diff) | |
| parent | gl_device: Mark stage_swizzle as constexpr (diff) | |
| download | yuzu-4209dba1f698838ecfde0306f23c8e043cd4cb80.tar.gz yuzu-4209dba1f698838ecfde0306f23c8e043cd4cb80.tar.xz yuzu-4209dba1f698838ecfde0306f23c8e043cd4cb80.zip | |
Merge pull request #3680 from lioncash/static
gl_device: Mark stage_swizzle as constexpr
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_device.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/renderer_opengl/gl_device.cpp b/src/video_core/renderer_opengl/gl_device.cpp index c286502ba..d83dca25a 100644 --- a/src/video_core/renderer_opengl/gl_device.cpp +++ b/src/video_core/renderer_opengl/gl_device.cpp | |||
| @@ -87,7 +87,7 @@ u32 Extract(u32& base, u32& num, u32 amount, std::optional<GLenum> limit = {}) { | |||
| 87 | std::array<Device::BaseBindings, Tegra::Engines::MaxShaderTypes> BuildBaseBindings() noexcept { | 87 | std::array<Device::BaseBindings, Tegra::Engines::MaxShaderTypes> BuildBaseBindings() noexcept { |
| 88 | std::array<Device::BaseBindings, Tegra::Engines::MaxShaderTypes> bindings; | 88 | std::array<Device::BaseBindings, Tegra::Engines::MaxShaderTypes> bindings; |
| 89 | 89 | ||
| 90 | static std::array<std::size_t, 5> stage_swizzle = {0, 1, 2, 3, 4}; | 90 | static constexpr std::array<std::size_t, 5> stage_swizzle{0, 1, 2, 3, 4}; |
| 91 | const u32 total_ubos = GetInteger<u32>(GL_MAX_UNIFORM_BUFFER_BINDINGS); | 91 | const u32 total_ubos = GetInteger<u32>(GL_MAX_UNIFORM_BUFFER_BINDINGS); |
| 92 | const u32 total_ssbos = GetInteger<u32>(GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS); | 92 | const u32 total_ssbos = GetInteger<u32>(GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS); |
| 93 | const u32 total_samplers = GetInteger<u32>(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS); | 93 | const u32 total_samplers = GetInteger<u32>(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS); |