Merge pull request #11550 from iwubcode/set_common_samplers_count

VideoCommon: add constant value for maximum number of pixel samplers

2 files changed, 5 insertions, 2 deletions

diff --git a/Source/Core/VideoBackends/OGL/OGLGfx.h b/Source/Core/VideoBackends/OGL/OGLGfx.h
index 410b7d562e..51784c2ec8 100644
--- a/Source/Core/VideoBackends/OGL/OGLGfx.h
+++ b/Source/Core/VideoBackends/OGL/OGLGfx.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "VideoCommon/AbstractGfx.h"
+#include "VideoCommon/Constants.h"
 
 class GLContext;
 
@@ -100,7 +101,7 @@ private:
 
   std::unique_ptr<GLContext> m_main_gl_context;
   std::unique_ptr<OGLFramebuffer> m_system_framebuffer;
-  std::array<const OGLTexture*, 8> m_bound_textures{};
+  std::array<const OGLTexture*, VideoCommon::MAX_PIXEL_SHADER_SAMPLERS> m_bound_textures{};
   AbstractTexture* m_bound_image_texture = nullptr;
   RasterizationState m_current_rasterization_state;
   DepthState m_current_depth_state;
diff --git a/Source/Core/VideoBackends/OGL/SamplerCache.h b/Source/Core/VideoBackends/OGL/SamplerCache.h
index be8860c9f8..5d87c4daa2 100644
--- a/Source/Core/VideoBackends/OGL/SamplerCache.h
+++ b/Source/Core/VideoBackends/OGL/SamplerCache.h
@@ -9,6 +9,7 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/GL/GLUtil.h"
+#include "VideoCommon/Constants.h"
 #include "VideoCommon/RenderState.h"
 
 namespace OGL
@@ -35,7 +36,8 @@ private:
   static void SetParameters(GLuint sampler_id, const SamplerState& params);
 
   std::map<SamplerState, GLuint> m_cache;
-  std::array<std::pair<SamplerState, GLuint>, 8> m_active_samplers{};
+  std::array<std::pair<SamplerState, GLuint>, VideoCommon::MAX_PIXEL_SHADER_SAMPLERS>
+      m_active_samplers{};
 
   GLuint m_point_sampler;
   GLuint m_linear_sampler;