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

A few linux improvements/fixes for the previous check in.

Browse source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@22292 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2013-07-08 20:51:29 +00:00
parent 7213324259
commit 3a05b78826
5 changed files with 36 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

14
glslang/MachineIndependent/preprocessor/Makefile
View file

@ -29,10 +29,10 @@ depend:
# DO NOT DELETE
PpAtom.o: PpContext.h PpToken.h
PpScanner.o: PpContext.h PpToken.h
PpTokens.o: PpContext.h PpToken.h
Pp.o: PpContext.h PpToken.h
PpContext.o: PpContext.h PpToken.h
PpMemory.o: PpContext.h PpToken.h
PpSymbols.o: PpContext.h PpToken.h
PpAtom.o: PpContext.h PpTokens.h
PpScanner.o: PpContext.h PpTokens.h
PpTokens.o: PpContext.h PpTokens.h
Pp.o: PpContext.h PpTokens.h
PpContext.o: PpContext.h PpTokens.h
PpMemory.o: PpContext.h PpTokens.h
PpSymbols.o: PpContext.h PpTokens.h

15
glslang/MachineIndependent/preprocessor/PpContext.h
View file

@ -145,19 +145,20 @@ public:
int nextFree;
int size;
};
typedef struct HashEntry_Rec {
struct HashEntry {
int index; // String table offset of string representation
int value; // Atom (symbol) value
} HashEntry;
};
static const int hashTableMaxCollisions = 3;
typedef struct HashTable_Rec {
struct HashTable {
HashEntry *entry;
int size;
int entries;
int counts[hashTableMaxCollisions + 1];
} HashTable;
};
struct AtomTable {
StringTable stable; // String table.
HashTable htable; // Hashes string to atom number and token value. Multiple strings can
@ -197,7 +198,7 @@ public:
} details;
};
typedef struct SymbolList {
struct SymbolList {
struct SymbolList_Rec *next;
Symbol *symb;
};
@ -237,11 +238,11 @@ protected:
int elsetracker; // #if-#else and #endif constructs...Counter.
const char *ErrMsg;
typedef struct MacroInputSrc {
struct MacroInputSrc {
InputSrc base;
MacroSymbol *mac;
TokenStream **args;
} MacroInputSrc;
};
InputSrc *currentInput;

7
glslang/MachineIndependent/preprocessor/PpScanner.cpp
View file

@ -86,13 +86,6 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <stdlib.h>
#include <string.h>
#if 0
#include <ieeefp.h>
#else
#define isinff(x) (((*(int *)&(x) & 0x7f800000L)==0x7f800000L) && \
((*(int *)&(x) & 0x007fffffL)==0000000000L))
#endif
#include "PpContext.h"
#include "PpTokens.h"