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

D3D12: Remove unnecessary renderer global references

This commit is contained in:
Lioncash 2016-08-31 14:14:51 -04:00
parent def0b42fb7
commit 9e26ef4aa8
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/VideoBackends/D3D12/Render.cpp
View File

@ -527,7 +527,7 @@ void Renderer::ClearScreen(const EFBRectangle& rc, bool color_enable, bool alpha
FramebufferManager::GetEFBColorTexture()->GetMultisampled()); FramebufferManager::GetEFBColorTexture()->GetMultisampled());
// Restores proper viewport/scissor settings. // Restores proper viewport/scissor settings.
g_renderer->SetViewport(); SetViewport();
BPFunctions::SetScissor(); BPFunctions::SetScissor();
FramebufferManager::InvalidateEFBAccessCopies(); FramebufferManager::InvalidateEFBAccessCopies();
@ -536,9 +536,7 @@ void Renderer::ClearScreen(const EFBRectangle& rc, bool color_enable, bool alpha
void Renderer::ReinterpretPixelData(unsigned int convtype) void Renderer::ReinterpretPixelData(unsigned int convtype)
{ {
// EXISTINGD3D11TODO: MSAA support.. // EXISTINGD3D11TODO: MSAA support..
D3D12_RECT source = D3D12_RECT source = CD3DX12_RECT(0, 0, GetTargetWidth(), GetTargetHeight());
CD3DX12_RECT(0, 0, g_renderer->GetTargetWidth(), g_renderer->GetTargetHeight());
D3D12_SHADER_BYTECODE pixel_shader = {}; D3D12_SHADER_BYTECODE pixel_shader = {};
if (convtype == 0) if (convtype == 0)
@ -556,7 +554,7 @@ void Renderer::ReinterpretPixelData(unsigned int convtype)
return; return;
} }
D3D::SetViewportAndScissor(0, 0, g_renderer->GetTargetWidth(), g_renderer->GetTargetHeight()); D3D::SetViewportAndScissor(0, 0, GetTargetWidth(), GetTargetHeight());
FramebufferManager::GetEFBColorTempTexture()->TransitionToResourceState( FramebufferManager::GetEFBColorTempTexture()->TransitionToResourceState(
D3D::current_command_list, D3D12_RESOURCE_STATE_RENDER_TARGET); D3D::current_command_list, D3D12_RESOURCE_STATE_RENDER_TARGET);
@ -565,8 +563,8 @@ void Renderer::ReinterpretPixelData(unsigned int convtype)
D3D::SetPointCopySampler(); D3D::SetPointCopySampler();
D3D::DrawShadedTexQuad( D3D::DrawShadedTexQuad(
FramebufferManager::GetEFBColorTexture(), &source, g_renderer->GetTargetWidth(), FramebufferManager::GetEFBColorTexture(), &source, GetTargetWidth(), GetTargetHeight(),
g_renderer->GetTargetHeight(), pixel_shader, StaticShaderCache::GetSimpleVertexShader(), pixel_shader, StaticShaderCache::GetSimpleVertexShader(),
StaticShaderCache::GetSimpleVertexShaderInputLayout(), StaticShaderCache::GetSimpleVertexShaderInputLayout(),
StaticShaderCache::GetCopyGeometryShader(), 1.0f, 0, DXGI_FORMAT_R8G8B8A8_UNORM, false, StaticShaderCache::GetCopyGeometryShader(), 1.0f, 0, DXGI_FORMAT_R8G8B8A8_UNORM, false,
FramebufferManager::GetEFBColorTempTexture()->GetMultisampled()); FramebufferManager::GetEFBColorTempTexture()->GetMultisampled());