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

glslang linker: Make some methods static that can be static. Contributor: Lei Zhang (antiagainst@google.com).

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@31113 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2015-05-08 01:44:42 +00:00
parent b330d467fc
commit 6add20a835
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glslang/MachineIndependent/linkValidate.cpp
View File

@ -835,7 +835,7 @@ const int baseAlignmentVec4Std140 = 16;
// Return the size and alignment of a scalar.
// The size is returned in the 'size' parameter
// Return value is the alignment of the type.
int TIntermediate::getBaseAlignmentScalar(const TType& type, int& size) const
int TIntermediate::getBaseAlignmentScalar(const TType& type, int& size)
{
switch (type.getBasicType()) {
case EbtDouble: size = 8; return 8;
@ -851,7 +851,7 @@ int TIntermediate::getBaseAlignmentScalar(const TType& type, int& size) const
//
// The size is returned in the 'size' parameter
// Return value is the alignment of the type.
int TIntermediate::getBaseAlignment(const TType& type, int& size, bool std140) const
int TIntermediate::getBaseAlignment(const TType& type, int& size, bool std140)
{
int alignment;

4
glslang/MachineIndependent/localintermediate.h
View File

@ -294,7 +294,7 @@ public:
}
int addXfbBufferOffset(const TType&);
unsigned int computeTypeXfbSize(const TType&, bool& containsDouble) const;
int getBaseAlignment(const TType&, int& size, bool std140) const;
static int getBaseAlignment(const TType&, int& size, bool std140);
protected:
void error(TInfoSink& infoSink, const char*);
@ -306,7 +306,7 @@ protected:
void inOutLocationCheck(TInfoSink&);
TIntermSequence& findLinkerObjects() const;
bool userOutputUsed() const;
int getBaseAlignmentScalar(const TType&, int& size) const;
static int getBaseAlignmentScalar(const TType&, int& size);
const EShLanguage language;
TIntermNode* treeRoot;