summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/Src/BPFunctions.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Core/VideoCommon/Src/BPFunctions.cpp')
-rw-r--r--Source/Core/VideoCommon/Src/BPFunctions.cpp48
1 files changed, 15 insertions, 33 deletions
diff --git a/Source/Core/VideoCommon/Src/BPFunctions.cpp b/Source/Core/VideoCommon/Src/BPFunctions.cpp
index 64d486eea7..df329fbeb5 100644
--- a/Source/Core/VideoCommon/Src/BPFunctions.cpp
+++ b/Source/Core/VideoCommon/Src/BPFunctions.cpp
@@ -25,7 +25,6 @@
bool textureChanged[8];
const bool renderFog = false;
-int prev_pix_format = -1;
namespace BPFunctions
{
// ----------------------------------------------
@@ -90,66 +89,49 @@ void CopyEFB(const BPCmd &bp, const EFBRectangle &rc, const u32 &address, const
There's numerous possible formats for the pixel data in the EFB.
However, in the HW accelerated plugins we're always using RGBA8
for the EFB format, which causes some problems:
- - We're using an alpha channel although the game doesn't (1)
- - If the actual EFB format is PIXELFMT_RGBA6_Z24, we are using more bits per channel than the native HW (2)
- - When doing a z copy EFB copy target format GX_TF_Z24X8 , the native HW don't worry about hthe color efb format because it only uses the depth part
- - When changing EFB formats the efb must be cleared (3)
- - Possible other oddities should be noted here as well
+ - We're using an alpha channel although the game doesn't
+ - If the actual EFB format is RGBA6_Z24 or R5G6B5_Z16, we are using more bits per channel than the native HW
To properly emulate the above points, we're doing the following:
(1)
- disable alpha channel writing of any kind of rendering if the actual EFB format doesn't use an alpha channel
- NOTE: Always make sure that the EFB has been cleared to an alpha value of 0xFF in this case!
- - in a dition to the previus make sure we always return 0xFF in alpha when reading the efb content if the efb format has no alpha
- Same for color channels, these need to be cleared to 0x00 though.
(2)
- - just scale down the RGBA8 color to RGBA6 and upscale it to RGBA8 again
- (3) - when the pixel format changes:
- - call ClearScreen using the correct alpha format for the previus pixel format
-
-
+ - convert the RGBA8 color to RGBA6/RGB8/RGB565 and convert it to RGBA8 again
+ - convert the Z24 depth value to Z16 and back to Z24
*/
void ClearScreen(const BPCmd &bp, const EFBRectangle &rc)
{
- UPE_Copy PE_copy = bpmem.triggerEFBCopy;
bool colorEnable = bpmem.blendmode.colorupdate;
bool alphaEnable = bpmem.blendmode.alphaupdate;
bool zEnable = bpmem.zmode.updateenable;
- u32 color = (bpmem.clearcolorAR << 16) | bpmem.clearcolorGB;
- u32 z = bpmem.clearZValue;
- if(prev_pix_format == -1)
- {
- prev_pix_format = bpmem.zcontrol.pixel_format;
- }
+
// (1): Disable unused color channels
- switch (bpmem.zcontrol.pixel_format)
+ if (bpmem.zcontrol.pixel_format == PIXELFMT_RGB8_Z24 ||
+ bpmem.zcontrol.pixel_format == PIXELFMT_RGB565_Z16 ||
+ bpmem.zcontrol.pixel_format == PIXELFMT_Z24)
{
- case PIXELFMT_RGB8_Z24:
- case PIXELFMT_RGB565_Z16:
- alphaEnable = true;
- color |= (prev_pix_format == PIXELFMT_RGBA6_Z24)? 0x0 : 0xFF000000;//(3)
- break;
-
- case PIXELFMT_Z24:
- alphaEnable = colorEnable = false;
- break;
- default:
- break;
+ alphaEnable = false;
}
if (colorEnable || alphaEnable || zEnable)
{
+ u32 color = (bpmem.clearcolorAR << 16) | bpmem.clearcolorGB;
+ u32 z = bpmem.clearZValue;
+
+ // (2) drop additional accuracy
if (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24)
{
color = RGBA8ToRGBA6ToRGBA8(color);
}
else if (bpmem.zcontrol.pixel_format == PIXELFMT_RGB565_Z16)
{
- color = RGBA8ToRGB565ToRGB8(color);
+ color = RGBA8ToRGB565ToRGBA8(color);
+ z = Z24ToZ16ToZ24(z);
}
g_renderer->ClearScreen(rc, colorEnable, alphaEnable, zEnable, color, z);
}
- prev_pix_format = bpmem.zcontrol.pixel_format;
}