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

Jump to bottom

Fix regression for D3D EFB depth copies. #2005

Merged
merged 1 commit into from
Feb 3, 2015
Merged

Fix regression for D3D EFB depth copies. #2005

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 12 additions & 12 deletions Source/Core/VideoCommon/TextureConversionShader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,16 +461,16 @@ static void WriteZ8Encoder(char*& p, const char* multiplier,API_TYPE ApiType)

WRITE(p, " float depth;\n");

WriteSampleColor(p, "b", "depth", 0, ApiType);
WriteSampleColor(p, "r", "depth", 0, ApiType);
WRITE(p, "ocol0.b = frac(depth * %s);\n", multiplier);

WriteSampleColor(p, "b", "depth", 1, ApiType);
WriteSampleColor(p, "r", "depth", 1, ApiType);
WRITE(p, "ocol0.g = frac(depth * %s);\n", multiplier);

WriteSampleColor(p, "b", "depth", 2, ApiType);
WriteSampleColor(p, "r", "depth", 2, ApiType);
WRITE(p, "ocol0.r = frac(depth * %s);\n", multiplier);

WriteSampleColor(p, "b", "depth", 3, ApiType);
WriteSampleColor(p, "r", "depth", 3, ApiType);
WRITE(p, "ocol0.a = frac(depth * %s);\n", multiplier);

WriteEncoderEnd(p, ApiType);
Expand All @@ -485,7 +485,7 @@ static void WriteZ16Encoder(char*& p,API_TYPE ApiType)

// byte order is reversed

WriteSampleColor(p, "b", "depth", 0, ApiType);
WriteSampleColor(p, "r", "depth", 0, ApiType);

WRITE(p, " depth *= 16777215.0;\n");
WRITE(p, " expanded.r = floor(depth / (256.0 * 256.0));\n");
Expand All @@ -495,7 +495,7 @@ static void WriteZ16Encoder(char*& p,API_TYPE ApiType)
WRITE(p, " ocol0.b = expanded.g / 255.0;\n");
WRITE(p, " ocol0.g = expanded.r / 255.0;\n");

WriteSampleColor(p, "b", "depth", 1, ApiType);
WriteSampleColor(p, "r", "depth", 1, ApiType);

WRITE(p, " depth *= 16777215.0;\n");
WRITE(p, " expanded.r = floor(depth / (256.0 * 256.0));\n");
Expand All @@ -517,7 +517,7 @@ static void WriteZ16LEncoder(char*& p,API_TYPE ApiType)

// byte order is reversed

WriteSampleColor(p, "b", "depth", 0, ApiType);
WriteSampleColor(p, "r", "depth", 0, ApiType);

WRITE(p, " depth *= 16777215.0;\n");
WRITE(p, " expanded.r = floor(depth / (256.0 * 256.0));\n");
Expand All @@ -529,7 +529,7 @@ static void WriteZ16LEncoder(char*& p,API_TYPE ApiType)
WRITE(p, " ocol0.b = expanded.b / 255.0;\n");
WRITE(p, " ocol0.g = expanded.g / 255.0;\n");

WriteSampleColor(p, "b", "depth", 1, ApiType);
WriteSampleColor(p, "r", "depth", 1, ApiType);

WRITE(p, " depth *= 16777215.0;\n");
WRITE(p, " expanded.r = floor(depth / (256.0 * 256.0));\n");
Expand All @@ -553,8 +553,8 @@ static void WriteZ24Encoder(char*& p, API_TYPE ApiType)
WRITE(p, " float3 expanded0;\n");
WRITE(p, " float3 expanded1;\n");

WriteSampleColor(p, "b", "depth0", 0, ApiType);
WriteSampleColor(p, "b", "depth1", 1, ApiType);
WriteSampleColor(p, "r", "depth0", 0, ApiType);
WriteSampleColor(p, "r", "depth1", 1, ApiType);

for (int i = 0; i < 2; i++)
{
Expand Down Expand Up @@ -641,7 +641,7 @@ const char *GenerateEncodingShader(u32 format,API_TYPE ApiType)
WriteCC8Encoder(p, "gb", ApiType);
break;
case GX_TF_Z8:
WriteC8Encoder(p, "b", ApiType);
WriteC8Encoder(p, "r", ApiType);
break;
case GX_TF_Z16:
WriteZ16Encoder(p, ApiType);
Expand All @@ -650,7 +650,7 @@ const char *GenerateEncodingShader(u32 format,API_TYPE ApiType)
WriteZ24Encoder(p, ApiType);
break;
case GX_CTF_Z4:
WriteC4Encoder(p, "b", ApiType);
WriteC4Encoder(p, "r", ApiType);
break;
case GX_CTF_Z8M:
WriteZ8Encoder(p, "256.0", ApiType);
Expand Down