mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added treat warnings as errors switch to shaderc.

Browse Source
This commit is contained in:
bkaradzic 2012-06-05 19:44:20 -07:00
parent 732b2432f7
commit d13b7d0d45
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/shaderc.cpp
View File

@ -231,14 +231,7 @@ private:
void skipLine() void skipLine()
{ {
const char* str = &m_str[m_pos]; const char* str = &m_str[m_pos];
const char* eol = strstr(str, "\r\n"); const char* eol = strstr(str, "\n\r");
if (NULL != eol)
{
m_pos += eol-str+2;
return;
}
eol = strstr(str, "\n\r");
if (NULL != eol) if (NULL != eol)
{ {
m_pos += eol-str+2; m_pos += eol-str+2;
@ -343,6 +336,8 @@ bool compileHLSLShader(CommandLine& _cmdLine, const std::string& _code, const ch
flags |= _cmdLine.hasArg('\0', "partial-precision") ? D3DXSHADER_PARTIALPRECISION : 0; flags |= _cmdLine.hasArg('\0', "partial-precision") ? D3DXSHADER_PARTIALPRECISION : 0;
flags |= _cmdLine.hasArg('\0', "prefer-flow-control") ? D3DXSHADER_PREFER_FLOW_CONTROL : 0; flags |= _cmdLine.hasArg('\0', "prefer-flow-control") ? D3DXSHADER_PREFER_FLOW_CONTROL : 0;
flags |= _cmdLine.hasArg('\0', "backwards-compatibility") ? D3DXSHADER_ENABLE_BACKWARDS_COMPATIBILITY : 0; flags |= _cmdLine.hasArg('\0', "backwards-compatibility") ? D3DXSHADER_ENABLE_BACKWARDS_COMPATIBILITY : 0;
bool werror = _cmdLine.hasArg('\0', "Werror");
uint32_t optimization = 3; uint32_t optimization = 3;
if (_cmdLine.hasArg(optimization, 'O') ) if (_cmdLine.hasArg(optimization, 'O') )
@ -374,7 +369,8 @@ bool compileHLSLShader(CommandLine& _cmdLine, const std::string& _code, const ch
, &errorMsg , &errorMsg
, &constantTable , &constantTable
); );
if (FAILED(hr) ) if (FAILED(hr)
|| werror && NULL != errorMsg)
{ {
printCode(_code.c_str() ); printCode(_code.c_str() );
fprintf(stderr, "Error: 0x%08x %s\n", hr, errorMsg->GetBufferPointer() ); fprintf(stderr, "Error: 0x%08x %s\n", hr, errorMsg->GetBufferPointer() );