Another round of gcc/g++ fixes.
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@20819 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
parent
37827023c4
commit
cfd643e447
25 changed files with 131 additions and 44 deletions
|
|
@ -107,6 +107,11 @@ public:
|
|||
if (constant.iConst == iConst)
|
||||
return true;
|
||||
|
||||
break;
|
||||
case EbtUint:
|
||||
if (constant.uConst == uConst)
|
||||
return true;
|
||||
|
||||
break;
|
||||
case EbtFloat:
|
||||
if (constant.fConst == fConst)
|
||||
|
|
@ -123,6 +128,8 @@ public:
|
|||
return true;
|
||||
|
||||
break;
|
||||
default:
|
||||
assert(false && "Default missing");
|
||||
}
|
||||
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@
|
|||
//
|
||||
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
#include <vector>
|
||||
|
||||
// If we are using guard blocks, we must track each indivual
|
||||
|
|
|
|||
|
|
@ -110,6 +110,7 @@ struct TSampler {
|
|||
case EbtFloat: break;
|
||||
case EbtInt: s.append("i"); break;
|
||||
case EbtUint: s.append("u"); break;
|
||||
default: break; // some compilers want this
|
||||
}
|
||||
if (image)
|
||||
s.append("image");
|
||||
|
|
@ -122,6 +123,7 @@ struct TSampler {
|
|||
case EsdCube: s.append("Cube"); break;
|
||||
case EsdRect: s.append("2DRect"); break;
|
||||
case EsdBuffer: s.append("Buffer"); break;
|
||||
default: break; // some compilers want this
|
||||
}
|
||||
if (ms)
|
||||
s.append("MS");
|
||||
|
|
@ -453,7 +455,7 @@ public:
|
|||
}
|
||||
}
|
||||
|
||||
TString TType::getCompleteString() const
|
||||
TString getCompleteString() const
|
||||
{
|
||||
const int maxSize = 200;
|
||||
char buf[maxSize];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue