diff --git a/BuildLinux.sh b/BuildLinux.sh index b53578ab..fb764438 100755 --- a/BuildLinux.sh +++ b/BuildLinux.sh @@ -11,6 +11,4 @@ export LD_LIBRARY_PATH # run using test data cd Test -../StandAlone/StandAlone -i sample.vert sample.frag - - +../StandAlone/glslangValidator -i sample.vert sample.frag diff --git a/Test/runtests b/Test/runtests index 7ec9885a..dae11f8a 100644 --- a/Test/runtests +++ b/Test/runtests @@ -7,5 +7,5 @@ while read t; do echo Running $t... b=`basename $t` ./glslangValidator.exe -i $t > $TARGETDIR/$b.out - diff $BASEDIR/$b.out $TARGETDIR/$b.out + diff -b $BASEDIR/$b.out $TARGETDIR/$b.out done < testlist diff --git a/glslang/MachineIndependent/Constant.cpp b/glslang/MachineIndependent/Constant.cpp index 831f7998..fe686254 100644 --- a/glslang/MachineIndependent/Constant.cpp +++ b/glslang/MachineIndependent/Constant.cpp @@ -496,7 +496,7 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TType& returnType, case EOpAbs: 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) newConstArray[i].setIConst(abs(unionArray[i].getIConst())); else diff --git a/glslang/MachineIndependent/Makefile b/glslang/MachineIndependent/Makefile index 7da43fea..2ed83650 100644 --- a/glslang/MachineIndependent/Makefile +++ b/glslang/MachineIndependent/Makefile @@ -24,8 +24,7 @@ default: all all: $(SHAREDOBJECT) -$(SHAREDOBJECT): gen_glslang_tab.o $(OBJECTS) \ - $(LIBPREPROCESSOR) $(LIBCODEGEN) $(LIBOSDEPENDENT) $(LIBINITIALISATION) +$(SHAREDOBJECT): gen_glslang_tab.o $(OBJECTS) $(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 cp $@ ../../Test cp $@ ../../Install/Linux