Просмотр исходного кода

gl_state: Remove multisample tracking

ReinUsesLisp 6 лет назад
Родитель
Сommit
f92236976b

+ 2 - 2
src/video_core/renderer_opengl/gl_rasterizer.cpp

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

+ 0 - 8
src/video_core/renderer_opengl/gl_state.cpp

@@ -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() {
     Enable(GL_RASTERIZER_DISCARD, cur_state.rasterizer_discard, rasterizer_discard);
 }
@@ -325,7 +318,6 @@ void OpenGLState::Apply() {
     ApplyProgramPipeline();
     ApplyClipDistances();
     ApplyFragmentColorClamp();
-    ApplyMultisample();
     ApplyRasterizerDiscard();
     ApplyColorMask();
     ApplyViewport();

+ 0 - 6
src/video_core/renderer_opengl/gl_state.h

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