From adb02cbee4087a9be47228459a954bef52e870d9 Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 9 Aug 2018 17:23:08 +0100 Subject: [PATCH] Linux compile fixes --- qrenderdoc/Code/Interface/ShaderProcessingTool.cpp | 6 +++--- renderdoc/driver/shaders/spirv/spirv_disassemble.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qrenderdoc/Code/Interface/ShaderProcessingTool.cpp b/qrenderdoc/Code/Interface/ShaderProcessingTool.cpp index 2011783a8..766b6c3f6 100644 --- a/qrenderdoc/Code/Interface/ShaderProcessingTool.cpp +++ b/qrenderdoc/Code/Interface/ShaderProcessingTool.cpp @@ -145,7 +145,7 @@ bytebuf ShaderProcessingTool::CompileShader(QWidget *window, rdcstr source, rdcs ShaderStage stage, rdcstr arguments) const { if(executable.isEmpty()) - return ""; + return bytebuf(); QString input_file = QDir(QDir::tempPath()).absoluteFilePath(lit("shader_input")); QString output_file = QDir(QDir::tempPath()).absoluteFilePath(lit("shader_output")); @@ -162,7 +162,7 @@ bytebuf ShaderProcessingTool::CompileShader(QWidget *window, rdcstr source, rdcs window, QApplication::translate("ShaderProcessingTool", "Error writing temp file"), QApplication::translate("ShaderProcessingTool", "Couldn't write temporary file %1.") .arg(input_file)); - return ""; + return bytebuf(); } QString programArguments = arguments; @@ -177,7 +177,7 @@ bytebuf ShaderProcessingTool::CompileShader(QWidget *window, rdcstr source, rdcs QApplication::translate( "ShaderProcessingTool", "Please use {input_file} in the tool arguments to specify the input file.")); - return ""; + return bytebuf(); } bytebuf outputData; diff --git a/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp b/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp index a3e645c15..cbf8cc5f7 100644 --- a/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp +++ b/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp @@ -4727,7 +4727,7 @@ void ParseSPIRV(uint32_t *spirv, size_t spirvLength, SPVModule &module) else { RDCERR("Unexpected preamble line with OpModuleProcessed: %s", - std::string(source.begin(), source.begin() + nextLine)); + std::string(source.begin(), source.begin() + nextLine).c_str()); break; }