diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-03-10 23:40:16 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-03-10 23:40:16 +0100 |
| commit | ede46556d9b5043113e19359fee97eb09f9c872c (patch) | |
| tree | 54442e504fc06d44e80a7351be46a1fead5ad356 /Source/Core/VideoBackends/D3D/Render.cpp | |
| parent | 52ed10213d085caec6007ae3b3856e50f282c756 (diff) | |
| parent | 31cfc73a09a8685cbab20502b4bc132e98e2feb5 (diff) | |
Merge pull request #155 from Parlane/codestyle_fixes
Fixes spacing for "for", "while", "switch" and "if"
Diffstat (limited to 'Source/Core/VideoBackends/D3D/Render.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/Render.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp index 3b987fe7f7..885471aca6 100644 --- a/Source/Core/VideoBackends/D3D/Render.cpp +++ b/Source/Core/VideoBackends/D3D/Render.cpp @@ -233,7 +233,7 @@ Renderer::Renderer() 0.f, 1 << g_ActiveConfig.iMaxAnisotropy, D3D11_COMPARISON_ALWAYS, border, -D3D11_FLOAT32_MAX, D3D11_FLOAT32_MAX); - if(g_ActiveConfig.iMaxAnisotropy != 0) gx_state.sampdc[k].Filter = D3D11_FILTER_ANISOTROPIC; + if (g_ActiveConfig.iMaxAnisotropy != 0) gx_state.sampdc[k].Filter = D3D11_FILTER_ANISOTROPIC; } // Clear EFB textures @@ -362,7 +362,7 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) // Take the mean of the resulting dimensions; TODO: Don't use the center pixel, compute the average color instead D3D11_RECT RectToLock; - if(type == PEEK_COLOR || type == PEEK_Z) + if (type == PEEK_COLOR || type == PEEK_Z) { RectToLock.left = (targetPixelRc.left + targetPixelRc.right) / 2; RectToLock.top = (targetPixelRc.top + targetPixelRc.bottom) / 2; @@ -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 == PIXELFMT_RGB565_Z16) { // if Z is in 16 bit format you must return a 16 bit integer ret = ((u32)(val * 0xffff)); @@ -433,7 +433,7 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) // read the data from system memory D3D::context->Map(read_tex, 0, D3D11_MAP_READ, 0, &map); u32 ret = 0; - if(map.pData) + if (map.pData) ret = *(u32*)map.pData; D3D::context->Unmap(read_tex, 0); @@ -448,13 +448,13 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) { ret = RGBA8ToRGB565ToRGBA8(ret); } - if(bpmem.zcontrol.pixel_format != PIXELFMT_RGBA6_Z24) + if (bpmem.zcontrol.pixel_format != PIXELFMT_RGBA6_Z24) { ret |= 0xFF000000; } - if(alpha_read_mode.ReadMode == 2) return ret; // GX_READ_NONE - else if(alpha_read_mode.ReadMode == 1) return (ret | 0xFF000000); // GX_READ_FF + if (alpha_read_mode.ReadMode == 2) return ret; // GX_READ_NONE + else if (alpha_read_mode.ReadMode == 1) return (ret | 0xFF000000); // GX_READ_FF else /*if(alpha_read_mode.ReadMode == 0)*/ return (ret & 0x00FFFFFF); // GX_READ_00 } else //if(type == POKE_COLOR) @@ -784,7 +784,7 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbHeight,const EFBRectangl s_television.Submit(xfbAddr, fbWidth, fbHeight); s_television.Render(); } - else if(g_ActiveConfig.bUseXFB) + else if (g_ActiveConfig.bUseXFB) { const XFBSourceBase* xfbSource; @@ -1084,7 +1084,7 @@ void Renderer::ApplyState(bool bUseDstAlpha) // TODO: unnecessary state changes, we should store a list of shader resources //if (shader_resources[stage]) { - if(g_ActiveConfig.iMaxAnisotropy > 0) gx_state.sampdc[stage].Filter = D3D11_FILTER_ANISOTROPIC; + if (g_ActiveConfig.iMaxAnisotropy > 0) gx_state.sampdc[stage].Filter = D3D11_FILTER_ANISOTROPIC; hr = D3D::device->CreateSamplerState(&gx_state.sampdc[stage], &samplerstate[stage]); if (FAILED(hr)) PanicAlert("Fail %s %d, stage=%d\n", __FILE__, __LINE__, stage); else D3D::SetDebugObjectName((ID3D11DeviceChild*)samplerstate[stage], "sampler state used to emulate the GX pipeline"); |
