summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2019-12-26 05:04:36 +0100
committerReinUsesLisp <reinuseslisp@airmail.cc>2020-02-28 20:57:47 +0100
commitf92236976b870cfb8be5a9efa03e4fb171d0ce00 (patch)
tree8133cf075cff774fdcf9c633cc80db77d42a1d0d
parentgl_state: Remove framebuffer sRGB tracking (diff)
downloadyuzu-f92236976b870cfb8be5a9efa03e4fb171d0ce00.tar
yuzu-f92236976b870cfb8be5a9efa03e4fb171d0ce00.tar.gz
yuzu-f92236976b870cfb8be5a9efa03e4fb171d0ce00.tar.bz2
yuzu-f92236976b870cfb8be5a9efa03e4fb171d0ce00.tar.lz
yuzu-f92236976b870cfb8be5a9efa03e4fb171d0ce00.tar.xz
yuzu-f92236976b870cfb8be5a9efa03e4fb171d0ce00.tar.zst
yuzu-f92236976b870cfb8be5a9efa03e4fb171d0ce00.zip
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp4
-rw-r--r--src/video_core/renderer_opengl/gl_state.cpp8
-rw-r--r--src/video_core/renderer_opengl/gl_state.h6
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() {
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() {
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() {
}
}
-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();
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 {
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();