From f7587eaeacf47bea457a4dc77ea1e81728bf394b Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Fri, 25 Jun 2021 13:20:36 +1000 Subject: [PATCH] GPU/HW: Fix incorrect range for shader compiling progress --- src/core/gpu_hw_d3d11.cpp | 2 -- src/core/gpu_hw_opengl.cpp | 2 +- src/core/gpu_hw_vulkan.cpp | 4 +--- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/core/gpu_hw_d3d11.cpp b/src/core/gpu_hw_d3d11.cpp index 09ba7e78b..e8fb14203 100644 --- a/src/core/gpu_hw_d3d11.cpp +++ b/src/core/gpu_hw_d3d11.cpp @@ -655,8 +655,6 @@ bool GPU_HW_D3D11::CompileShaders() } } - UPDATE_PROGRESS(); - if (m_downsample_mode == GPUDownsampleMode::Adaptive) { m_downsample_first_pass_pixel_shader = diff --git a/src/core/gpu_hw_opengl.cpp b/src/core/gpu_hw_opengl.cpp index f0078bafd..71e045cf1 100644 --- a/src/core/gpu_hw_opengl.cpp +++ b/src/core/gpu_hw_opengl.cpp @@ -518,7 +518,7 @@ bool GPU_HW_OpenGL::CompilePrograms() m_pgxp_depth_buffer, m_supports_dual_source_blend); Common::Timer compile_time; - const int progress_total = (4 * 9 * 2 * 2) + (2 * 3) + 6; + const int progress_total = (4 * 9 * 2 * 2) + (2 * 3) + 1 + 1 + 1 + 1 + 1 + 1; int progress_value = 0; #define UPDATE_PROGRESS() \ do \ diff --git a/src/core/gpu_hw_vulkan.cpp b/src/core/gpu_hw_vulkan.cpp index 7896a5cce..ca004eb0b 100644 --- a/src/core/gpu_hw_vulkan.cpp +++ b/src/core/gpu_hw_vulkan.cpp @@ -840,7 +840,7 @@ bool GPU_HW_Vulkan::CompilePipelines() m_pgxp_depth_buffer, m_supports_dual_source_blend); Common::Timer compile_time; - const int progress_total = 2 + (4 * 9 * 2 * 2) + (2 * 4 * 5 * 9 * 2 * 2) + 1 + 2 + 2 + 2 + 2 + (2 * 3) + 1; + const int progress_total = 2 + (4 * 9 * 2 * 2) + (3 * 4 * 5 * 9 * 2 * 2) + 1 + 2 + 2 + 2 + 1 + 1 + (2 * 3) + 1; int progress_value = 0; #define UPDATE_PROGRESS() \ do \ @@ -1176,8 +1176,6 @@ bool GPU_HW_Vulkan::CompilePipelines() } } - UPDATE_PROGRESS(); - if (m_downsample_mode == GPUDownsampleMode::Adaptive) { gpbuilder.Clear();