Commit 4a02078a by alokp@chromium.org

Fixed compile warnings on linux.

git-svn-id: https://angleproject.googlecode.com/svn/trunk@1090 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 964b7194
...@@ -26,7 +26,7 @@ enum TFailCode { ...@@ -26,7 +26,7 @@ enum TFailCode {
static void usage(); static void usage();
static ShShaderType FindShaderType(const char* fileName); static ShShaderType FindShaderType(const char* fileName);
static bool CompileFile(char* fileName, ShHandle compiler, int compileOptions); static bool CompileFile(char* fileName, ShHandle compiler, int compileOptions);
static void LogMsg(char* msg, const char* name, const int num, const char* logName); static void LogMsg(const char* msg, const char* name, const int num, const char* logName);
static void PrintActiveVariables(ShHandle compiler, ShShaderInfo varType, bool mapLongVariableNames); static void PrintActiveVariables(ShHandle compiler, ShShaderInfo varType, bool mapLongVariableNames);
// If NUM_SOURCE_STRINGS is set to a value > 1, the input file data is // If NUM_SOURCE_STRINGS is set to a value > 1, the input file data is
...@@ -243,7 +243,7 @@ bool CompileFile(char* fileName, ShHandle compiler, int compileOptions) ...@@ -243,7 +243,7 @@ bool CompileFile(char* fileName, ShHandle compiler, int compileOptions)
return ret ? true : false; return ret ? true : false;
} }
void LogMsg(char* msg, const char* name, const int num, const char* logName) void LogMsg(const char* msg, const char* name, const int num, const char* logName)
{ {
printf("#### %s %s %d %s ####\n", msg, name, num, logName); printf("#### %s %s %d %s ####\n", msg, name, num, logName);
} }
...@@ -272,7 +272,7 @@ void PrintActiveVariables(ShHandle compiler, ShShaderInfo varType, bool mapLongV ...@@ -272,7 +272,7 @@ void PrintActiveVariables(ShHandle compiler, ShShaderInfo varType, bool mapLongV
int activeVars = 0, size = 0; int activeVars = 0, size = 0;
ShDataType type = SH_NONE; ShDataType type = SH_NONE;
char* typeName = NULL; const char* typeName = NULL;
ShGetInfo(compiler, varType, &activeVars); ShGetInfo(compiler, varType, &activeVars);
for (int i = 0; i < activeVars; ++i) { for (int i = 0; i < activeVars; ++i) {
switch (varType) { switch (varType) {
......
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