diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-03-26 00:08:58 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-03-26 00:08:58 +0100 |
| commit | b4337a21928745bef151c8ab665138f7a435f198 (patch) | |
| tree | f3792e8f08d1c847059a2354db188a8d62fdd2df /Source/Core/VideoBackends/D3D/Render.cpp | |
| parent | 6351f28ab41172d7b07626da737d691ce88c9285 (diff) | |
| parent | 16105db7092707bc130a345ed1e630e2ef1f7747 (diff) | |
Merge pull request #204 from neobrain/bitfield_cleanup
Bitfield cleanup
Diffstat (limited to 'Source/Core/VideoBackends/D3D/Render.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/Render.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp index 6ed8ae82bc..f890726e35 100644 --- a/Source/Core/VideoBackends/D3D/Render.cpp +++ b/Source/Core/VideoBackends/D3D/Render.cpp @@ -315,7 +315,7 @@ void Renderer::SetColorMask() UINT8 color_mask = 0; if (bpmem.alpha_test.TestResult() != AlphaTest::FAIL) { - if (bpmem.blendmode.alphaupdate && (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24)) + if (bpmem.blendmode.alphaupdate && (bpmem.zcontrol.pixel_format == PEControl::RGBA6_Z24)) color_mask = D3D11_COLOR_WRITE_ENABLE_ALPHA; if (bpmem.blendmode.colorupdate) color_mask |= D3D11_COLOR_WRITE_ENABLE_RED | D3D11_COLOR_WRITE_ENABLE_GREEN | D3D11_COLOR_WRITE_ENABLE_BLUE; @@ -409,7 +409,7 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) float val = *(float*)map.pData; u32 ret = 0; - if (bpmem.zcontrol.pixel_format == PIXELFMT_RGB565_Z16) + if (bpmem.zcontrol.pixel_format == PEControl::RGB565_Z16) { // if Z is in 16 bit format you must return a 16 bit integer ret = ((u32)(val * 0xffff)); @@ -440,15 +440,15 @@ 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::GetAlphaReadMode(); - if (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24) + if (bpmem.zcontrol.pixel_format == PEControl::RGBA6_Z24) { ret = RGBA8ToRGBA6ToRGBA8(ret); } - else if (bpmem.zcontrol.pixel_format == PIXELFMT_RGB565_Z16) + else if (bpmem.zcontrol.pixel_format == PEControl::RGB565_Z16) { ret = RGBA8ToRGB565ToRGBA8(ret); } - if (bpmem.zcontrol.pixel_format != PIXELFMT_RGBA6_Z24) + if (bpmem.zcontrol.pixel_format != PEControl::RGBA6_Z24) { ret |= 0xFF000000; } @@ -634,7 +634,7 @@ void Renderer::SetBlendMode(bool forceUpdate) { // Our render target always uses an alpha channel, so we need to override the blend functions to assume a destination alpha of 1 if the render target isn't supposed to have an alpha channel // Example: D3DBLEND_DESTALPHA needs to be D3DBLEND_ONE since the result without an alpha channel is assumed to always be 1. - bool target_has_alpha = bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24; + bool target_has_alpha = bpmem.zcontrol.pixel_format == PEControl::RGBA6_Z24; const D3D11_BLEND d3dSrcFactors[8] = { D3D11_BLEND_ZERO, |
