diff --git a/src/Cafe/HW/Latte/Renderer/Metal/LatteTextureMtl.cpp b/src/Cafe/HW/Latte/Renderer/Metal/LatteTextureMtl.cpp index c6a5012b..f1497d30 100644 --- a/src/Cafe/HW/Latte/Renderer/Metal/LatteTextureMtl.cpp +++ b/src/Cafe/HW/Latte/Renderer/Metal/LatteTextureMtl.cpp @@ -105,5 +105,5 @@ LatteTextureView* LatteTextureMtl::CreateView(Latte::E_DIM dim, Latte::E_GX2SURF void LatteTextureMtl::AllocateOnHost() { - cemuLog_log(LogType::MetalLogging, "not implemented"); + cemuLog_log(LogType::Force, "not implemented"); } diff --git a/src/Cafe/HW/Latte/Renderer/Metal/LatteToMtl.cpp b/src/Cafe/HW/Latte/Renderer/Metal/LatteToMtl.cpp index 24961434..436a421b 100644 --- a/src/Cafe/HW/Latte/Renderer/Metal/LatteToMtl.cpp +++ b/src/Cafe/HW/Latte/Renderer/Metal/LatteToMtl.cpp @@ -255,7 +255,7 @@ MTL::PrimitiveType GetMtlPrimitiveType(LattePrimitiveMode primitiveMode) case Latte::LATTE_VGT_PRIMITIVE_TYPE::E_PRIMITIVE_TYPE::RECTS: return MTL::PrimitiveTypeTriangle; // rects are emulated as 2 triangles default: - cemuLog_logDebug(LogType::Force, "Metal-Unsupported: Render pipeline with primitive mode {} created", primitiveMode); + cemuLog_log(LogType::Force, "Unsupported primitive mode {}", primitiveMode); cemu_assert_debug(false); return MTL::PrimitiveTypeTriangle; } diff --git a/src/Cafe/HW/Latte/Renderer/Metal/MetalMemoryManager.cpp b/src/Cafe/HW/Latte/Renderer/Metal/MetalMemoryManager.cpp index 01cee8b9..8b9ac89f 100644 --- a/src/Cafe/HW/Latte/Renderer/Metal/MetalMemoryManager.cpp +++ b/src/Cafe/HW/Latte/Renderer/Metal/MetalMemoryManager.cpp @@ -46,13 +46,13 @@ void MetalMemoryManager::InitBufferCache(size_t size) m_bufferCache = m_mtlr->GetDevice()->newBuffer(memory_getPointerFromVirtualOffset(m_importedMemBaseAddress), m_hostAllocationSize, MTL::ResourceStorageModeShared, nullptr); if (!m_bufferCache) { - cemuLog_logDebug(LogType::Force, "Failed to import host memory as a buffer, using device shared mode instead"); + cemuLog_log(LogType::Force, "Failed to import host memory as a buffer, using device shared mode instead"); m_bufferCacheMode = BufferCacheMode::DeviceShared; } } else { - cemuLog_logDebug(LogType::Force, "Host buffer cache mode is only available on unified memory systems, using device shared mode instead"); + cemuLog_log(LogType::Force, "Host buffer cache mode is only available on unified memory systems, using device shared mode instead"); m_bufferCacheMode = BufferCacheMode::DeviceShared; } } diff --git a/src/Cafe/HW/Latte/Renderer/Metal/MetalRenderer.cpp b/src/Cafe/HW/Latte/Renderer/Metal/MetalRenderer.cpp index 380a3f71..967e2266 100644 --- a/src/Cafe/HW/Latte/Renderer/Metal/MetalRenderer.cpp +++ b/src/Cafe/HW/Latte/Renderer/Metal/MetalRenderer.cpp @@ -245,6 +245,10 @@ void MetalRenderer::SwapBuffers(bool swapTV, bool swapDRC) m_performanceMonitor.ResetPerFrameData(); } +void MetalRenderer::HandleScreenshotRequest(LatteTextureView* texView, bool padView) { + cemuLog_log(LogType::Force, "Screenshots are not yet supported on Metal"); +} + void MetalRenderer::DrawBackbufferQuad(LatteTextureView* texView, RendererOutputShader* shader, bool useLinearTexFilter, sint32 imageX, sint32 imageY, sint32 imageWidth, sint32 imageHeight, bool padView, bool clearBackground) diff --git a/src/Cafe/HW/Latte/Renderer/Metal/MetalRenderer.h b/src/Cafe/HW/Latte/Renderer/Metal/MetalRenderer.h index 3ffdaa9e..16235611 100644 --- a/src/Cafe/HW/Latte/Renderer/Metal/MetalRenderer.h +++ b/src/Cafe/HW/Latte/Renderer/Metal/MetalRenderer.h @@ -186,9 +186,7 @@ public: void DrawEmptyFrame(bool mainWindow) override; void SwapBuffers(bool swapTV, bool swapDRC) override; - void HandleScreenshotRequest(LatteTextureView* texView, bool padView) override { - cemuLog_log(LogType::MetalLogging, "Screenshots are not yet supported on Metal"); - } + void HandleScreenshotRequest(LatteTextureView* texView, bool padView) override; void DrawBackbufferQuad(LatteTextureView* texView, RendererOutputShader* shader, bool useLinearTexFilter, sint32 imageX, sint32 imageY, sint32 imageWidth, sint32 imageHeight, diff --git a/src/Cemu/Logging/CemuLogging.cpp b/src/Cemu/Logging/CemuLogging.cpp index 6b77b226..d7e3bc3e 100644 --- a/src/Cemu/Logging/CemuLogging.cpp +++ b/src/Cemu/Logging/CemuLogging.cpp @@ -59,7 +59,6 @@ const std::map g_logging_window_mapping {LogType::TextureReadback, "Texture readback"}, {LogType::OpenGLLogging, "OpenGL debug output"}, {LogType::VulkanValidation, "Vulkan validation layer"}, - {LogType::MetalLogging, "Metal debug output"}, }; bool cemuLog_advancedPPCLoggingEnabled() diff --git a/src/Cemu/Logging/CemuLogging.h b/src/Cemu/Logging/CemuLogging.h index 337bfa91..fae134b4 100644 --- a/src/Cemu/Logging/CemuLogging.h +++ b/src/Cemu/Logging/CemuLogging.h @@ -20,7 +20,6 @@ enum class LogType : sint32 OpenGLLogging = 10, // OpenGL debug logging TextureCache = 11, // texture cache warnings and info VulkanValidation = 12, // Vulkan validation layer - MetalLogging = 13, // Metal debug logging Patches = 14, CoreinitMem = 8, // coreinit memory functions CoreinitMP = 15, diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 2e44a4c7..b5452aa8 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -2232,7 +2232,6 @@ void MainWindow::RecreateMenu() debugLoggingMenu->AppendSeparator(); debugLoggingMenu->AppendCheckItem(MAINFRAME_MENU_ID_DEBUG_LOGGING0 + stdx::to_underlying(LogType::OpenGLLogging), _("&OpenGL debug output"), wxEmptyString)->Check(cemuLog_isLoggingEnabled(LogType::OpenGLLogging)); debugLoggingMenu->AppendCheckItem(MAINFRAME_MENU_ID_DEBUG_LOGGING0 + stdx::to_underlying(LogType::VulkanValidation), _("&Vulkan validation layer (slow)"), wxEmptyString)->Check(cemuLog_isLoggingEnabled(LogType::VulkanValidation)); - debugLoggingMenu->AppendCheckItem(MAINFRAME_MENU_ID_DEBUG_LOGGING0 + stdx::to_underlying(LogType::MetalLogging), _("&Metal debug output"), wxEmptyString)->Check(cemuLog_isLoggingEnabled(LogType::MetalLogging)); debugLoggingMenu->AppendCheckItem(MAINFRAME_MENU_ID_DEBUG_ADVANCED_PPC_INFO, _("&Log PPC context for API"), wxEmptyString)->Check(cemuLog_advancedPPCLoggingEnabled()); m_loggingSubmenu = debugLoggingMenu; // debug->dump submenu @@ -2302,7 +2301,6 @@ void MainWindow::RecreateMenu() // these options cant be toggled after the renderer backend is initialized: m_loggingSubmenu->Enable(MAINFRAME_MENU_ID_DEBUG_LOGGING0 + stdx::to_underlying(LogType::OpenGLLogging), false); m_loggingSubmenu->Enable(MAINFRAME_MENU_ID_DEBUG_LOGGING0 + stdx::to_underlying(LogType::VulkanValidation), false); - m_loggingSubmenu->Enable(MAINFRAME_MENU_ID_DEBUG_LOGGING0 + stdx::to_underlying(LogType::MetalLogging), false); UpdateNFCMenu(); }