artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gl_state: Remove multisample tracking

Browse source
This commit is contained in:
ReinUsesLisp 2019-12-26 01:04:36 -03:00
parent 04d1134191
commit f92236976b
3 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/video_core/renderer_opengl/gl_rasterizer.cpp
View file

@ -1083,8 +1083,8 @@ void RasterizerOpenGL::SyncColorMask() {
void RasterizerOpenGL::SyncMultiSampleState() { void RasterizerOpenGL::SyncMultiSampleState() {
const auto& regs = system.GPU().Maxwell3D().regs; const auto& regs = system.GPU().Maxwell3D().regs;
state.multisample_control.alpha_to_coverage = regs.multisample_control.alpha_to_coverage != 0; oglEnable(GL_SAMPLE_ALPHA_TO_COVERAGE, regs.multisample_control.alpha_to_coverage);
state.multisample_control.alpha_to_one = regs.multisample_control.alpha_to_one != 0; oglEnable(GL_SAMPLE_ALPHA_TO_ONE, regs.multisample_control.alpha_to_one);
} }
void RasterizerOpenGL::SyncFragmentColorClampState() { void RasterizerOpenGL::SyncFragmentColorClampState() {

8
src/video_core/renderer_opengl/gl_state.cpp
View file

@ -124,13 +124,6 @@ void OpenGLState::ApplyFragmentColorClamp() {
} }
} }
void OpenGLState::ApplyMultisample() {
Enable(GL_SAMPLE_ALPHA_TO_COVERAGE, cur_state.multisample_control.alpha_to_coverage,
multisample_control.alpha_to_coverage);
Enable(GL_SAMPLE_ALPHA_TO_ONE, cur_state.multisample_control.alpha_to_one,
multisample_control.alpha_to_one);
}
void OpenGLState::ApplyRasterizerDiscard() { void OpenGLState::ApplyRasterizerDiscard() {
Enable(GL_RASTERIZER_DISCARD, cur_state.rasterizer_discard, rasterizer_discard); Enable(GL_RASTERIZER_DISCARD, cur_state.rasterizer_discard, rasterizer_discard);
} }
@ -325,7 +318,6 @@ void OpenGLState::Apply() {
ApplyProgramPipeline(); ApplyProgramPipeline();
ApplyClipDistances(); ApplyClipDistances();
ApplyFragmentColorClamp(); ApplyFragmentColorClamp();
ApplyMultisample();
ApplyRasterizerDiscard(); ApplyRasterizerDiscard();
ApplyColorMask(); ApplyColorMask();
ApplyViewport(); ApplyViewport();

6
src/video_core/renderer_opengl/gl_state.h
View file

@ -13,11 +13,6 @@ namespace OpenGL {
class OpenGLState { class OpenGLState {
public: public:
struct {
bool alpha_to_coverage = false; // GL_ALPHA_TO_COVERAGE
bool alpha_to_one = false; // GL_ALPHA_TO_ONE
} multisample_control;
struct { struct {
bool enabled = false; // GL_CLAMP_FRAGMENT_COLOR_ARB bool enabled = false; // GL_CLAMP_FRAGMENT_COLOR_ARB
} fragment_color_clamp; } fragment_color_clamp;
@ -116,7 +111,6 @@ public:
void ApplyProgramPipeline(); void ApplyProgramPipeline();
void ApplyClipDistances(); void ApplyClipDistances();
void ApplyFragmentColorClamp(); void ApplyFragmentColorClamp();
void ApplyMultisample();
void ApplyRasterizerDiscard(); void ApplyRasterizerDiscard();
void ApplyColorMask(); void ApplyColorMask();
void ApplyStencilTest(); void ApplyStencilTest();