From 6b99f40b2baf6f5cfaf6f2ea0b9bdb483f5a3fc6 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 10 Oct 2016 18:50:39 +0200 Subject: [PATCH] Remove direct use of RENDERDOC_LogText in favour of Qt's logging --- qrenderdoc/Code/CommonPipelineState.h | 9 +++++---- qrenderdoc/Code/RenderManager.cpp | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/qrenderdoc/Code/CommonPipelineState.h b/qrenderdoc/Code/CommonPipelineState.h index 5732042ff..b711116d0 100644 --- a/qrenderdoc/Code/CommonPipelineState.h +++ b/qrenderdoc/Code/CommonPipelineState.h @@ -24,6 +24,7 @@ #pragma once +#include #include #include #include @@ -191,7 +192,7 @@ private: if(stage == eShaderStage_Compute) return m_D3D11->m_CS; - RENDERDOC_LogText("Error - invalid stage"); + qCritical() << "Error - invalid stage " << (int)stage; return m_D3D11->m_CS; } @@ -210,7 +211,7 @@ private: if(stage == eShaderStage_Compute) return m_D3D12->m_CS; - RENDERDOC_LogText("Error - invalid stage"); + qCritical() << "Error - invalid stage " << (int)stage; return m_D3D12->m_CS; } @@ -229,7 +230,7 @@ private: if(stage == eShaderStage_Compute) return m_GL->m_CS; - RENDERDOC_LogText("Error - invalid stage"); + qCritical() << "Error - invalid stage " << (int)stage; return m_GL->m_CS; } @@ -248,7 +249,7 @@ private: if(stage == eShaderStage_Compute) return m_Vulkan->CS; - RENDERDOC_LogText("Error - invalid stage"); + qCritical() << "Error - invalid stage " << (int)stage; return m_Vulkan->CS; } }; \ No newline at end of file diff --git a/qrenderdoc/Code/RenderManager.cpp b/qrenderdoc/Code/RenderManager.cpp index e80079dae..8a89068c9 100644 --- a/qrenderdoc/Code/RenderManager.cpp +++ b/qrenderdoc/Code/RenderManager.cpp @@ -124,7 +124,7 @@ void RenderManager::run() if(renderer == NULL) return; - RENDERDOC_LogText(QString("QRenderDoc - renderer created for %1").arg(m_Logfile).toUtf8()); + qInfo() << QString("QRenderDoc - renderer created for %1").arg(m_Logfile); m_Running = true;