summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2019-12-26 00:13:43 +0100
committerReinUsesLisp <reinuseslisp@airmail.cc>2020-02-28 20:50:58 +0100
commit915d73f3b8871fc31b9b6571d645ced6f766bc43 (patch)
treec6cbed195070e4345954b47a38c3ca87fd4d9c6e
parentgl_state: Remove polygon offset tracking (diff)
downloadyuzu-915d73f3b8871fc31b9b6571d645ced6f766bc43.tar
yuzu-915d73f3b8871fc31b9b6571d645ced6f766bc43.tar.gz
yuzu-915d73f3b8871fc31b9b6571d645ced6f766bc43.tar.bz2
yuzu-915d73f3b8871fc31b9b6571d645ced6f766bc43.tar.lz
yuzu-915d73f3b8871fc31b9b6571d645ced6f766bc43.tar.xz
yuzu-915d73f3b8871fc31b9b6571d645ced6f766bc43.tar.zst
yuzu-915d73f3b8871fc31b9b6571d645ced6f766bc43.zip
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp5
-rw-r--r--src/video_core/renderer_opengl/gl_state.cpp7
-rw-r--r--src/video_core/renderer_opengl/gl_state.h7
3 files changed, 1 insertions, 18 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index 744892618..5c5273b5d 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -1117,10 +1117,7 @@ void RasterizerOpenGL::SyncBlendState() {
auto& maxwell3d = system.GPU().Maxwell3D();
const auto& regs = maxwell3d.regs;
- state.blend_color.red = regs.blend_color.r;
- state.blend_color.green = regs.blend_color.g;
- state.blend_color.blue = regs.blend_color.b;
- state.blend_color.alpha = regs.blend_color.a;
+ glBlendColor(regs.blend_color.r, regs.blend_color.g, regs.blend_color.b, regs.blend_color.a);
state.independant_blend.enabled = regs.independent_blend_enable;
if (!state.independant_blend.enabled) {
diff --git a/src/video_core/renderer_opengl/gl_state.cpp b/src/video_core/renderer_opengl/gl_state.cpp
index 05c271ad2..e8463da7e 100644
--- a/src/video_core/renderer_opengl/gl_state.cpp
+++ b/src/video_core/renderer_opengl/gl_state.cpp
@@ -330,13 +330,6 @@ void OpenGLState::ApplyBlending() {
ApplyGlobalBlending();
}
cur_state.independant_blend.enabled = independant_blend.enabled;
-
- if (UpdateTie(
- std::tie(cur_state.blend_color.red, cur_state.blend_color.green,
- cur_state.blend_color.blue, cur_state.blend_color.alpha),
- std::tie(blend_color.red, blend_color.green, blend_color.blue, blend_color.alpha))) {
- glBlendColor(blend_color.red, blend_color.green, blend_color.blue, blend_color.alpha);
- }
}
void OpenGLState::ApplyLogicOp() {
diff --git a/src/video_core/renderer_opengl/gl_state.h b/src/video_core/renderer_opengl/gl_state.h
index 71a2cad2e..b06a88f01 100644
--- a/src/video_core/renderer_opengl/gl_state.h
+++ b/src/video_core/renderer_opengl/gl_state.h
@@ -82,13 +82,6 @@ public:
} independant_blend;
struct {
- GLclampf red = 0.0f;
- GLclampf green = 0.0f;
- GLclampf blue = 0.0f;
- GLclampf alpha = 0.0f;
- } blend_color; // GL_BLEND_COLOR
-
- struct {
bool enabled = false; // GL_LOGIC_OP_MODE
GLenum operation = GL_COPY;
} logic_op;