diff options
| author | 2019-12-26 01:04:36 -0300 | |
|---|---|---|
| committer | 2020-02-28 16:57:47 -0300 | |
| commit | f92236976b870cfb8be5a9efa03e4fb171d0ce00 (patch) | |
| tree | 8133cf075cff774fdcf9c633cc80db77d42a1d0d /src | |
| parent | gl_state: Remove framebuffer sRGB tracking (diff) | |
| download | yuzu-f92236976b870cfb8be5a9efa03e4fb171d0ce00.tar.gz yuzu-f92236976b870cfb8be5a9efa03e4fb171d0ce00.tar.xz yuzu-f92236976b870cfb8be5a9efa03e4fb171d0ce00.zip | |
gl_state: Remove multisample tracking
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_state.cpp | 8 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_state.h | 6 |
3 files changed, 2 insertions, 16 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index f5aa84a16..dc2d60156 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -1083,8 +1083,8 @@ void RasterizerOpenGL::SyncColorMask() { | |||
| 1083 | 1083 | ||
| 1084 | void RasterizerOpenGL::SyncMultiSampleState() { | 1084 | void RasterizerOpenGL::SyncMultiSampleState() { |
| 1085 | const auto& regs = system.GPU().Maxwell3D().regs; | 1085 | const auto& regs = system.GPU().Maxwell3D().regs; |
| 1086 | state.multisample_control.alpha_to_coverage = regs.multisample_control.alpha_to_coverage != 0; | 1086 | oglEnable(GL_SAMPLE_ALPHA_TO_COVERAGE, regs.multisample_control.alpha_to_coverage); |
| 1087 | state.multisample_control.alpha_to_one = regs.multisample_control.alpha_to_one != 0; | 1087 | oglEnable(GL_SAMPLE_ALPHA_TO_ONE, regs.multisample_control.alpha_to_one); |
| 1088 | } | 1088 | } |
| 1089 | 1089 | ||
| 1090 | void RasterizerOpenGL::SyncFragmentColorClampState() { | 1090 | void RasterizerOpenGL::SyncFragmentColorClampState() { |
diff --git a/src/video_core/renderer_opengl/gl_state.cpp b/src/video_core/renderer_opengl/gl_state.cpp index e67db758d..b726adfc7 100644 --- a/src/video_core/renderer_opengl/gl_state.cpp +++ b/src/video_core/renderer_opengl/gl_state.cpp | |||
| @@ -124,13 +124,6 @@ void OpenGLState::ApplyFragmentColorClamp() { | |||
| 124 | } | 124 | } |
| 125 | } | 125 | } |
| 126 | 126 | ||
| 127 | void OpenGLState::ApplyMultisample() { | ||
| 128 | Enable(GL_SAMPLE_ALPHA_TO_COVERAGE, cur_state.multisample_control.alpha_to_coverage, | ||
| 129 | multisample_control.alpha_to_coverage); | ||
| 130 | Enable(GL_SAMPLE_ALPHA_TO_ONE, cur_state.multisample_control.alpha_to_one, | ||
| 131 | multisample_control.alpha_to_one); | ||
| 132 | } | ||
| 133 | |||
| 134 | void OpenGLState::ApplyRasterizerDiscard() { | 127 | void OpenGLState::ApplyRasterizerDiscard() { |
| 135 | Enable(GL_RASTERIZER_DISCARD, cur_state.rasterizer_discard, rasterizer_discard); | 128 | Enable(GL_RASTERIZER_DISCARD, cur_state.rasterizer_discard, rasterizer_discard); |
| 136 | } | 129 | } |
| @@ -325,7 +318,6 @@ void OpenGLState::Apply() { | |||
| 325 | ApplyProgramPipeline(); | 318 | ApplyProgramPipeline(); |
| 326 | ApplyClipDistances(); | 319 | ApplyClipDistances(); |
| 327 | ApplyFragmentColorClamp(); | 320 | ApplyFragmentColorClamp(); |
| 328 | ApplyMultisample(); | ||
| 329 | ApplyRasterizerDiscard(); | 321 | ApplyRasterizerDiscard(); |
| 330 | ApplyColorMask(); | 322 | ApplyColorMask(); |
| 331 | ApplyViewport(); | 323 | ApplyViewport(); |
diff --git a/src/video_core/renderer_opengl/gl_state.h b/src/video_core/renderer_opengl/gl_state.h index 6c5126687..5a8a728f2 100644 --- a/src/video_core/renderer_opengl/gl_state.h +++ b/src/video_core/renderer_opengl/gl_state.h | |||
| @@ -14,11 +14,6 @@ namespace OpenGL { | |||
| 14 | class OpenGLState { | 14 | class OpenGLState { |
| 15 | public: | 15 | public: |
| 16 | struct { | 16 | struct { |
| 17 | bool alpha_to_coverage = false; // GL_ALPHA_TO_COVERAGE | ||
| 18 | bool alpha_to_one = false; // GL_ALPHA_TO_ONE | ||
| 19 | } multisample_control; | ||
| 20 | |||
| 21 | struct { | ||
| 22 | bool enabled = false; // GL_CLAMP_FRAGMENT_COLOR_ARB | 17 | bool enabled = false; // GL_CLAMP_FRAGMENT_COLOR_ARB |
| 23 | } fragment_color_clamp; | 18 | } fragment_color_clamp; |
| 24 | 19 | ||
| @@ -116,7 +111,6 @@ public: | |||
| 116 | void ApplyProgramPipeline(); | 111 | void ApplyProgramPipeline(); |
| 117 | void ApplyClipDistances(); | 112 | void ApplyClipDistances(); |
| 118 | void ApplyFragmentColorClamp(); | 113 | void ApplyFragmentColorClamp(); |
| 119 | void ApplyMultisample(); | ||
| 120 | void ApplyRasterizerDiscard(); | 114 | void ApplyRasterizerDiscard(); |
| 121 | void ApplyColorMask(); | 115 | void ApplyColorMask(); |
| 122 | void ApplyStencilTest(); | 116 | void ApplyStencilTest(); |