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

* revert Clear Screen's stuff from r6604 

reason : failure! (are needed more testing)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6621 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
gnick79 2010-12-19 22:00:25 +00:00
parent 6492b84ca5
commit 670192e568
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,7 +96,7 @@ void ClearScreen(const BPCmd &bp, const EFBRectangle &rc)
{ {
u32 color = (bpmem.clearcolorAR << 16) | bpmem.clearcolorGB; u32 color = (bpmem.clearcolorAR << 16) | bpmem.clearcolorGB;
u32 z = bpmem.clearZValue; u32 z = bpmem.clearZValue;
/*
// texture formats logic transposition from "EFB Copy to Texture" to "Copy Clear Screen" concepts. // texture formats logic transposition from "EFB Copy to Texture" to "Copy Clear Screen" concepts.
// this it's a deduction without assurance. Ref. (p.12(Nintendo Co., Ltd. US 2010/0073394 A1)) // this it's a deduction without assurance. Ref. (p.12(Nintendo Co., Ltd. US 2010/0073394 A1))
UPE_Copy EFB_copy = bpmem.triggerEFBCopy; UPE_Copy EFB_copy = bpmem.triggerEFBCopy;
@ -106,8 +106,8 @@ void ClearScreen(const BPCmd &bp, const EFBRectangle &rc)
color |= (!EFB_copy.intensity_fmt && z > 0) ? 0xFF000000 : 0x0; color |= (!EFB_copy.intensity_fmt && z > 0) ? 0xFF000000 : 0x0;
else if (EFB_copy.tp_realFormat() == 7) // A8 else if (EFB_copy.tp_realFormat() == 7) // A8
color |= ((!EFB_copy.intensity_fmt && bpmem.zcontrol.pixel_format > 3) || z > 0) ? 0xFF000000 : 0x0; color |= ((!EFB_copy.intensity_fmt && bpmem.zcontrol.pixel_format > 3) || z > 0) ? 0xFF000000 : 0x0;
*/
g_renderer->ClearScreen(rc, colorEnable, zEnable, color, z); g_renderer->ClearScreen(rc, colorEnable, alphaEnable, zEnable, color, z);
} }
} }

2
Source/Core/VideoCommon/Src/RenderBase.h
View File

@ -109,7 +109,7 @@ public:
virtual void RenderText(const char* pstr, int left, int top, u32 color) = 0; virtual void RenderText(const char* pstr, int left, int top, u32 color) = 0;
virtual void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool zEnable, u32 color, u32 z) = 0; virtual void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z) = 0;
static void RenderToXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc); static void RenderToXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc);
virtual u32 AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) = 0; virtual u32 AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) = 0;

2
Source/Plugins/Plugin_VideoDX11/Src/Render.cpp
View File

@ -684,7 +684,7 @@ void Renderer::UpdateViewport()
D3D::context->RSSetViewports(1, &vp); D3D::context->RSSetViewports(1, &vp);
} }
void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool zEnable, u32 color, u32 z) void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z)
{ {
ResetAPIState(); ResetAPIState();

4
Source/Plugins/Plugin_VideoDX11/Src/Render.h
View File

@ -35,8 +35,8 @@ public:
void Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight, const EFBRectangle& rc); void Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight, const EFBRectangle& rc);
void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool zEnable, u32 color, u32 z); void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z);
void UpdateViewport(); void UpdateViewport();
bool SaveScreenshot(const std::string &filename, const TargetRectangle &rc); bool SaveScreenshot(const std::string &filename, const TargetRectangle &rc);

2
Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
View File

@ -785,7 +785,7 @@ void Renderer::UpdateViewport()
D3D::dev->SetViewport(&vp); D3D::dev->SetViewport(&vp);
} }
void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool zEnable, u32 color, u32 z) void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z)
{ {
// Reset rendering pipeline while keeping color masks and depth buffer settings // Reset rendering pipeline while keeping color masks and depth buffer settings
ResetAPIState(); ResetAPIState();

4
Source/Plugins/Plugin_VideoDX9/Src/Render.h
View File

@ -35,8 +35,8 @@ public:
void Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight, const EFBRectangle& rc); void Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight, const EFBRectangle& rc);
void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool zEnable, u32 color, u32 z); void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z);
void UpdateViewport(); void UpdateViewport();
bool SaveScreenshot(const std::string &filename, const TargetRectangle &rc); bool SaveScreenshot(const std::string &filename, const TargetRectangle &rc);

2
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
View File

@ -807,7 +807,7 @@ void Renderer::UpdateViewport()
glDepthRange(GLNear, GLFar); glDepthRange(GLNear, GLFar);
} }
void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool zEnable, u32 color, u32 z) void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z)
{ {
// Update the view port for clearing the picture // Update the view port for clearing the picture
TargetRectangle targetRc = ConvertEFBRectangle(rc); TargetRectangle targetRc = ConvertEFBRectangle(rc);

2
Source/Plugins/Plugin_VideoOGL/Src/Render.h
View File

@ -37,7 +37,7 @@ public:
void Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight, const EFBRectangle& rc); void Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight, const EFBRectangle& rc);
void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool zEnable, u32 color, u32 z); void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z);
void UpdateViewport(); void UpdateViewport();