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

Fix some Linux issues.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@23939 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2013-11-07 01:36:56 +00:00
parent 11f9fc7247
commit 3ac3578968
4 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
LinuxDoAll.bash Executable file
View File

@ -0,0 +1,34 @@
#! /bin/bash
svn update
rm -f StandAlone/glslangValidator
rm -f Test/glslangValidator
rm -f glslang/MachineIndependent/lib/libglslang.so
rm -f Install/Linux/libglslang.so
rm -f Install/Linux/glslangValidator
cd StandAlone
make clean
cd ../glslang/MachineIndependent
make clean
cd ../..
# build the StandAlone app and all it's dependencies
make -C StandAlone
# so we can find the shared library
#LD_LIBRARY_PATH=`pwd`/glslang/MachineIndependent/lib
#export LD_LIBRARY_PATH
# install
cd Install/Linux
./install
# run using test data
cd Test
../StandAlone/glslangValidator -i sample.vert sample.frag
cd ../../Test
chmod +x runtests
./runtests

0
Test/runtests Normal file → Executable file
View File

4
glslang/MachineIndependent/reflection.cpp
View File

@ -312,14 +312,14 @@ void TReflection::dump()
{ {
printf("Uniform reflection:\n"); printf("Uniform reflection:\n");
for (size_t i = 0; i < indexToUniform.size(); ++i) { for (size_t i = 0; i < indexToUniform.size(); ++i) {
printf("%d:", i); printf("%d:", (int)i);
indexToUniform[i].dump(); indexToUniform[i].dump();
} }
printf("\n"); printf("\n");
printf("Uniform block reflection:\n"); printf("Uniform block reflection:\n");
for (size_t i = 0; i < indexToUniformBlock.size(); ++i) { for (size_t i = 0; i < indexToUniformBlock.size(); ++i) {
printf("%d: ", i); printf("%d: ", (int)i);
indexToUniformBlock[i].dump(); indexToUniformBlock[i].dump();
} }
printf("\n"); printf("\n");

6
glslang/MachineIndependent/reflection.h
View File

@ -54,10 +54,10 @@ class TLiveTraverser;
// Data needed for just a single object at the granularity exchanged by the reflection API // Data needed for just a single object at the granularity exchanged by the reflection API
class TObjectReflection { class TObjectReflection {
public: public:
TObjectReflection(const TString pName, int pOffset, int pGLDefineType, int pSize, int pIndex) : TObjectReflection(const TString& pName, int pOffset, int pGLDefineType, int pSize, int pIndex) :
name(pName), offset(pOffset), glDefineType(pGLDefineType), size(pSize), index(pIndex) { } name(pName), offset(pOffset), glDefineType(pGLDefineType), size(pSize), index(pIndex) { }
void dump() const { printf("%s: offset %d, type %d, arraySize %d, index %d\n", name.c_str(), offset, glDefineType, size, index); } void dump() const { printf("%s: offset %d, type %d, arraySize %d, index %d\n", name.c_str(), offset, glDefineType, size, index); }
const TString name; TString name;
int offset; int offset;
int glDefineType; int glDefineType;
int size; // data size in bytes for a block, array size for a (non-block) object that's an array int size; // data size in bytes for a block, array size for a (non-block) object that's an array
@ -119,4 +119,4 @@ protected:
} // end namespace glslang } // end namespace glslang
#endif _REFLECTION_INCLUDED #endif // _REFLECTION_INCLUDED