From 2168188cb8c5df3153ce5542aa6553768404a992 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Tue, 13 Dec 2022 18:24:59 -0800 Subject: [PATCH 1/2] Config: Remove unused values. --- Core/Config.cpp | 4 ---- Core/ConfigValues.h | 7 ------- 2 files changed, 11 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 795763c9ab..1e059016de 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -666,10 +666,6 @@ static int DefaultFastForwardMode() { #endif } -static int DefaultZoomType() { - return (int)SmallDisplayZoom::AUTO; -} - static int DefaultAndroidHwScale() { #ifdef __ANDROID__ if (System_GetPropertyInt(SYSPROP_SYSTEMVERSION) >= 19 || System_GetPropertyInt(SYSPROP_DEVICE_TYPE) == DEVICE_TYPE_TV) { diff --git a/Core/ConfigValues.h b/Core/ConfigValues.h index 9018653aab..f8e88be931 100644 --- a/Core/ConfigValues.h +++ b/Core/ConfigValues.h @@ -105,13 +105,6 @@ enum IOTimingMethods { IOTIMING_REALISTIC = 2, }; -enum class SmallDisplayZoom { - STRETCH = 0, - PARTIAL_STRETCH = 1, - AUTO = 2, - MANUAL = 3, -}; - enum class AutoLoadSaveState { OFF = 0, OLDEST = 1, From 8c1a247b7b351b28dbdb99cd10082a308ba0efaf Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Tue, 13 Dec 2022 18:29:23 -0800 Subject: [PATCH 2/2] Vulkan: Cleanup some logspam. --- Common/GPU/Vulkan/VulkanRenderManager.cpp | 2 +- GPU/Vulkan/GPU_Vulkan.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Common/GPU/Vulkan/VulkanRenderManager.cpp b/Common/GPU/Vulkan/VulkanRenderManager.cpp index 25edb75682..1d3e9f93da 100644 --- a/Common/GPU/Vulkan/VulkanRenderManager.cpp +++ b/Common/GPU/Vulkan/VulkanRenderManager.cpp @@ -107,7 +107,7 @@ bool VKRGraphicsPipeline::Create(VulkanContext *vulkan, VkRenderPass compatibleR double taken_ms = (time_now_d() - start) * 1000.0; if (taken_ms < 0.1) { - INFO_LOG(G3D, "Pipeline creation time: %0.2f ms (fast) rpType: %08x sampleBits: %d\n(%s)", taken_ms, (u32)rpType, (u32)sampleCount, tag_.c_str()); + DEBUG_LOG(G3D, "Pipeline creation time: %0.2f ms (fast) rpType: %08x sampleBits: %d\n(%s)", taken_ms, (u32)rpType, (u32)sampleCount, tag_.c_str()); } else { INFO_LOG(G3D, "Pipeline creation time: %0.2f ms rpType: %08x sampleBits: %d\n(%s)", taken_ms, (u32)rpType, (u32)sampleCount, tag_.c_str()); } diff --git a/GPU/Vulkan/GPU_Vulkan.cpp b/GPU/Vulkan/GPU_Vulkan.cpp index 16e4b32cd8..c7b74d71c8 100644 --- a/GPU/Vulkan/GPU_Vulkan.cpp +++ b/GPU/Vulkan/GPU_Vulkan.cpp @@ -121,7 +121,7 @@ void GPU_Vulkan::CancelReady() { void GPU_Vulkan::LoadCache(const Path &filename) { if (!g_Config.bShaderCache) { - WARN_LOG(G3D, "!!!! Shader cache disabled. Not loading."); + WARN_LOG(G3D, "Shader cache disabled. Not loading."); return; }