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

Infrastructure: add include search paths (-I, etc.).

Browse Source
This commit is contained in:
John Kessenich
2017-06-07 15:06:58 -06:00
parent 96f65521b4
commit 971a0a8d2d
11 changed files with 125 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
Test/baseResults/hlsl.dashI.vert.out Normal file
View File

@@ -0,0 +1,69 @@
hlsl.dashI.vert
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 40
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 38
Source HLSL 500
Name 4 "main"
Name 9 "@main("
Name 11 "$Global"
MemberName 11($Global) 0 "i1"
MemberName 11($Global) 1 "p1"
MemberName 11($Global) 2 "p2"
MemberName 11($Global) 3 "p3"
MemberName 11($Global) 4 "i4"
Name 13 ""
Name 38 "@entryPointOutput"
MemberDecorate 11($Global) 0 Offset 0
MemberDecorate 11($Global) 1 Offset 16
MemberDecorate 11($Global) 2 Offset 32
MemberDecorate 11($Global) 3 Offset 48
MemberDecorate 11($Global) 4 Offset 64
Decorate 11($Global) Block
Decorate 13 DescriptorSet 0
Decorate 38(@entryPointOutput) BuiltIn Position
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
7: TypeVector 6(float) 4
8: TypeFunction 7(fvec4)
11($Global): TypeStruct 7(fvec4) 7(fvec4) 7(fvec4) 7(fvec4) 7(fvec4)
12: TypePointer Uniform 11($Global)
13: 12(ptr) Variable Uniform
14: TypeInt 32 1
15: 14(int) Constant 0
16: TypePointer Uniform 7(fvec4)
19: 14(int) Constant 4
23: 14(int) Constant 1
27: 14(int) Constant 2
31: 14(int) Constant 3
37: TypePointer Output 7(fvec4)
38(@entryPointOutput): 37(ptr) Variable Output
4(main): 2 Function None 3
5: Label
39: 7(fvec4) FunctionCall 9(@main()
Store 38(@entryPointOutput) 39
Return
FunctionEnd
9(@main(): 7(fvec4) Function None 8
10: Label
17: 16(ptr) AccessChain 13 15
18: 7(fvec4) Load 17
20: 16(ptr) AccessChain 13 19
21: 7(fvec4) Load 20
22: 7(fvec4) FAdd 18 21
24: 16(ptr) AccessChain 13 23
25: 7(fvec4) Load 24
26: 7(fvec4) FAdd 22 25
28: 16(ptr) AccessChain 13 27
29: 7(fvec4) Load 28
30: 7(fvec4) FAdd 26 29
32: 16(ptr) AccessChain 13 31
33: 7(fvec4) Load 32
34: 7(fvec4) FAdd 30 33
ReturnValue 34
FunctionEnd

13
Test/hlsl.dashI.vert Normal file
View File

@@ -0,0 +1,13 @@
// For -Iinc1/path1 -Iinc1/path2
// bar.h from local directory will define i1, while the ones from inc1/path1 and inc1/path2 will not.
// notHere.h is only in inc1/path1 and inc2/path2, and only inc1/path1 defines p1, p2, and p3
// parent.h is local again, and defines i4
#include "bar.h"
#include "notHere.h"
#include "parent.h"
float4 main() : SV_Position
{
return i1 + i4 + p1 + p2 + p3;
}

1
Test/inc1/path1/bar.h Normal file
View File

@@ -0,0 +1 @@
float4 i9991;

1
Test/inc1/path1/local.h Normal file
View File

@@ -0,0 +1 @@
float4 p2;

4
Test/inc1/path1/notHere.h Normal file
View File

@@ -0,0 +1,4 @@
float4 p1;
#include "local.h"
#include "remote.h"

1
Test/inc1/path2/bar.h Normal file
View File

@@ -0,0 +1 @@
float4 i9991;

1
Test/inc1/path2/notHere.h Normal file
View File

@@ -0,0 +1 @@
float4 paoeu1;

1
Test/inc1/path2/remote.h Normal file
View File

@@ -0,0 +1 @@
float4 p3;

2
Test/runtests
View File

@@ -116,6 +116,8 @@ $EXE -D -e main -H hlsl.includeNegative.vert > $TARGETDIR/hlsl.includeNegative.v
diff -b $BASEDIR/hlsl.includeNegative.vert.out $TARGETDIR/hlsl.includeNegative.vert.out || HASERROR=1
$EXE -l -i include.vert > $TARGETDIR/include.vert.out
diff -b $BASEDIR/include.vert.out $TARGETDIR/include.vert.out || HASERROR=1
$EXE -D -e main -H -Iinc1/path1 -Iinc1/path2 hlsl.dashI.vert > $TARGETDIR/hlsl.dashI.vert.out
diff -b $BASEDIR/hlsl.dashI.vert.out $TARGETDIR/hlsl.dashI.vert.out || HASERROR=1
#
# Final checking