Commit 8d2fe453 by John Kessenich

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

parent 4586dbdc
...@@ -11,6 +11,4 @@ export LD_LIBRARY_PATH ...@@ -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
...@@ -7,5 +7,5 @@ while read t; do ...@@ -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
...@@ -496,7 +496,7 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TType& returnType, ...@@ -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
......
...@@ -24,8 +24,7 @@ default: all ...@@ -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
......
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