diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-11-29 01:04:57 +0100 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-11-29 03:02:20 +0100 |
commit | c34da106edb3e5a6d519c7afe91f52c2abd2f901 (patch) | |
tree | 21c0d19f4da9849f12024f8d4b76be07b1bb3bfc /src/video_core/renderer_opengl/gl_rasterizer.cpp | |
parent | Merge pull request #3169 from lioncash/memory (diff) | |
download | yuzu-c34da106edb3e5a6d519c7afe91f52c2abd2f901.tar yuzu-c34da106edb3e5a6d519c7afe91f52c2abd2f901.tar.gz yuzu-c34da106edb3e5a6d519c7afe91f52c2abd2f901.tar.bz2 yuzu-c34da106edb3e5a6d519c7afe91f52c2abd2f901.tar.lz yuzu-c34da106edb3e5a6d519c7afe91f52c2abd2f901.tar.xz yuzu-c34da106edb3e5a6d519c7afe91f52c2abd2f901.tar.zst yuzu-c34da106edb3e5a6d519c7afe91f52c2abd2f901.zip |
Diffstat (limited to 'src/video_core/renderer_opengl/gl_rasterizer.cpp')
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 41 |
1 files changed, 13 insertions, 28 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index a568a4343..18c122228 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -93,7 +93,6 @@ RasterizerOpenGL::RasterizerOpenGL(Core::System& system, Core::Frontend::EmuWind shader_program_manager = std::make_unique<GLShader::ProgramManager>(); state.draw.shader_program = 0; state.Apply(); - clear_framebuffer.Create(); LOG_DEBUG(Render_OpenGL, "Sync fixed function OpenGL state here"); CheckExtensions(); @@ -405,46 +404,32 @@ void RasterizerOpenGL::ConfigureFramebuffers() { void RasterizerOpenGL::ConfigureClearFramebuffer(OpenGLState& current_state, bool using_color_fb, bool using_depth_fb, bool using_stencil_fb) { + using VideoCore::Surface::SurfaceType; + auto& gpu = system.GPU().Maxwell3D(); const auto& regs = gpu.regs; texture_cache.GuardRenderTargets(true); - View color_surface{}; + View color_surface; if (using_color_fb) { color_surface = texture_cache.GetColorBufferSurface(regs.clear_buffers.RT, false); } - View depth_surface{}; + View depth_surface; if (using_depth_fb || using_stencil_fb) { depth_surface = texture_cache.GetDepthBufferSurface(false); } texture_cache.GuardRenderTargets(false); - current_state.draw.draw_framebuffer = clear_framebuffer.handle; - current_state.ApplyFramebufferState(); + FramebufferCacheKey key; + key.colors_count = color_surface ? 1 : 0; + key.colors[0] = color_surface; + key.color_attachments[0] = GL_COLOR_ATTACHMENT0; + key.zeta = depth_surface; + key.stencil_enable = depth_surface && depth_surface->GetSurfaceParams().type == + VideoCore::Surface::SurfaceType::DepthStencil; - if (color_surface) { - color_surface->Attach(GL_COLOR_ATTACHMENT0, GL_DRAW_FRAMEBUFFER); - } else { - glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0, 0); - } - - if (depth_surface) { - const auto& params = depth_surface->GetSurfaceParams(); - switch (params.type) { - case VideoCore::Surface::SurfaceType::Depth: - depth_surface->Attach(GL_DEPTH_ATTACHMENT, GL_DRAW_FRAMEBUFFER); - glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_TEXTURE_2D, 0, 0); - break; - case VideoCore::Surface::SurfaceType::DepthStencil: - depth_surface->Attach(GL_DEPTH_STENCIL_ATTACHMENT, GL_DRAW_FRAMEBUFFER); - break; - default: - UNIMPLEMENTED(); - } - } else { - glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, 0, - 0); - } + current_state.draw.draw_framebuffer = framebuffer_cache.GetFramebuffer(key); + current_state.ApplyFramebufferState(); } void RasterizerOpenGL::Clear() { |