Merge pull request #5 from floooh/fix-clang-warnings

Fix for most Xcode/clang warnings on OSX
This commit is contained in:
John Kessenich 2015-07-11 16:36:08 -06:00
commit 549c2932af
6 changed files with 9 additions and 7 deletions

View file

@ -1054,7 +1054,7 @@ void TBuiltIns::initialize(int version, EProfile profile)
//
//============================================================================
bool esBarrier = (profile == EEsProfile && version >= 310);
if (profile != EEsProfile && version >= 150 || esBarrier)
if ((profile != EEsProfile && version >= 150) || esBarrier)
stageBuiltins[EShLangTessControl].append(
"void barrier();"
);

View file

@ -685,7 +685,7 @@ int TScanContext::tokenizeIdentifier()
return keyword;
case ATOMIC_UINT:
if (parseContext.profile == EEsProfile && parseContext.version >= 310 ||
if ((parseContext.profile == EEsProfile && parseContext.version >= 310) ||
parseContext.extensionsTurnedOn(1, &E_GL_ARB_shader_atomic_counters))
return keyword;
return es30ReservedFromGLSL(420);

View file

@ -457,6 +457,8 @@ bool TParseContext::extensionsTurnedOn(int numExtensions, const char* const exte
case EBhRequire:
case EBhWarn:
return true;
default:
break;
}
}

View file

@ -86,7 +86,7 @@ namespace glslang {
class TPpToken {
public:
TPpToken() : token(0), ival(0), space(false), dval(0.0), atom(0)
TPpToken() : token(0), space(false), ival(0), dval(0.0), atom(0)
{
loc.init();
name[0] = 0;