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

Linux abs() needs to be fabs(); a few other minor Linux tweaks.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@22603 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2013-08-05 16:36:49 +00:00
parent 4586dbdc1b
commit 8d2fe45334
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BuildLinux.sh
View File

@ -11,6 +11,4 @@ export LD_LIBRARY_PATH
# run using test data # run using test data
cd Test cd Test
../StandAlone/StandAlone -i sample.vert sample.frag ../StandAlone/glslangValidator -i sample.vert sample.frag

2
Test/runtests
View File

@ -7,5 +7,5 @@ while read t; do
echo Running $t... echo Running $t...
b=`basename $t` b=`basename $t`
./glslangValidator.exe -i $t > $TARGETDIR/$b.out ./glslangValidator.exe -i $t > $TARGETDIR/$b.out
diff $BASEDIR/$b.out $TARGETDIR/$b.out diff -b $BASEDIR/$b.out $TARGETDIR/$b.out
done < testlist done < testlist

2
glslang/MachineIndependent/Constant.cpp
View File

@ -496,7 +496,7 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TType& returnType,
case EOpAbs: case EOpAbs:
if (unionArray[i].getType() == EbtDouble) if (unionArray[i].getType() == EbtDouble)
newConstArray[i].setDConst(abs(unionArray[i].getDConst())); newConstArray[i].setDConst(fabs(unionArray[i].getDConst()));
else if (unionArray[i].getType() == EbtInt) else if (unionArray[i].getType() == EbtInt)
newConstArray[i].setIConst(abs(unionArray[i].getIConst())); newConstArray[i].setIConst(abs(unionArray[i].getIConst()));
else else

3
glslang/MachineIndependent/Makefile
View File

@ -24,8 +24,7 @@ default: all
all: $(SHAREDOBJECT) all: $(SHAREDOBJECT)
$(SHAREDOBJECT): gen_glslang_tab.o $(OBJECTS) \ $(SHAREDOBJECT): gen_glslang_tab.o $(OBJECTS) $(LIBPREPROCESSOR) $(LIBCODEGEN) $(LIBOSDEPENDENT) $(LIBINITIALISATION)
$(LIBPREPROCESSOR) $(LIBCODEGEN) $(LIBOSDEPENDENT) $(LIBINITIALISATION)
$(CC) -fPIC -shared -o $@ -rdynamic -Wl,-whole-archive $(OBJECTS) $(LIBPREPROCESSOR) $(LIBCODEGEN) $(LIBOSDEPENDENT) $(LIBINITIALISATION) gen_glslang_tab.o -Wl,-no-whole-archive $(CC) -fPIC -shared -o $@ -rdynamic -Wl,-whole-archive $(OBJECTS) $(LIBPREPROCESSOR) $(LIBCODEGEN) $(LIBOSDEPENDENT) $(LIBINITIALISATION) gen_glslang_tab.o -Wl,-no-whole-archive
cp $@ ../../Test cp $@ ../../Test
cp $@ ../../Install/Linux cp $@ ../../Install/Linux