From aff44684a4b904974b2d01ba604976f4baac000e Mon Sep 17 00:00:00 2001 From: Stenzek Date: Thu, 20 Jul 2017 15:25:33 +1000 Subject: Vulkan: Move shader/pipeline-related methods to ShaderCache --- Source/Core/VideoBackends/Vulkan/Renderer.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Source/Core/VideoBackends/Vulkan/Renderer.cpp') diff --git a/Source/Core/VideoBackends/Vulkan/Renderer.cpp b/Source/Core/VideoBackends/Vulkan/Renderer.cpp index 599792d493..4e72d94a61 100644 --- a/Source/Core/VideoBackends/Vulkan/Renderer.cpp +++ b/Source/Core/VideoBackends/Vulkan/Renderer.cpp @@ -462,8 +462,8 @@ void Renderer::ClearScreen(const EFBRectangle& rc, bool color_enable, bool alpha UtilityShaderDraw draw(g_command_buffer_mgr->GetCurrentCommandBuffer(), g_object_cache->GetPipelineLayout(PIPELINE_LAYOUT_STANDARD), FramebufferManager::GetInstance()->GetEFBLoadRenderPass(), - g_object_cache->GetPassthroughVertexShader(), - g_object_cache->GetPassthroughGeometryShader(), m_clear_fragment_shader); + g_shader_cache->GetPassthroughVertexShader(), + g_shader_cache->GetPassthroughGeometryShader(), m_clear_fragment_shader); draw.SetRasterizationState(rs_state); draw.SetDepthStencilState(depth_state); @@ -1168,8 +1168,8 @@ void Renderer::CheckForConfigChanges() BindEFBToStateTracker(); RecompileShaders(); FramebufferManager::GetInstance()->RecompileShaders(); - g_object_cache->ReloadShaderAndPipelineCaches(); - g_object_cache->RecompileSharedShaders(); + g_shader_cache->ReloadShaderAndPipelineCaches(); + g_shader_cache->RecompileSharedShaders(); StateTracker::GetInstance()->InvalidateShaderPointers(); StateTracker::GetInstance()->ReloadPipelineUIDCache(); } @@ -1500,7 +1500,7 @@ bool Renderer::CompileShaders() )"; - std::string source = g_object_cache->GetUtilityShaderHeader() + CLEAR_FRAGMENT_SHADER_SOURCE; + std::string source = g_shader_cache->GetUtilityShaderHeader() + CLEAR_FRAGMENT_SHADER_SOURCE; m_clear_fragment_shader = Util::CompileAndCreateFragmentShader(source); return m_clear_fragment_shader != VK_NULL_HANDLE; -- cgit v1.2.3