From 6add20a8358445485fbc8398d9742c35a718541d Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Fri, 8 May 2015 01:44:42 +0000 Subject: [PATCH] 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 --- glslang/MachineIndependent/linkValidate.cpp | 4 ++-- glslang/MachineIndependent/localintermediate.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/glslang/MachineIndependent/linkValidate.cpp b/glslang/MachineIndependent/linkValidate.cpp index d23d0bb2..a1fa54fc 100644 --- a/glslang/MachineIndependent/linkValidate.cpp +++ b/glslang/MachineIndependent/linkValidate.cpp @@ -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; diff --git a/glslang/MachineIndependent/localintermediate.h b/glslang/MachineIndependent/localintermediate.h index 69f4682c..db60a067 100644 --- a/glslang/MachineIndependent/localintermediate.h +++ b/glslang/MachineIndependent/localintermediate.h @@ -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;