glslang portability: Resolve OSX errors, some other OS warnings.

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@31468 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2015-06-10 22:05:48 +00:00
parent 3ef22f2139
commit 79eaa91e6f
7 changed files with 29 additions and 28 deletions

View file

@ -101,7 +101,7 @@ public:
Id makeMatrixType(Id component, int cols, int rows);
Id makeArrayType(Id element, unsigned size);
Id makeFunctionType(Id returnType, std::vector<Id>& paramTypes);
enum samplerContent : unsigned {
enum samplerContent {
samplerContentTexture,
samplerContentImage,
samplerContentTextureFilter
@ -470,7 +470,7 @@ public:
}
// push new swizzle onto the end of any existing swizzle, merging into a single swizzle
void accessChainPushSwizzle(std::vector<unsigned>& swizzle, int width);
void accessChainPushSwizzle(std::vector<unsigned>& swizzle);
// push a variable component selection onto the access chain; supporting only one, so unsided
void accessChainPushComponent(Id component) { accessChain.component = component; }