From 484b94c3f3245a3408a3b58600b4f75c274e1c5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 12 Jun 2026 17:28:52 +0200 Subject: [PATCH] Build and warning fixes --- Core/CoreTiming.cpp | 2 +- GPU/Common/PostShader.cpp | 1 - GPU/Common/SoftwareTransformCommon.cpp | 2 ++ GPU/Common/TextureCacheCommon.cpp | 4 ++-- GPU/GLES/TextureCacheGLES.h | 2 -- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Core/CoreTiming.cpp b/Core/CoreTiming.cpp index 0431cb2736..abf0ce8b2e 100644 --- a/Core/CoreTiming.cpp +++ b/Core/CoreTiming.cpp @@ -56,7 +56,7 @@ static Event *eventPool = 0; // as we can already reach that structure through a register. int slicelength; -static alignas(16) s64 globalTimer; +alignas(16) static s64 globalTimer; static s64 idledCycles; static s64 lastGlobalTimeTicks; static s64 lastGlobalTimeUs; diff --git a/GPU/Common/PostShader.cpp b/GPU/Common/PostShader.cpp index 0e6ca85419..2768cd211d 100644 --- a/GPU/Common/PostShader.cpp +++ b/GPU/Common/PostShader.cpp @@ -38,7 +38,6 @@ static std::vector shaderInfo; static std::vector textureShaderInfo; static Draw::GPUVendor VendorFromString(const std::string &vendor) { - Draw::GPUVendor::VENDOR_UNKNOWN; // TODO: This should probably be a function somewhere. if (vendor == "ARM") { return Draw::GPUVendor::VENDOR_ARM; diff --git a/GPU/Common/SoftwareTransformCommon.cpp b/GPU/Common/SoftwareTransformCommon.cpp index a27d3296bc..29288cc311 100644 --- a/GPU/Common/SoftwareTransformCommon.cpp +++ b/GPU/Common/SoftwareTransformCommon.cpp @@ -1669,6 +1669,8 @@ bool GetCurrentDrawAsDebugVertices(DrawEngineCommon *drawEngine, GECommand cmd, case GE_PRIM_TRIANGLE_STRIP: prim = GE_PRIM_TRIANGLES; break; + default: + break; } int generatedIndices = indexGen.VertexCount(); diff --git a/GPU/Common/TextureCacheCommon.cpp b/GPU/Common/TextureCacheCommon.cpp index bfe869bcb2..dfbbf55813 100644 --- a/GPU/Common/TextureCacheCommon.cpp +++ b/GPU/Common/TextureCacheCommon.cpp @@ -873,7 +873,7 @@ void TextureCacheCommon::Decimate(TexCacheEntry *exceptThisOne, bool forcePressu } } - VERBOSE_LOG(Log::G3D, "Decimated texture cache, saved %d estimated bytes - now %d bytes", had - cacheSizeEstimate, cacheSizeEstimate); + VERBOSE_LOG(Log::G3D, "Decimated texture cache, saved %d estimated bytes - now %d bytes", (int)(had - cacheSizeEstimate), (int)cacheSizeEstimate); } s64 secondCacheSizeEstimate = SecondCacheSizeEstimate(); @@ -896,7 +896,7 @@ void TextureCacheCommon::Decimate(TexCacheEntry *exceptThisOne, bool forcePressu } } - VERBOSE_LOG(Log::G3D, "Decimated second texture cache, saved %d estimated bytes - now %d bytes", had - secondCacheSizeEstimate, secondCacheSizeEstimate); + VERBOSE_LOG(Log::G3D, "Decimated second texture cache, saved %d estimated bytes - now %d bytes", (int)(had - secondCacheSizeEstimate), (int)secondCacheSizeEstimate); } // Decimate known videos. diff --git a/GPU/GLES/TextureCacheGLES.h b/GPU/GLES/TextureCacheGLES.h index 6cdbf61894..e9e2d6724a 100644 --- a/GPU/GLES/TextureCacheGLES.h +++ b/GPU/GLES/TextureCacheGLES.h @@ -77,5 +77,3 @@ private: enum { INVALID_TEX = -1 }; }; - -static Draw::DataFormat getClutDestFormat(GEPaletteFormat format);