From bedc889a56a4a7e14b9bbb0d525bd0302fc1c469 Mon Sep 17 00:00:00 2001 From: "j4ck.fr0st" Date: Fri, 7 Jan 2011 19:51:28 +0000 Subject: [PATCH] Fix alpha reads (hurray for the ZWW Pictograph quest and Killer 7) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6778 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/VideoCommon/Src/PixelEngine.h | 4 ++-- Source/Plugins/Plugin_VideoDX11/Src/Render.cpp | 2 +- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 2 +- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelEngine.h b/Source/Core/VideoCommon/Src/PixelEngine.h index 84b30a1bb5..9bbf277055 100644 --- a/Source/Core/VideoCommon/Src/PixelEngine.h +++ b/Source/Core/VideoCommon/Src/PixelEngine.h @@ -60,8 +60,8 @@ union UPEAlphaReadReg u16 Hex; struct { - u16 ReadMode : 3; - u16 : 13; + u16 ReadMode : 2; + u16 : 14; }; }; diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index af368790c8..191ff0b75b 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -603,7 +603,7 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) // check what to do with the alpha channel (GX_PokeAlphaRead) PixelEngine::UPEAlphaReadReg alpha_read_mode; - PixelEngine::Read16((u16&)alpha_read_mode, PE_DSTALPHACONF); + PixelEngine::Read16((u16&)alpha_read_mode, PE_ALPHAREAD); if (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24) { diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index bd8f554e2e..f7e633dfd4 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -691,7 +691,7 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) // check what to do with the alpha channel (GX_PokeAlphaRead) PixelEngine::UPEAlphaReadReg alpha_read_mode; - PixelEngine::Read16((u16&)alpha_read_mode, PE_DSTALPHACONF); + PixelEngine::Read16((u16&)alpha_read_mode, PE_ALPHAREAD); if (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24) { ret = RGBA8ToRGBA6ToRGBA8(ret); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 8df0f91692..2448e9a925 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -759,7 +759,7 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) // check what to do with the alpha channel (GX_PokeAlphaRead) PixelEngine::UPEAlphaReadReg alpha_read_mode; - PixelEngine::Read16((u16&)alpha_read_mode, PE_DSTALPHACONF); + PixelEngine::Read16((u16&)alpha_read_mode, PE_ALPHAREAD); if (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24) {