piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11550 from iwubcode/set_common_samplers_count

Browse Source 
VideoCommon: add constant value for maximum number of pixel samplers
This commit is contained in:
Scott Mansell
2023-02-13 16:05:51 +13:00
committed by GitHub
parent 2c24d07837 af313f8419
commit f37113204f
18 changed files with 62 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/VideoBackends/OGL/OGLGfx.h
View File

@ -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;

4
Source/Core/VideoBackends/OGL/SamplerCache.h
View File

@ -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;