BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Non-Functional: Whitespace, comments, replace accidentally deleted comment.

Browse source 
- fixed ParseHelper.cpp newlines (crlf -> lf)
- removed trailing white space in most source files
- fix some spelling issues
- extra blank lines
- tabs to spaces
- replace #include comment about no location
This commit is contained in:
John Kessenich 2017-01-06 00:34:48 -07:00
parent 3dd32293f4
commit ecba76fe73
60 changed files with 755 additions and 806 deletions
Download patch file Download diff file Expand all files Collapse all files

4
glslang/Include/BaseTypes.h
View file

@ -84,7 +84,7 @@ enum TStorageQualifier {
EvqUniform, // read only, shared with app
EvqBuffer, // read/write, shared with app
EvqShared, // compute shader's read/write 'shared' qualifier
// parameters
EvqIn, // also, for 'in' in the grammar before we know if it's a pipeline input or an 'in' parameter
EvqOut, // also, for 'out' in the grammar before we know if it's a pipeline output or an 'out' parameter
@ -212,7 +212,7 @@ enum TBuiltInVariable {
};
// These will show up in error messages
__inline const char* GetStorageQualifierString(TStorageQualifier q)
__inline const char* GetStorageQualifierString(TStorageQualifier q)
{
switch (q) {
case EvqTemporary: return "temp"; break;

8
glslang/Include/Common.h
View file

@ -66,7 +66,7 @@ std::string to_string(const T& val) {
#if defined(_MSC_VER) && _MSC_VER < 1700
inline long long int strtoll (const char* str, char** endptr, int base)
{
return _strtoi64(str, endptr, base);
return _strtoi64(str, endptr, base);
}
inline unsigned long long int strtoull (const char* str, char** endptr, int base)
{
@ -178,7 +178,7 @@ public:
template <class T> class TList : public std::list<T, pool_allocator<T> > {
};
template <class K, class D, class CMP = std::less<K> >
template <class K, class D, class CMP = std::less<K> >
class TMap : public std::map<K, D, CMP, pool_allocator<std::pair<K const, D> > > {
};
@ -212,14 +212,14 @@ inline const TString String(const int i, const int base = 10)
inline const TString String(const int i, const int /*base*/ = 10)
{
char text[16]; // 32 bit ints are at most 10 digits in base 10
// we assume base 10 for all cases
snprintf(text, sizeof(text), "%d", i);
return text;
}
#endif
struct TSourceLoc {
void init() { name = nullptr; string = 0; line = 0; column = 0; }
// Returns the name if it exists. Otherwise, returns the string number.

42
glslang/Include/ConstantUnion.h
View file

@ -46,14 +46,14 @@ public:
TConstUnion() : iConst(0), type(EbtInt) { }
void setIConst(int i)
{
iConst = i;
{
iConst = i;
type = EbtInt;
}
void setUConst(unsigned int u)
{
uConst = u;
uConst = u;
type = EbtUint;
}
@ -71,13 +71,13 @@ public:
void setDConst(double d)
{
dConst = d;
dConst = d;
type = EbtDouble;
}
void setBConst(bool b)
{
bConst = b;
bConst = b;
type = EbtBool;
}
@ -215,7 +215,7 @@ public:
}
bool operator>(const TConstUnion& constant) const
{
{
assert(type == constant.type);
switch (type) {
case EbtInt:
@ -250,7 +250,7 @@ public:
}
bool operator<(const TConstUnion& constant) const
{
{
assert(type == constant.type);
switch (type) {
case EbtInt:
@ -285,7 +285,7 @@ public:
}
TConstUnion operator+(const TConstUnion& constant) const
{
{
TConstUnion returnValue;
assert(type == constant.type);
switch (type) {
@ -301,7 +301,7 @@ public:
}
TConstUnion operator-(const TConstUnion& constant) const
{
{
TConstUnion returnValue;
assert(type == constant.type);
switch (type) {
@ -317,7 +317,7 @@ public:
}
TConstUnion operator*(const TConstUnion& constant) const
{
{
TConstUnion returnValue;
assert(type == constant.type);
switch (type) {
@ -325,7 +325,7 @@ public:
case EbtInt64: returnValue.setI64Const(i64Const * constant.i64Const); break;
case EbtUint: returnValue.setUConst(uConst * constant.uConst); break;
case EbtUint64: returnValue.setU64Const(u64Const * constant.u64Const); break;
case EbtDouble: returnValue.setDConst(dConst * constant.dConst); break;
case EbtDouble: returnValue.setDConst(dConst * constant.dConst); break;
default: assert(false && "Default missing");
}
@ -333,7 +333,7 @@ public:
}
TConstUnion operator%(const TConstUnion& constant) const
{
{
TConstUnion returnValue;
assert(type == constant.type);
switch (type) {
@ -348,7 +348,7 @@ public:
}
TConstUnion operator>>(const TConstUnion& constant) const
{
{
TConstUnion returnValue;
switch (type) {
case EbtInt:
@ -394,7 +394,7 @@ public:
}
TConstUnion operator<<(const TConstUnion& constant) const
{
{
TConstUnion returnValue;
switch (type) {
case EbtInt:
@ -440,7 +440,7 @@ public:
}
TConstUnion operator&(const TConstUnion& constant) const
{
{
TConstUnion returnValue;
assert(type == constant.type);
switch (type) {
@ -455,7 +455,7 @@ public:
}
TConstUnion operator|(const TConstUnion& constant) const
{
{
TConstUnion returnValue;
assert(type == constant.type);
switch (type) {
@ -470,7 +470,7 @@ public:
}
TConstUnion operator^(const TConstUnion& constant) const
{
{
TConstUnion returnValue;
assert(type == constant.type);
switch (type) {
@ -485,7 +485,7 @@ public:
}
TConstUnion operator~() const
{
{
TConstUnion returnValue;
switch (type) {
case EbtInt: returnValue.setIConst(~iConst); break;
@ -499,7 +499,7 @@ public:
}
TConstUnion operator&&(const TConstUnion& constant) const
{
{
TConstUnion returnValue;
assert(type == constant.type);
switch (type) {
@ -511,7 +511,7 @@ public:
}
TConstUnion operator||(const TConstUnion& constant) const
{
{
TConstUnion returnValue;
assert(type == constant.type);
switch (type) {
@ -544,7 +544,7 @@ private:
// One convenience is being able to use [] to go inside the array, instead
// of C++ assuming it as an array of pointers to vectors.
//
// General usage is that the size is known up front, and it is
// General usage is that the size is known up front, and it is
// created once with the proper size.
//
class TConstUnionArray {

10
glslang/Include/InfoSink.h
View file

@ -74,9 +74,9 @@ public:
TInfoSinkBase& operator<<(const char* s) { append(s); return *this; }
TInfoSinkBase& operator<<(int n) { append(String(n)); return *this; }
TInfoSinkBase& operator<<(unsigned int n) { append(String(n)); return *this; }
TInfoSinkBase& operator<<(float n) { const int size = 40; char buf[size];
TInfoSinkBase& operator<<(float n) { const int size = 40; char buf[size];
snprintf(buf, size, (fabs(n) > 1e-8 && fabs(n) < 1e8) || n == 0.0f ? "%f" : "%g", n);
append(buf);
append(buf);
return *this; }
TInfoSinkBase& operator+(const TPersistString& t) { append(t); return *this; }
TInfoSinkBase& operator+(const TString& t) { append(t); return *this; }
@ -113,20 +113,20 @@ public:
append(s);
append("\n");
}
void setOutputStream(int output = 4)
{
outputStream = output;
}
protected:
void append(const char* s);
void append(const char* s);
void append(int count, char c);
void append(const TPersistString& t);
void append(const TString& t);
void checkMem(size_t growth) { if (sink.capacity() < sink.size() + growth + 2)
void checkMem(size_t growth) { if (sink.capacity() < sink.size() + growth + 2)
sink.reserve(sink.capacity() + sink.capacity() / 2); }
void appendToStream(const char* s);
TPersistString sink;

29
glslang/Include/PoolAlloc.h
View file

@ -43,8 +43,8 @@
//
// This header defines an allocator that can be used to efficiently
// allocate a large number of small requests for heap memory, with the
// intention that they are not individually deallocated, but rather
// allocate a large number of small requests for heap memory, with the
// intention that they are not individually deallocated, but rather
// collectively deallocated at one time.
//
// This simultaneously
@ -70,7 +70,7 @@ namespace glslang {
// If we are using guard blocks, we must track each individual
// allocation. If we aren't using guard blocks, these
// never get instantiated, so won't have any impact.
//
//
class TAllocation {
public:
@ -87,7 +87,7 @@ public:
memset(postGuard(), guardBlockEndVal, guardBlockSize);
# endif
}
void check() const {
checkGuardBlock(preGuard(), guardBlockBeginVal, "before");
checkGuardBlock(postGuard(), guardBlockEndVal, "after");
@ -100,7 +100,7 @@ public:
inline static size_t allocationSize(size_t size) {
return size + 2 * guardBlockSize + headerSize();
}
// Offset from surrounding buffer to get to user data buffer.
inline static unsigned char* offsetAllocation(unsigned char* m) {
return m + guardBlockSize + headerSize();
@ -123,16 +123,16 @@ private:
const static unsigned char userDataFill;
const static size_t guardBlockSize;
# ifdef GUARD_BLOCKS
# ifdef GUARD_BLOCKS
inline static size_t headerSize() { return sizeof(TAllocation); }
# else
inline static size_t headerSize() { return 0; }
# endif
};
//
// There are several stacks. One is to track the pushing and popping
// of the user, and not yet implemented. The others are simply a
// of the user, and not yet implemented. The others are simply a
// repositories of free pages or used pages.
//
// Page stacks are linked together with a simple header at the beginning
@ -141,7 +141,7 @@ private:
// re-use.
//
// The "page size" used is not, nor must it match, the underlying OS
// page size. But, having it be about that size or equal to a set of
// page size. But, having it be about that size or equal to a set of
// pages is likely most optimal.
//
class TPoolAllocator {
@ -185,7 +185,7 @@ public:
protected:
friend struct tHeader;
struct tHeader {
tHeader(tHeader* nextPage, size_t pageCount) :
#ifdef GUARD_BLOCKS
@ -227,7 +227,7 @@ protected:
}
size_t pageSize; // granularity of allocation from the OS
size_t alignment; // all returned allocations will be aligned at
size_t alignment; // all returned allocations will be aligned at
// this granularity, which will be a power of 2
size_t alignmentMask;
size_t headerSkip; // amount of memory to skip to make room for the
@ -245,7 +245,6 @@ private:
TPoolAllocator(const TPoolAllocator&); // don't allow default copy constructor
};
//
// There could potentially be many pools with pops happening at
// different times. But a simple use is to have a global pop
@ -278,7 +277,7 @@ public:
typedef T& reference;
typedef const T& const_reference;
typedef T value_type;
template<class Other>
template<class Other>
struct rebind {
typedef pool_allocator<Other> other;
};
@ -292,9 +291,9 @@ public:
template<class Other>
pool_allocator(const pool_allocator<Other>& p) : allocator(p.getAllocator()) { }
pointer allocate(size_type n) {
pointer allocate(size_type n) {
return reinterpret_cast<pointer>(getAllocator().allocate(n * sizeof(T))); }
pointer allocate(size_type n, const void*) {
pointer allocate(size_type n, const void*) {
return reinterpret_cast<pointer>(getAllocator().allocate(n * sizeof(T))); }
void deallocate(void*, size_type) { }

2
glslang/Include/ResourceLimits.h
View file

@ -81,7 +81,7 @@ struct TBuiltInResource {
int maxComputeImageUniforms;
int maxComputeAtomicCounters;
int maxComputeAtomicCounterBuffers;
int maxVaryingComponents;
int maxVaryingComponents;
int maxVertexOutputComponents;
int maxGeometryInputComponents;
int maxGeometryOutputComponents;

17
glslang/Include/ShHandle.h
View file

@ -42,8 +42,7 @@
// This should not be included by driver code.
//
#define SH_EXPORTING
#define SH_EXPORTING
#include "../Public/ShaderLang.h"
#include "../MachineIndependent/Versions.h"
#include "InfoSink.h"
@ -73,7 +72,7 @@ public:
TUniformMap() { }
virtual ~TUniformMap() { }
virtual TUniformMap* getAsUniformMap() { return this; }
virtual int getLocation(const char* name) = 0;
virtual int getLocation(const char* name) = 0;
virtual TInfoSink& getInfoSink() { return infoSink; }
TInfoSink infoSink;
};
@ -95,7 +94,7 @@ public:
virtual TCompiler* getAsCompiler() { return this; }
virtual bool linkable() { return haveValidObjectCode; }
TInfoSink& infoSink;
protected:
TCompiler& operator=(TCompiler&);
@ -117,9 +116,9 @@ typedef glslang::TVector<TShHandleBase*> THandleList;
class TLinker : public TShHandleBase {
public:
TLinker(EShExecutable e, TInfoSink& iSink) :
TLinker(EShExecutable e, TInfoSink& iSink) :
infoSink(iSink),
executable(e),
executable(e),
haveReturnableObjectCode(false),
appAttributeBindings(0),
fixedAttributeBindings(0),
@ -147,7 +146,7 @@ protected:
const ShBindingTable* fixedAttributeBindings;
const int* excludedAttributes;
int excludedCount;
ShBindingTable* uniformBindings; // created by the linker
ShBindingTable* uniformBindings; // created by the linker
};
//
@ -155,7 +154,7 @@ protected:
// and the machine dependent code.
//
// The machine dependent code should derive from the classes
// above. Then Construct*() and Delete*() will create and
// above. Then Construct*() and Delete*() will create and
// destroy the machine dependent objects, which contain the
// above machine independent information.
//
@ -165,7 +164,7 @@ TShHandleBase* ConstructLinker(EShExecutable, int);
TShHandleBase* ConstructBindings();
void DeleteLinker(TShHandleBase*);
void DeleteBindingList(TShHandleBase* bindingList);
TUniformMap* ConstructUniformMap();
void DeleteCompiler(TCompiler*);

17
glslang/Include/Types.h
View file

@ -421,7 +421,7 @@ public:
clearLayout();
}
// Drop just the storage qualification, which perhaps should
// Drop just the storage qualification, which perhaps should
// never be done, as it is fundamentally inconsistent, but need to
// explore what downstream consumers need.
// E.g., in a deference, it is an inconsistency between:
@ -927,9 +927,9 @@ struct TShaderQualifiers {
TLayoutDepth layoutDepth;
bool blendEquation; // true if any blend equation was specified
#ifdef NV_EXTENSIONS
#ifdef NV_EXTENSIONS
bool layoutOverrideCoverage; // true if layout override_coverage set
#endif
#endif
void init()
{
@ -950,7 +950,7 @@ struct TShaderQualifiers {
earlyFragmentTests = false;
layoutDepth = EldNone;
blendEquation = false;
#ifdef NV_EXTENSIONS
#ifdef NV_EXTENSIONS
layoutOverrideCoverage = false;
#endif
}
@ -989,10 +989,10 @@ struct TShaderQualifiers {
layoutDepth = src.layoutDepth;
if (src.blendEquation)
blendEquation = src.blendEquation;
#ifdef NV_EXTENSIONS
#ifdef NV_EXTENSIONS
if (src.layoutOverrideCoverage)
layoutOverrideCoverage = src.layoutOverrideCoverage;
#endif
#endif
}
};
@ -1085,7 +1085,7 @@ public:
qualifier.storage = q;
}
// for explicit precision qualifier
TType(TBasicType t, TStorageQualifier q, TPrecisionQualifier p, int vs = 1, int mc = 0, int mr = 0,
TType(TBasicType t, TStorageQualifier q, TPrecisionQualifier p, int vs = 1, int mc = 0, int mr = 0,
bool isVector = false) :
basicType(t), vectorSize(vs), matrixCols(mc), matrixRows(mr), vector1(isVector && vs == 1),
arraySizes(nullptr), structure(nullptr), fieldName(nullptr), typeName(nullptr)
@ -1332,7 +1332,7 @@ public:
return false;
}
}
// Recursively checks if the type contains the given basic type
virtual bool containsBasicType(TBasicType checkType) const
{
@ -1601,7 +1601,6 @@ public:
p += snprintf(p, end - p, "passthrough ");
#endif
p += snprintf(p, end - p, ") ");
}
}

18
glslang/Include/intermediate.h
View file

@ -38,7 +38,7 @@
// Definition of the in-memory high-level intermediate representation
// of shaders. This is a tree that parser creates.
//
// Nodes in the tree are defined as a hierarchy of classes derived from
// Nodes in the tree are defined as a hierarchy of classes derived from
// TIntermNode. Each is a node in a tree. There is no preset branching factor;
// each node can have it's own type of list of children.
//
@ -66,14 +66,14 @@ enum TOperator {
EOpNull, // if in a node, should only mean a node is still being built
EOpSequence, // denotes a list of statements, or parameters, etc.
EOpLinkerObjects, // for aggregate node of objects the linker may need, if not reference by the rest of the AST
EOpFunctionCall,
EOpFunctionCall,
EOpFunction, // For function definition
EOpParameters, // an aggregate listing the parameters to a function
//
// Unary operators
//
EOpNegative,
EOpLogicalNot,
EOpVectorLogicalNot,
@ -445,7 +445,7 @@ enum TOperator {
//
// moves
//
EOpAssign,
EOpAddAssign,
EOpSubAssign,
@ -709,7 +709,7 @@ public:
virtual void setType(const TType& t) { type.shallowCopy(t); }
virtual const TType& getType() const { return type; }
virtual TType& getWritableType() { return type; }
virtual TBasicType getBasicType() const { return type.getBasicType(); }
virtual TQualifier& getQualifier() { return type.getQualifier(); }
virtual const TQualifier& getQualifier() const { return type.getQualifier(); }
@ -734,7 +734,7 @@ protected:
//
class TIntermLoop : public TIntermNode {
public:
TIntermLoop(TIntermNode* aBody, TIntermTyped* aTest, TIntermTyped* aTerminal, bool testFirst) :
TIntermLoop(TIntermNode* aBody, TIntermTyped* aTest, TIntermTyped* aTerminal, bool testFirst) :
body(aBody),
test(aTest),
terminal(aTerminal),
@ -1148,7 +1148,7 @@ enum TVisit
};
//
// For traversing the tree. User should derive from this,
// For traversing the tree. User should derive from this,
// put their traversal specific data in it, and then pass
// it to a Traverse method.
//
@ -1160,10 +1160,10 @@ enum TVisit
// the subtree). Similarly for inVisit for in-order visiting of nodes with
// multiple children.
//
// If you only want post-visits, explicitly turn off preVisit (and inVisit)
// If you only want post-visits, explicitly turn off preVisit (and inVisit)
// and turn on postVisit.
//
// In general, for the visit*() methods, return true from interior nodes
// In general, for the visit*() methods, return true from interior nodes
// to have the traversal continue on to children.
//
// If you process children yourself, or don't want them processed, return false.

4
glslang/Include/revision.h
View file

@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "Overload400-PrecQual.1744"
#define GLSLANG_DATE "05-Jan-2017"
#define GLSLANG_REVISION "Overload400-PrecQual.1747"
#define GLSLANG_DATE "06-Jan-2017"

2
glslang/Include/revision.template
View file

@ -1,4 +1,4 @@
// The file revision.h should be updated to the latest version, somehow, on
// The file revision.h should be updated to the latest version, somehow, on
// check-in, if glslang has changed.
//
// revision.template is the source for revision.h when using SubWCRev as the