Browse Source
gl_state: Remove ApplyDefaultState
OpenGL has defaults values we can trust. Remove these.
pull/15/merge
ReinUsesLisp
6 years ago
No known key found for this signature in database
GPG Key ID: 2DFC508897B39CFE
3 changed files with
1 additions and
17 deletions
-
src/video_core/renderer_opengl/gl_rasterizer.cpp
-
src/video_core/renderer_opengl/gl_state.cpp
-
src/video_core/renderer_opengl/gl_state.h
|
|
|
@ -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(); |
|
|
|
|
|
|
|
@ -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); |
|
|
|
|
|
|
|
@ -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); |
|
|
|
|