The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-10 08:09:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8286 from stenzek/efb-savestate-fixes

Browse Source 
FramebufferManager: Fix restoring of EFB depth buffer / upside-down in OpenGL
This commit is contained in:
Connor McLaughlin 2019-08-04 14:07:18 +10:00 committed by GitHub
commit c829351c90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/VideoCommon/FramebufferManager.cpp
View File

@ -472,6 +472,7 @@ bool FramebufferManager::CompileReadbackPipelines()
if (!restore_shader)
return false;
config.depth_state = RenderState::GetAlwaysWriteDepthState();
config.framebuffer_state = GetEFBFramebufferState();
config.framebuffer_state.per_sample_shading = false;
config.vertex_shader = g_shader_cache->GetScreenQuadVertexShader();

7
Source/Core/VideoCommon/FramebufferShaderGen.cpp
View File

@ -651,14 +651,11 @@ std::string GenerateEFBRestorePixelShader()
EmitPixelMainDeclaration(ss, 1, 0, "float4",
GetAPIType() == APIType::D3D ? "out float depth : SV_Depth, " : "");
ss << "{\n";
ss << " float3 coords = float3(v_tex0.x, "
<< (g_ActiveConfig.backend_info.bUsesLowerLeftOrigin ? "1.0 - " : "")
<< "v_tex0.y, v_tex0.z);\n";
ss << " ocol0 = ";
EmitSampleTexture(ss, 0, "coords");
EmitSampleTexture(ss, 0, "v_tex0");
ss << ";\n";
ss << " " << (GetAPIType() == APIType::D3D ? "depth" : "gl_FragDepth") << " = ";
EmitSampleTexture(ss, 1, "coords");
EmitSampleTexture(ss, 1, "v_tex0");
ss << ".r;\n";
ss << "}\n";
return ss.str();