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

Non-functional trivial clean up.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@26972 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2014-06-05 16:30:53 +00:00
parent 3591930f23
commit fd30542a0f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
StandAlone/CMakeLists.txt
View File

@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 2.8)
include_directories(.) include_directories(.)
if(WIN32) if(WIN32)
include_directories(${include_directories} ../glslang/OSDependent/Windows) include_directories(../glslang/OSDependent/Windows)
elseif(UNIX) elseif(UNIX)
include_directories(${include_directories} ../glslang/OSDependent/Linux) include_directories(../glslang/OSDependent/Linux)
else(WIN32) else(WIN32)
message("unkown platform") message("unkown platform")
endif(WIN32) endif(WIN32)

4
StandAlone/StandAlone.cpp
View File

@ -428,7 +428,7 @@ void ProcessConfigFile()
glslang::TWorklist Worklist; glslang::TWorklist Worklist;
// array of unique places to leave the shader names and infologs for the asynchronous compiles // array of unique places to leave the shader names and infologs for the asynchronous compiles
glslang::TWorkItem **Work = 0; glslang::TWorkItem** Work = 0;
int NumWorkItems = 0; int NumWorkItems = 0;
int Options = 0; int Options = 0;
@ -455,7 +455,7 @@ bool ProcessArguments(int argc, char* argv[])
{ {
ExecutableName = argv[0]; ExecutableName = argv[0];
NumWorkItems = argc; // will include some empties where the '-' options were, but it doesn't matter, they'll be 0 NumWorkItems = argc; // will include some empties where the '-' options were, but it doesn't matter, they'll be 0
Work = new glslang::TWorkItem*[NumWorkItems]; Work = new glslang::TWorkItem*[NumWorkItems];
Work[0] = 0; Work[0] = 0;
argc--; argc--;

2
glslang/Public/ShaderLang.h
View File

@ -190,7 +190,7 @@ SH_IMPORT_EXPORT int ShLink(
const int numHandles, const int numHandles,
ShHandle uniformMap, // updated with new uniforms ShHandle uniformMap, // updated with new uniforms
short int** uniformsAccessed, // returned with indexes of uniforms accessed short int** uniformsAccessed, // returned with indexes of uniforms accessed
int* numUniformsAccessed); int* numUniformsAccessed);
SH_IMPORT_EXPORT int ShLinkExt( SH_IMPORT_EXPORT int ShLinkExt(
const ShHandle, // linker object const ShHandle, // linker object