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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
StandAlone/StandAlone.cpp
View File

@ -207,12 +207,10 @@ int C_DECL main(int argc, char* argv[])
ShDestruct(linker); ShDestruct(linker);
ShDestruct(uniformMap); ShDestruct(uniformMap);
#ifdef _WIN32
if (delay) if (delay)
Sleep(1000000); Sleep(1000000);
} }
#endif
if (compileFailed) if (compileFailed)
return EFailCompile; return EFailCompile;

46
glslang/MachineIndependent/InfoSink.cpp
View File

@ -34,11 +34,7 @@
#include "Include/InfoSink.h" #include "Include/InfoSink.h"
#ifdef _WIN32 #include <string.h>
#include <windows.h>
#else
#include <string.h>
#endif
void TInfoSinkBase::append(const char *s) void TInfoSinkBase::append(const char *s)
{ {
@ -47,10 +43,10 @@ void TInfoSinkBase::append(const char *s)
sink.append(s); sink.append(s);
} }
#ifdef _WIN32 //#ifdef _WIN32
if (outputStream & EDebugger) // if (outputStream & EDebugger)
OutputDebugString(s); // OutputDebugString(s);
#endif //#endif
if (outputStream & EStdOut) if (outputStream & EStdOut)
fprintf(stdout, "%s", s); fprintf(stdout, "%s", s);
@ -63,14 +59,14 @@ void TInfoSinkBase::append(int count, char c)
sink.append(count, c); sink.append(count, c);
} }
#ifdef _WIN32 //#ifdef _WIN32
if (outputStream & EDebugger) { // if (outputStream & EDebugger) {
char str[2]; // char str[2];
str[0] = c; // str[0] = c;
str[1] = '\0'; // str[1] = '\0';
OutputDebugString(str); // OutputDebugString(str);
} // }
#endif //#endif
if (outputStream & EStdOut) if (outputStream & EStdOut)
fprintf(stdout, "%c", c); fprintf(stdout, "%c", c);
@ -83,10 +79,10 @@ void TInfoSinkBase::append(const TPersistString& t)
sink.append(t); sink.append(t);
} }
#ifdef _WIN32 //#ifdef _WIN32
if (outputStream & EDebugger) // if (outputStream & EDebugger)
OutputDebugString(t.c_str()); // OutputDebugString(t.c_str());
#endif //#endif
if (outputStream & EStdOut) if (outputStream & EStdOut)
fprintf(stdout, "%s", t.c_str()); fprintf(stdout, "%s", t.c_str());
@ -99,10 +95,10 @@ void TInfoSinkBase::append(const TString& t)
sink.append(t.c_str()); sink.append(t.c_str());
} }
#ifdef _WIN32 //#ifdef _WIN32
if (outputStream & EDebugger) // if (outputStream & EDebugger)
OutputDebugString(t.c_str()); // OutputDebugString(t.c_str());
#endif //#endif
if (outputStream & EStdOut) if (outputStream & EStdOut)
fprintf(stdout, "%s", t.c_str()); fprintf(stdout, "%s", t.c_str());

14
glslang/MachineIndependent/preprocessor/Makefile
View File

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

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

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