diff --git a/Core/HLE/HLE.cpp b/Core/HLE/HLE.cpp index 16e41f50a5..a4a448f574 100644 --- a/Core/HLE/HLE.cpp +++ b/Core/HLE/HLE.cpp @@ -405,7 +405,7 @@ inline void hleFinishSyscall(const HLEFunction &info) hleAfterSyscallReschedReason = 0; } -inline void updateSyscallStats(int modulenum, int funcnum, double total) +static void updateSyscallStats(int modulenum, int funcnum, double total) { const char *name = moduleDB[modulenum].funcTable[funcnum].name; // Ignore this one, especially for msInSyscalls (although that ignores CoreTiming events.) diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp index e853328dbe..2de22bfaa4 100644 --- a/Core/HLE/sceDisplay.cpp +++ b/Core/HLE/sceDisplay.cpp @@ -417,7 +417,7 @@ static void CalculateFPS() { } } -void __DisplayGetDebugStats(char stats[], size_t bufsize) { +void __DisplayGetDebugStats(char *stats, size_t bufsize) { gpu->UpdateStats(); float vertexAverageCycles = gpuStats.numVertsSubmitted > 0 ? (float)gpuStats.vertexGPUCycles / (float)gpuStats.numVertsSubmitted : 0.0f; @@ -431,17 +431,13 @@ void __DisplayGetDebugStats(char stats[], size_t bufsize) { "Draw calls: %i, flushes %i\n" "Cached Draw calls: %i\n" "Num Tracked Vertex Arrays: %i\n" - "Cycles executed: %d (%f per vertex)\n" + "GPU cycles executed: %d (%f per vertex)\n" "Commands per call level: %i %i %i %i\n" - "Vertices Submitted: %i\n" - "Cached Vertices Drawn: %i\n" - "Uncached Vertices Drawn: %i\n" + "Vertices submitted: %i\n" + "Cached, Uncached Vertices Drawn: %i, %i\n" "FBOs active: %i\n" - "Textures active: %i, decoded: %i\n" - "Texture invalidations: %i\n" - "Vertex shaders loaded: %i\n" - "Fragment shaders loaded: %i\n" - "Combined shaders loaded: %i\n" + "Textures active: %i, decoded: %i invalidated: %i\n" + "Vertex, Fragment, Combined shaders loaded: %i, %i, %i\n" "Pushbuffer space used: UBO %d, Vtx %d, Idx %d\n", gpuStats.numVBlanks, gpuStats.msProcessingDisplayLists * 1000.0f, diff --git a/GPU/GPUState.cpp b/GPU/GPUState.cpp index 0b55acd18e..ce0606d550 100644 --- a/GPU/GPUState.cpp +++ b/GPU/GPUState.cpp @@ -185,8 +185,7 @@ bool vertTypeIsSkinningEnabled(u32 vertType) { return ((vertType & GE_VTYPE_WEIGHT_MASK) != GE_VTYPE_WEIGHT_NONE); } -struct GPUStateCache_v0 -{ +struct GPUStateCache_v0 { u32 vertexAddr; u32 indexAddr; diff --git a/GPU/Vulkan/FramebufferVulkan.cpp b/GPU/Vulkan/FramebufferVulkan.cpp index 17d8b29c0b..f10e9c5613 100644 --- a/GPU/Vulkan/FramebufferVulkan.cpp +++ b/GPU/Vulkan/FramebufferVulkan.cpp @@ -141,8 +141,6 @@ FramebufferManagerVulkan::FramebufferManagerVulkan(VulkanContext *vulkan) : subpass.pPreserveAttachments = NULL; VkRenderPassCreateInfo rp = { VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO }; - rp.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO; - rp.pNext = NULL; rp.attachmentCount = 2; rp.pAttachments = attachments; rp.subpassCount = 1;