From bb0a3053333ea2ca83253ee65b56c8b8d253f88a Mon Sep 17 00:00:00 2001 From: Branimir Karadzic Date: Sun, 23 Nov 2014 09:37:13 -0800 Subject: [PATCH] shaderc: Added error message with input source file is not found. --- tools/shaderc/shaderc.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/shaderc/shaderc.cpp b/tools/shaderc/shaderc.cpp index 87f4c2021..5412da527 100644 --- a/tools/shaderc/shaderc.cpp +++ b/tools/shaderc/shaderc.cpp @@ -490,7 +490,7 @@ struct Varying typedef std::unordered_map VaryingMap; -class File +class File { public: File(const char* _filePath) @@ -626,7 +626,7 @@ bool compileGLSLShader(bx::CommandLine& _cmdLine, uint32_t _gles, const std::str { char ch = tolower(_cmdLine.findOption('\0', "type")[0]); const glslopt_shader_type type = ch == 'f' - ? kGlslOptShaderFragment + ? kGlslOptShaderFragment : (ch == 'c' ? kGlslOptShaderCompute : kGlslOptShaderVertex); glslopt_target target = kGlslTargetOpenGL; @@ -690,7 +690,7 @@ bool compileGLSLShader(bx::CommandLine& _cmdLine, uint32_t _gles, const std::str strreplace(shader, "texture2DGradEXT", "texture2DGrad"); strreplace(shader, "texture2DProjGradEXT", "texture2DProjGrad"); strreplace(shader, "textureCubeGradEXT", "textureCubeGrad"); - + strreplace(shader, "shadow2DEXT", "shadow2D"); strreplace(shader, "shadow2DProjEXT", "shadow2DProj"); } @@ -1375,11 +1375,11 @@ struct Preprocessor m_tagptr->tag = FPPTAG_DEPENDS; m_tagptr->data = (void*)fppDepends; - m_tagptr++; + m_tagptr++; m_tagptr->tag = FPPTAG_INPUT; m_tagptr->data = (void*)fppInput; - m_tagptr++; + m_tagptr++; m_tagptr->tag = FPPTAG_OUTPUT; m_tagptr->data = (void*)fppOutput; @@ -1900,7 +1900,11 @@ int main(int _argc, const char* _argv[]) bool compiled = false; FILE* file = fopen(filePath, "r"); - if (NULL != file) + if (NULL == file) + { + fprintf(stderr, "Unable to open file '%s'.\n", filePath); + } + else { VaryingMap varyingMap;