From e3ec07c3add6c22b1978e2aa1ee32c87d9142f56 Mon Sep 17 00:00:00 2001 From: bitscher Date: Sat, 3 Sep 2022 17:46:09 -0700 Subject: [PATCH] Removed volatile keywords on PerformanceMonitor Fixes /root/cemu/src/Cafe/HW/Latte/Core/LatteCommandProcessor.cpp:619:73: warning: increment of object of volatile-qualified type 'volatile uint32' (aka 'volatile unsigned int') is deprecated [-Wdeprecated-volatile] performanceMonitor.cycle[performanceMonitor.cycleIndex].drawCallCounter++; /root/cemu/src/Cafe/HW/Latte/Core/LatteRenderTarget.cpp:703:70: warning: increment of object of volatile-qualified type 'volatile uint32' (aka 'volatile unsigned int') is deprecated [-Wdeprecated-volatile] performanceMonitor.cycle[performanceMonitor.cycleIndex].frameCounter++; /root/cemu/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRendererCore.cpp:338:77: warning: compound assignment to object of volatile-qualified type 'volatile uint64' (aka 'volatile unsigned long') is deprecated [-Wdeprecated-volatile] performanceMonitor.cycle[performanceMonitor.cycleIndex].indexDataUploaded += (count * sizeof(uint16)); --- .../HW/Latte/Core/LattePerformanceMonitor.h | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Cafe/HW/Latte/Core/LattePerformanceMonitor.h b/src/Cafe/HW/Latte/Core/LattePerformanceMonitor.h index 6cd07ee2..77554e80 100644 --- a/src/Cafe/HW/Latte/Core/LattePerformanceMonitor.h +++ b/src/Cafe/HW/Latte/Core/LattePerformanceMonitor.h @@ -76,23 +76,23 @@ typedef struct struct { // CPU - volatile uint64 lastCycleCount; - volatile uint64 skippedCycles; - volatile uint32 recompilerLeaveCount; // increased everytime the recompiler switches back to interpreter - volatile uint32 threadLeaveCount; // increased everytime a thread gives up it's timeslice + uint64 lastCycleCount; + uint64 skippedCycles; + uint32 recompilerLeaveCount; // increased everytime the recompiler switches back to interpreter + uint32 threadLeaveCount; // increased everytime a thread gives up it's timeslice // GPU - volatile uint32 lastUpdate; - volatile uint32 frameCounter; - volatile uint32 drawCallCounter; - volatile uint32 shaderBindCount; - volatile uint64 vertexDataUploaded; // amount of vertex data uploaded to GPU (bytes) - volatile uint64 vertexDataCached; // amount of vertex data reused from GPU cache (bytes) - volatile uint64 uniformBankUploadedData; // amount of uniform buffer data (excluding remapped uniforms) uploaded to GPU - volatile uint64 uniformBankUploadedCount; // number of separate uploads for uniformBankDataUploaded - volatile uint64 indexDataUploaded; - volatile uint64 indexDataCached; + uint32 lastUpdate; + uint32 frameCounter; + uint32 drawCallCounter; + uint32 shaderBindCount; + uint64 vertexDataUploaded; // amount of vertex data uploaded to GPU (bytes) + uint64 vertexDataCached; // amount of vertex data reused from GPU cache (bytes) + uint64 uniformBankUploadedData; // amount of uniform buffer data (excluding remapped uniforms) uploaded to GPU + uint64 uniformBankUploadedCount; // number of separate uploads for uniformBankDataUploaded + uint64 indexDataUploaded; + uint64 indexDataCached; }cycle[PERFORMANCE_MONITOR_TRACK_CYCLES]; - volatile sint32 cycleIndex; + sint32 cycleIndex; // new stats LattePerfStatTimer gpuTime_frameTime; LattePerfStatTimer gpuTime_shaderCreate;