summaryrefslogtreecommitdiffstats
path: root/src/video_core
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2019-10-30 01:17:16 +0100
committerReinUsesLisp <reinuseslisp@airmail.cc>2019-10-30 01:27:25 +0100
commit3c6557c235a9b5a1f76ac5a07d301fdf3a615e2a (patch)
tree65c508f3183afcb14074408717e9f3eac40d8c92 /src/video_core
parentgl_state: Change SetDefaultViewports to use default constructor (diff)
downloadyuzu-3c6557c235a9b5a1f76ac5a07d301fdf3a615e2a.tar
yuzu-3c6557c235a9b5a1f76ac5a07d301fdf3a615e2a.tar.gz
yuzu-3c6557c235a9b5a1f76ac5a07d301fdf3a615e2a.tar.bz2
yuzu-3c6557c235a9b5a1f76ac5a07d301fdf3a615e2a.tar.lz
yuzu-3c6557c235a9b5a1f76ac5a07d301fdf3a615e2a.tar.xz
yuzu-3c6557c235a9b5a1f76ac5a07d301fdf3a615e2a.tar.zst
yuzu-3c6557c235a9b5a1f76ac5a07d301fdf3a615e2a.zip
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp2
-rw-r--r--src/video_core/renderer_opengl/gl_state.cpp11
-rw-r--r--src/video_core/renderer_opengl/gl_state.h5
3 files changed, 1 insertions, 17 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index 43032e9a7..8774e836c 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -68,8 +68,6 @@ RasterizerOpenGL::RasterizerOpenGL(Core::System& system, Core::Frontend::EmuWind
ScreenInfo& info)
: texture_cache{system, *this, device}, shader_cache{*this, system, emu_window, device},
system{system}, screen_info{info}, buffer_cache{*this, system, STREAM_BUFFER_SIZE} {
- OpenGLState::ApplyDefaultState();
-
shader_program_manager = std::make_unique<GLShader::ProgramManager>();
state.draw.shader_program = 0;
state.Apply();
diff --git a/src/video_core/renderer_opengl/gl_state.cpp b/src/video_core/renderer_opengl/gl_state.cpp
index cfd1481de..48c123ffe 100644
--- a/src/video_core/renderer_opengl/gl_state.cpp
+++ b/src/video_core/renderer_opengl/gl_state.cpp
@@ -92,17 +92,6 @@ void OpenGLState::SetDefaultViewports() {
depth_clamp.near_plane = false;
}
-void OpenGLState::ApplyDefaultState() {
- glEnable(GL_BLEND);
- glDisable(GL_FRAMEBUFFER_SRGB);
- glDisable(GL_CULL_FACE);
- glDisable(GL_DEPTH_TEST);
- glDisable(GL_PRIMITIVE_RESTART);
- glDisable(GL_STENCIL_TEST);
- glDisable(GL_COLOR_LOGIC_OP);
- glDisable(GL_SCISSOR_TEST);
-}
-
void OpenGLState::ApplyFramebufferState() const {
if (UpdateValue(cur_state.draw.read_framebuffer, draw.read_framebuffer)) {
glBindFramebuffer(GL_READ_FRAMEBUFFER, draw.read_framebuffer);
diff --git a/src/video_core/renderer_opengl/gl_state.h b/src/video_core/renderer_opengl/gl_state.h
index 805ee9e4a..b95f33613 100644
--- a/src/video_core/renderer_opengl/gl_state.h
+++ b/src/video_core/renderer_opengl/gl_state.h
@@ -70,7 +70,7 @@ public:
} stencil;
struct Blend {
- bool enabled = true; // GL_BLEND
+ bool enabled = false; // GL_BLEND
GLenum rgb_equation = GL_FUNC_ADD; // GL_BLEND_EQUATION_RGB
GLenum a_equation = GL_FUNC_ADD; // GL_BLEND_EQUATION_ALPHA
GLenum src_rgb_func = GL_ONE; // GL_BLEND_SRC_RGB
@@ -183,9 +183,6 @@ public:
void ApplyPolygonOffset() const;
void ApplyAlphaTest() const;
- /// Set the initial OpenGL state
- static void ApplyDefaultState();
-
/// Resets any references to the given resource
OpenGLState& UnbindTexture(GLuint handle);
OpenGLState& ResetSampler(GLuint handle);