glslang testing: Remove dependence on testfiles from LunarGLASS.

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@31512 e7fa87d3-cd2b-0410-9028-fcbf551c1848
2015-06-17 16:15:09 +00:00
parent ab556eaaea
commit 2f21fccee9
82 changed files with 2145 additions and 80 deletions
--- a/Test/baseResults/Operations.frag.out
+++ b/Test/baseResults/Operations.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/Operations.frag
+Operations.frag

 Shader version: 130
 0:? Sequence
--- a/Test/baseResults/aggOps.frag.out
+++ b/Test/baseResults/aggOps.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/aggOps.frag
+aggOps.frag
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release
 WARNING: 0:6: varying deprecated in version 130; may be removed in future release

--- a/Test/baseResults/always-discard.frag.out
+++ b/Test/baseResults/always-discard.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/always-discard.frag
+always-discard.frag

 Shader version: 110
 0:? Sequence
--- a/Test/baseResults/always-discard2.frag.out
+++ b/Test/baseResults/always-discard2.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/always-discard2.frag
+always-discard2.frag

 Shader version: 110
 0:? Sequence
--- a/Test/baseResults/conditionalDiscard.frag.out
+++ b/Test/baseResults/conditionalDiscard.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/conditionalDiscard.frag
+conditionalDiscard.frag

 Shader version: 110
 0:? Sequence
--- a/Test/baseResults/conversion.frag.out
+++ b/Test/baseResults/conversion.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/conversion.frag
+conversion.frag

 Shader version: 130
 0:? Sequence
--- a/Test/baseResults/dataOut.frag.out
+++ b/Test/baseResults/dataOut.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/dataOut.frag
+dataOut.frag
 WARNING: 0:3: varying deprecated in version 130; may be removed in future release

 Shader version: 130
--- a/Test/baseResults/dataOutIndirect.frag.out
+++ b/Test/baseResults/dataOutIndirect.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/dataOutIndirect.frag
+dataOutIndirect.frag
 WARNING: 0:3: varying deprecated in version 130; may be removed in future release

 Shader version: 130
--- a/Test/baseResults/deepRvalue.frag.out
+++ b/Test/baseResults/deepRvalue.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/deepRvalue.frag
+deepRvalue.frag

 Shader version: 120
 0:? Sequence
--- a/Test/baseResults/depthOut.frag.out
+++ b/Test/baseResults/depthOut.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/depthOut.frag
+depthOut.frag
 WARNING: 0:3: varying deprecated in version 130; may be removed in future release
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release

--- a/Test/baseResults/discard-dce.frag.out
+++ b/Test/baseResults/discard-dce.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/discard-dce.frag
+discard-dce.frag

 Shader version: 110
 0:? Sequence
--- a/Test/baseResults/doWhileLoop.frag.out
+++ b/Test/baseResults/doWhileLoop.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/doWhileLoop.frag
+doWhileLoop.frag

 Shader version: 110
 0:? Sequence
--- a/Test/baseResults/earlyReturnDiscard.frag.out
+++ b/Test/baseResults/earlyReturnDiscard.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/earlyReturnDiscard.frag
+earlyReturnDiscard.frag

 Shader version: 110
 0:? Sequence
--- a/Test/baseResults/flowControl.frag.out
+++ b/Test/baseResults/flowControl.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/flowControl.frag
+flowControl.frag

 Shader version: 120
 0:? Sequence
--- a/Test/baseResults/forLoop.frag.out
+++ b/Test/baseResults/forLoop.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/forLoop.frag
+forLoop.frag

 Shader version: 130
 0:? Sequence
--- a/Test/baseResults/functionCall.frag.out
+++ b/Test/baseResults/functionCall.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/functionCall.frag
+functionCall.frag
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release

 Shader version: 130
--- a/Test/baseResults/functionSemantics.frag.out
+++ b/Test/baseResults/functionSemantics.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/functionSemantics.frag
+functionSemantics.frag
 Warning, version 400 is not yet complete; most version-specific features are present, but some are missing.

 Shader version: 400
--- a/Test/baseResults/length.frag.out
+++ b/Test/baseResults/length.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/length.frag
+length.frag

 Shader version: 120
 0:? Sequence
--- a/Test/baseResults/localAggregates.frag.out
+++ b/Test/baseResults/localAggregates.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/localAggregates.frag
+localAggregates.frag
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release
 WARNING: 0:5: varying deprecated in version 130; may be removed in future release

--- a/Test/baseResults/loops.frag.out
+++ b/Test/baseResults/loops.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/loops.frag
+loops.frag
 WARNING: 0:14: varying deprecated in version 130; may be removed in future release

 Shader version: 130
--- a/Test/baseResults/loopsArtificial.frag.out
+++ b/Test/baseResults/loopsArtificial.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/loopsArtificial.frag
+loopsArtificial.frag
 WARNING: 0:14: varying deprecated in version 130; may be removed in future release

 Shader version: 130
--- a/Test/baseResults/matrix.frag.out
+++ b/Test/baseResults/matrix.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/matrix.frag
+matrix.frag
 WARNING: 0:6: varying deprecated in version 130; may be removed in future release
 WARNING: 0:17: varying deprecated in version 130; may be removed in future release
 WARNING: 0:22: varying deprecated in version 130; may be removed in future release
--- a/Test/baseResults/matrix2.frag.out
+++ b/Test/baseResults/matrix2.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/matrix2.frag
+matrix2.frag
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release
 WARNING: 0:13: varying deprecated in version 130; may be removed in future release
 WARNING: 0:15: varying deprecated in version 130; may be removed in future release
--- a/Test/baseResults/newTexture.frag.out
+++ b/Test/baseResults/newTexture.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/newTexture.frag
+newTexture.frag
 Warning, version 430 is not yet complete; most version-specific features are present, but some are missing.

 Shader version: 430
--- a/Test/baseResults/prepost.frag.out
+++ b/Test/baseResults/prepost.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/prepost.frag
+prepost.frag

 Shader version: 140
 0:? Sequence
--- a/Test/baseResults/simpleFunctionCall.frag.out
+++ b/Test/baseResults/simpleFunctionCall.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/simpleFunctionCall.frag
+simpleFunctionCall.frag
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release

 Shader version: 150
--- a/Test/baseResults/spv.140.vert.out
+++ b/Test/baseResults/spv.140.vert.out
@@ -17,6 +17,7 @@ To get other information, use one of the following options:
 (Each option must be specified separately, but can go anywhere in the command line.)
  -V  create SPIR-V in file <stage>.spv
  -H  print human readable form of SPIR-V; turns on -V
+  -E  print pre-processed glsl. Cannot be used with -V, -H or -l.
  -c  configuration dump; use to create default configuration file (redirect to a .conf file)
  -d  default to desktop (#version 110) when there is no version in the shader (default is ES version 100)
  -i  intermediate tree (glslang AST) is printed out
--- a/Test/baseResults/structAssignment.frag.out
+++ b/Test/baseResults/structAssignment.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/structAssignment.frag
+structAssignment.frag
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release

 Shader version: 130
--- a/Test/baseResults/structDeref.frag.out
+++ b/Test/baseResults/structDeref.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/structDeref.frag
+structDeref.frag
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release

 Shader version: 130
--- a/Test/baseResults/structure.frag.out
+++ b/Test/baseResults/structure.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/structure.frag
+structure.frag
 WARNING: 0:3: varying deprecated in version 130; may be removed in future release

 Shader version: 130
--- a/Test/baseResults/swizzle.frag.out
+++ b/Test/baseResults/swizzle.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/swizzle.frag
+swizzle.frag

 Shader version: 110
 0:? Sequence
--- a/Test/baseResults/syntaxError.frag.out
+++ b/Test/baseResults/syntaxError.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/syntaxError.frag
+syntaxError.frag
 ERROR: 0:9: 'vec5' : undeclared identifier 
 ERROR: 0:9: '' :  syntax error
 ERROR: 2 compilation errors.  No code generated.
--- a/Test/baseResults/test.frag.out
+++ b/Test/baseResults/test.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/test.frag
+test.frag

 Shader version: 110
 0:? Sequence
--- a/Test/baseResults/texture.frag.out
+++ b/Test/baseResults/texture.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/texture.frag
+texture.frag
 WARNING: 0:14: varying deprecated in version 130; may be removed in future release
 WARNING: 0:15: varying deprecated in version 130; may be removed in future release

--- a/Test/baseResults/types.frag.out
+++ b/Test/baseResults/types.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/types.frag
+types.frag

 Shader version: 130
 0:? Sequence
--- a/Test/baseResults/uniformArray.frag.out
+++ b/Test/baseResults/uniformArray.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/uniformArray.frag
+uniformArray.frag

 Shader version: 130
 0:? Sequence
--- a/Test/baseResults/variableArrayIndex.frag.out
+++ b/Test/baseResults/variableArrayIndex.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/variableArrayIndex.frag
+variableArrayIndex.frag
 WARNING: 0:3: varying deprecated in version 130; may be removed in future release

 Shader version: 130
--- a/Test/baseResults/varyingArray.frag.out
+++ b/Test/baseResults/varyingArray.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/varyingArray.frag
+varyingArray.frag
 WARNING: 0:3: varying deprecated in version 130; may be removed in future release
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release
 WARNING: 0:6: varying deprecated in version 130; may be removed in future release
--- a/Test/baseResults/varyingArrayIndirect.frag.out
+++ b/Test/baseResults/varyingArrayIndirect.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/varyingArrayIndirect.frag
+varyingArrayIndirect.frag
 WARNING: 0:3: varying deprecated in version 130; may be removed in future release
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release
 WARNING: 0:6: varying deprecated in version 130; may be removed in future release
--- a/Test/baseResults/voidFunction.frag.out
+++ b/Test/baseResults/voidFunction.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/voidFunction.frag
+voidFunction.frag

 Shader version: 120
 0:? Sequence
--- a/Test/baseResults/whileLoop.frag.out
+++ b/Test/baseResults/whileLoop.frag.out
@@ -1,4 +1,4 @@
-../../LunarGLASS/test/whileLoop.frag
+whileLoop.frag

 Shader version: 110
 0:? Sequence