mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SPIRV/SpvBuilder.cpp
View File

@ -1175,7 +1175,7 @@ Id Builder::createTextureCall(Decoration precision, Id resultType, bool proj, co
Id Builder::createTextureQueryCall(Op opCode, const TextureParameters& parameters)
{
// Figure out the result type
Id resultType;
Id resultType = NoType;
switch (opCode) {
case OpTextureQuerySize:
case OpTextureQuerySizeLod:

6
SPIRV/doc.h
View File

@ -213,10 +213,10 @@ public:
class InstructionParameters {
public:
InstructionParameters() :
typePresent(true), // most normal, only exceptions have to be spelled out
resultPresent(true), // most normal, only exceptions have to be spelled out
opDesc(0),
opClass(OpClassMisc)
opClass(OpClassMisc),
typePresent(true), // most normal, only exceptions have to be spelled out
resultPresent(true) // most normal, only exceptions have to be spelled out
{ }
void setResultAndType(bool r, bool t)

2
glslang/MachineIndependent/Initialize.cpp
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();"
);

2
glslang/MachineIndependent/Scan.cpp
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);

2
glslang/MachineIndependent/Versions.cpp
View File

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

2
glslang/MachineIndependent/preprocessor/PpContext.h
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;