From b1498d2c54b11b9a9c0ab307f03377f6661ab873 Mon Sep 17 00:00:00 2001 From: ReinUsesLisp Date: Mon, 13 Jan 2020 17:20:02 -0300 Subject: gl_rasterizer: Remove num vertex buffers magic number --- src/video_core/renderer_opengl/gl_rasterizer.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/video_core/renderer_opengl/gl_rasterizer.cpp') diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 8a762fd0d..84c285db8 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -54,6 +54,8 @@ MICROPROFILE_DEFINE(OpenGL_PrimitiveAssembly, "OpenGL", "Prim Asmbl", MP_RGB(255 namespace { +constexpr std::size_t NumSupportedVertexAttributes = 16; + template Tegra::Texture::FullTextureInfo GetTextureInfo(const Engine& engine, const Entry& entry, Tegra::Engines::ShaderType shader_type, @@ -134,7 +136,7 @@ void RasterizerOpenGL::SetupVertexFormat() { // avoid OpenGL errors. // TODO(Subv): Analyze the shader to identify which attributes are actually used and don't // assume every shader uses them all. - for (std::size_t index = 0; index < 16; ++index) { + for (std::size_t index = 0; index < NumSupportedVertexAttributes; ++index) { if (!flags[Dirty::VertexFormat0 + index]) { continue; } @@ -207,7 +209,7 @@ void RasterizerOpenGL::SetupVertexInstances() { flags[Dirty::VertexInstances] = false; const auto& regs = gpu.regs; - for (std::size_t index = 0; index < 16; ++index) { + for (std::size_t index = 0; index < NumSupportedVertexAttributes; ++index) { if (!flags[Dirty::VertexInstance0 + index]) { continue; } -- cgit v1.2.3