Commit 6add20a8 by John Kessenich

glslang linker: Make some methods static that can be static. Contributor: Lei…

glslang linker: Make some methods static that can be static. Contributor: Lei Zhang (antiagainst@google.com). git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@31113 e7fa87d3-cd2b-0410-9028-fcbf551c1848
parent b330d467
...@@ -835,7 +835,7 @@ const int baseAlignmentVec4Std140 = 16; ...@@ -835,7 +835,7 @@ const int baseAlignmentVec4Std140 = 16;
// Return the size and alignment of a scalar. // Return the size and alignment of a scalar.
// The size is returned in the 'size' parameter // The size is returned in the 'size' parameter
// Return value is the alignment of the type. // 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()) { switch (type.getBasicType()) {
case EbtDouble: size = 8; return 8; case EbtDouble: size = 8; return 8;
...@@ -851,7 +851,7 @@ int TIntermediate::getBaseAlignmentScalar(const TType& type, int& size) const ...@@ -851,7 +851,7 @@ int TIntermediate::getBaseAlignmentScalar(const TType& type, int& size) const
// //
// The size is returned in the 'size' parameter // The size is returned in the 'size' parameter
// Return value is the alignment of the type. // 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; int alignment;
......
...@@ -294,7 +294,7 @@ public: ...@@ -294,7 +294,7 @@ public:
} }
int addXfbBufferOffset(const TType&); int addXfbBufferOffset(const TType&);
unsigned int computeTypeXfbSize(const TType&, bool& containsDouble) const; 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: protected:
void error(TInfoSink& infoSink, const char*); void error(TInfoSink& infoSink, const char*);
...@@ -306,7 +306,7 @@ protected: ...@@ -306,7 +306,7 @@ protected:
void inOutLocationCheck(TInfoSink&); void inOutLocationCheck(TInfoSink&);
TIntermSequence& findLinkerObjects() const; TIntermSequence& findLinkerObjects() const;
bool userOutputUsed() const; bool userOutputUsed() const;
int getBaseAlignmentScalar(const TType&, int& size) const; static int getBaseAlignmentScalar(const TType&, int& size);
const EShLanguage language; const EShLanguage language;
TIntermNode* treeRoot; TIntermNode* treeRoot;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment