Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reinterpret framebuffer formats as needed. Outrun reflections partial fix #13636

Merged
merged 9 commits into from
Nov 8, 2020
+773 −310
Merged

Reinterpret framebuffer formats as needed. Outrun reflections partial fix #13636

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
19b4feb
More reinterpret shader gen and test work.
hrydgard Nov 2, 2020
f2e315b
More shadergen work
hrydgard Nov 3, 2020
1ccc8c1
Reinterpret code runs, no idea if it works
hrydgard Nov 6, 2020
981d0a2
Reinterpret the data when binding a framebuffer with a different 16-b…
hrydgard Nov 6, 2020
96c36d5
More work on reinterpret. Get Vulkan running
hrydgard Nov 6, 2020
28f8578
Cleanup reinterpret shader resources in FramebufferManagerCommon::Dev…
hrydgard Nov 7, 2020
4e16fca
Fix reinterpret shader for D3D11
hrydgard Nov 7, 2020
9105249
Add compat flag for reinterpret shader, also disable on platforms tha…
hrydgard Nov 7, 2020
d81522a
Address feedback.
hrydgard Nov 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix reinterpret shader for D3D11
  • Loading branch information
@hrydgard
hrydgard committed Nov 8, 2020
commit 4e16fcaf1a3594825b383d095773ad4c849e7153
1 change: 1 addition & 0 deletions Common/GPU/Shader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ void ShaderLanguageDesc::Init(ShaderLanguage lang) {
forceMatrix4x4 = false;
coefsFromBuffers = true;
vsOutPrefix = "Out.";
viewportYSign = "-";
break;
}
}
Expand Down
1 change: 1 addition & 0 deletions Common/GPU/Shader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ struct ShaderLanguageDesc {
const char *lastFragData = nullptr;
const char *framebufferFetchExtension = nullptr;
const char *vsOutPrefix = "";
const char *viewportYSign = "";
bool glslES30 = false;
bool bitwiseOps = false;
bool forceMatrix4x4 = false;
Expand Down
1 change: 1 addition & 0 deletions GPU/Common/ReinterpretFramebuffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ bool GenerateReinterpretVertexShader(char *buffer, const ShaderLanguageDesc &lan
writer.C(" float x = -1.0 + float((gl_VertexIndex & 1) << 2);\n");
writer.C(" float y = -1.0 + float((gl_VertexIndex & 2) << 1);\n");
writer.C(" v_texcoord = (vec2(x, y) + vec2(1.0, 1.0)) * 0.5;\n");
writer.F(" y *= %s1.0;\n", lang.viewportYSign);
writer.C(" gl_Position = vec4(x, y, 0.0, 1.0);\n");

writer.EndVSMain(varyings);
Expand Down