diff options
| author | Jules Blok <jules.blok@gmail.com> | 2016-09-01 03:20:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-01 03:20:31 +0200 |
| commit | 2ab9e5e6104d93d21582c2632f22f8e10327f6ce (patch) | |
| tree | 356cc023787169ed602a6abc4983f99733c0019b /Source/Core/VideoBackends/D3D/Render.cpp | |
| parent | 9a660fdf1847a276eb90aae8806a6245a51f0ac2 (diff) | |
| parent | ec7114a658de95f6f4cea23820d32a347d16cc6d (diff) | |
Merge pull request #4165 from lioncash/global
Backends: Remove unnecessary references to the renderer global
Diffstat (limited to 'Source/Core/VideoBackends/D3D/Render.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/Render.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp index 57e481cde4..d82017d3bf 100644 --- a/Source/Core/VideoBackends/D3D/Render.cpp +++ b/Source/Core/VideoBackends/D3D/Render.cpp @@ -628,8 +628,7 @@ void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaE void Renderer::ReinterpretPixelData(unsigned int convtype) { // TODO: MSAA support.. - D3D11_RECT source = - CD3D11_RECT(0, 0, g_renderer->GetTargetWidth(), g_renderer->GetTargetHeight()); + D3D11_RECT source = CD3D11_RECT(0, 0, GetTargetWidth(), GetTargetHeight()); ID3D11PixelShader* pixel_shader; if (convtype == 0) @@ -644,21 +643,21 @@ void Renderer::ReinterpretPixelData(unsigned int convtype) } // convert data and set the target texture as our new EFB - g_renderer->ResetAPIState(); + ResetAPIState(); - D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, (float)g_renderer->GetTargetWidth(), - (float)g_renderer->GetTargetHeight()); + D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, static_cast<float>(GetTargetWidth()), + static_cast<float>(GetTargetHeight())); D3D::context->RSSetViewports(1, &vp); D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTempTexture()->GetRTV(), nullptr); D3D::SetPointCopySampler(); D3D::drawShadedTexQuad( - FramebufferManager::GetEFBColorTexture()->GetSRV(), &source, g_renderer->GetTargetWidth(), - g_renderer->GetTargetHeight(), pixel_shader, VertexShaderCache::GetSimpleVertexShader(), + FramebufferManager::GetEFBColorTexture()->GetSRV(), &source, GetTargetWidth(), + GetTargetHeight(), pixel_shader, VertexShaderCache::GetSimpleVertexShader(), VertexShaderCache::GetSimpleInputLayout(), GeometryShaderCache::GetCopyGeometryShader()); - g_renderer->RestoreAPIState(); + RestoreAPIState(); FramebufferManager::SwapReinterpretTexture(); D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTexture()->GetRTV(), |