ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12281 from TellowKrinkle/AsahiGL33 

VideoCommon: Don't use indexed output for fbfetch
This commit is contained in:
Admiral H. Curtiss 2024-02-18 02:33:50 +01:00 committed by GitHub
parent b30d6e92db 5949911a5a
commit 9b5fd5d34e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/VideoCommon/PixelShaderGen.cpp
View File

@ -1000,10 +1000,15 @@ ShaderCode GeneratePixelShaderCode(APIType api_type, const ShaderHostConfig& hos
else else
#endif #endif
{ {
out.Write("{} {} {} {};\n", "FRAGMENT_OUTPUT_LOCATION_INDEXED(0, 0)", if (use_framebuffer_fetch)
use_framebuffer_fetch ? "FRAGMENT_INOUT" : "out", {
uid_data->uint_output ? "uvec4" : "vec4", out.Write("FRAGMENT_OUTPUT_LOCATION(0) FRAGMENT_INOUT vec4 real_ocol0;\n");
use_framebuffer_fetch ? "real_ocol0" : "ocol0"); }
else
{
out.Write("FRAGMENT_OUTPUT_LOCATION_INDEXED(0, 0) out {} ocol0;\n",
uid_data->uint_output ? "uvec4" : "vec4");
}
if (!uid_data->no_dual_src) if (!uid_data->no_dual_src)
{ {

13
Source/Core/VideoCommon/UberShaderPixel.cpp
View File

@ -370,10 +370,15 @@ ShaderCode GenPixelShader(APIType api_type, const ShaderHostConfig& host_config,
else else
#endif #endif
{ {
out.Write("{} {} {} {};\n", "FRAGMENT_OUTPUT_LOCATION_INDEXED(0, 0)", if (use_framebuffer_fetch)
use_framebuffer_fetch ? "FRAGMENT_INOUT" : "out", {
uid_data->uint_output ? "uvec4" : "vec4", out.Write("FRAGMENT_OUTPUT_LOCATION(0) FRAGMENT_INOUT vec4 real_ocol0;\n");
use_framebuffer_fetch ? "real_ocol0" : "ocol0"); }
else
{
out.Write("FRAGMENT_OUTPUT_LOCATION_INDEXED(0, 0) out {} ocol0;\n",
uid_data->uint_output ? "uvec4" : "vec4");
}
if (use_dual_source) if (use_dual_source)
{ {