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

Minor cleanup. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7287 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
sl1nk3.s 2011-03-04 23:23:59 +00:00
parent 7782b7c52d
commit 1e367749bd
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/VideoCommon/Src/BPFunctions.cpp
View File

@ -140,15 +140,10 @@ void ClearScreen(const BPCmd &bp, const EFBRectangle &rc)
void OnPixelFormatChange(const BPCmd &bp) void OnPixelFormatChange(const BPCmd &bp)
{ {
int convtype = -1; int convtype = -1;
u32 current_format = Renderer::GetPrevPixelFormat();
u32 new_format = bpmem.zcontrol.pixel_format;
u32 old_format = current_format & 0x3;
// Check for Z compression format change // TODO : Check for Z compression format change
// When using 16bit Z, the game may enable a special compression format which we need to handle // When using 16bit Z, the game may enable a special compression format which we need to handle
// If we don't, Z values will be completely screwed up, currently only Star Wars:RS2 uses that. // If we don't, Z values will be completely screwed up, currently only Star Wars:RS2 uses that.
//if (new_format == PIXELFMT_RGB565_Z16 && bpmem.zcontrol.zformat != (current_format >> 2))
// VertexShaderManager::SetZformatChanged();
/* /*
* When changing the EFB format, the pixel data won't get converted to the new format but stays the same. * When changing the EFB format, the pixel data won't get converted to the new format but stays the same.
@ -159,12 +154,15 @@ void OnPixelFormatChange(const BPCmd &bp)
!g_ActiveConfig.backend_info.bSupportsFormatReinterpretation) !g_ActiveConfig.backend_info.bSupportsFormatReinterpretation)
return; return;
// no need to reinterpret pixel data in that cases u32 old_format = Renderer::GetPrevPixelFormat();
u32 new_format = bpmem.zcontrol.pixel_format;
// no need to reinterpret pixel data in these cases
if (new_format == old_format || old_format == (unsigned int)-1) if (new_format == old_format || old_format == (unsigned int)-1)
goto skip; goto skip;
// Check for pixel format changes // Check for pixel format changes
switch (old_format & 0x3) switch (old_format)
{ {
case PIXELFMT_RGB8_Z24: case PIXELFMT_RGB8_Z24:
case PIXELFMT_Z24: case PIXELFMT_Z24:
@ -200,7 +198,7 @@ void OnPixelFormatChange(const BPCmd &bp)
if (convtype == -1) if (convtype == -1)
{ {
ERROR_LOG(VIDEO, "Unhandled EFB format change: %d to %d\n", old_format & 0x3, new_format); ERROR_LOG(VIDEO, "Unhandled EFB format change: %d to %d\n", old_format, new_format);
goto skip; goto skip;
} }
@ -209,7 +207,7 @@ void OnPixelFormatChange(const BPCmd &bp)
skip: skip:
DEBUG_LOG(VIDEO, "pixelfmt: pixel=%d, zc=%d", new_format, bpmem.zcontrol.zformat); DEBUG_LOG(VIDEO, "pixelfmt: pixel=%d, zc=%d", new_format, bpmem.zcontrol.zformat);
Renderer::StorePixelFormat(new_format | (bpmem.zcontrol.zformat << 2)); Renderer::StorePixelFormat(new_format);
} }
bool GetConfig(const int &type) bool GetConfig(const int &type)