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

EXT_ray_tracing requires spv1.4 (#2237)

Browse Source 
* EXT_ray_tracing requires spv1.4

* Fix typo.

* Add extension data table.

* Updated feedback #2.
This commit is contained in:
alelenv
2020-05-28 08:18:07 -07:00
committed by GitHub
parent d0c9129d2f
commit d39b8afc47
14 changed files with 91 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Test/baseResults/spv.ext.AnyHitShader.rahit.out
View File

@@ -1,5 +1,5 @@
spv.ext.AnyHitShader.rahit
// Module Version 10000
// Module Version 10400
// Generated by (magic number): 80008
// Id's are bound by 94
@@ -7,7 +7,7 @@ spv.ext.AnyHitShader.rahit
Extension "SPV_KHR_ray_tracing"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint AnyHitKHR 4 "main" 11 14 20 23 26 33 36 39 42 47 50 53 58 64 67 70 76 80
EntryPoint AnyHitKHR 4 "main" 11 14 20 23 26 33 36 39 42 47 50 53 58 64 67 70 76 80 84
Source GLSL 460
SourceExtension "GL_EXT_ray_tracing"
Name 4 "main"

4
Test/baseResults/spv.ext.ClosestHitShader.rchit.out
View File

@@ -1,5 +1,5 @@
spv.ext.ClosestHitShader.rchit
// Module Version 10000
// Module Version 10400
// Generated by (magic number): 80008
// Id's are bound by 101
@@ -7,7 +7,7 @@ spv.ext.ClosestHitShader.rchit
Extension "SPV_KHR_ray_tracing"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint ClosestHitKHR 4 "main" 11 14 20 23 26 33 36 39 42 47 50 53 58 64 67 70 76 80
EntryPoint ClosestHitKHR 4 "main" 11 14 20 23 26 33 36 39 42 47 50 53 58 64 67 70 76 80 85 98 100
Source GLSL 460
SourceExtension "GL_EXT_ray_tracing"
Name 4 "main"

4
Test/baseResults/spv.ext.IntersectShader.rint.out
View File

@@ -1,5 +1,5 @@
spv.ext.IntersectShader.rint
// Module Version 10000
// Module Version 10400
// Generated by (magic number): 80008
// Id's are bound by 81
@@ -7,7 +7,7 @@ spv.ext.IntersectShader.rint
Extension "SPV_KHR_ray_tracing"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint IntersectionKHR 4 "main" 11 14 20 23 26 33 36 39 42 47 50 56 59 65 69
EntryPoint IntersectionKHR 4 "main" 11 14 20 23 26 33 36 39 42 47 50 56 59 65 69 73
Source GLSL 460
SourceExtension "GL_EXT_ray_tracing"
Name 4 "main"

4
Test/baseResults/spv.ext.MissShader.rmiss.out
View File

@@ -1,5 +1,5 @@
spv.ext.MissShader.rmiss
// Module Version 10000
// Module Version 10400
// Generated by (magic number): 80008
// Id's are bound by 54
@@ -7,7 +7,7 @@ spv.ext.MissShader.rmiss
Extension "SPV_KHR_ray_tracing"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint MissKHR 4 "main" 11 14 21 24 29 32
EntryPoint MissKHR 4 "main" 11 14 21 24 29 32 36 51 53
Source GLSL 460
SourceExtension "GL_EXT_ray_tracing"
Name 4 "main"

4
Test/baseResults/spv.ext.RayCallable.rcall.out
View File

@@ -1,5 +1,5 @@
spv.ext.RayCallable.rcall
// Module Version 10000
// Module Version 10400
// Generated by (magic number): 80008
// Id's are bound by 30
@@ -7,7 +7,7 @@ spv.ext.RayCallable.rcall
Extension "SPV_KHR_ray_tracing"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint CallableKHR 4 "main" 11 14
EntryPoint CallableKHR 4 "main" 11 14 18 29
Source GLSL 460
SourceExtension "GL_EXT_ray_tracing"
Name 4 "main"

4
Test/baseResults/spv.ext.RayConstants.rgen.out
View File

@@ -1,5 +1,5 @@
spv.ext.RayConstants.rgen
// Module Version 10000
// Module Version 10400
// Generated by (magic number): 80008
// Id's are bound by 27
@@ -7,7 +7,7 @@ spv.ext.RayConstants.rgen
Extension "SPV_KHR_ray_tracing"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint RayGenerationKHR 4 "main"
EntryPoint RayGenerationKHR 4 "main" 8 26
Source GLSL 460
SourceExtension "GL_EXT_ray_tracing"
Name 4 "main"

6
Test/baseResults/spv.ext.RayGenShader.rgen.out
View File

@@ -1,5 +1,5 @@
spv.ext.RayGenShader.rgen
// Module Version 10000
// Module Version 10400
// Generated by (magic number): 80008
// Id's are bound by 58
@@ -8,7 +8,7 @@ spv.ext.RayGenShader.rgen
Extension "SPV_KHR_ray_tracing"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint RayGenerationKHR 4 "main" 11 21
EntryPoint RayGenerationKHR 4 "main" 11 21 29 40 51 54 57
Source GLSL 460
SourceExtension "GL_EXT_ray_flags_primitive_culling"
SourceExtension "GL_EXT_ray_tracing"
@@ -33,7 +33,7 @@ spv.ext.RayGenShader.rgen
Decorate 29(accEXT0) Binding 0
MemberDecorate 38(block) 0 Offset 0
MemberDecorate 38(block) 1 Offset 16
Decorate 38(block) BufferBlock
Decorate 38(block) Block
Decorate 51(accEXT1) DescriptorSet 0
Decorate 51(accEXT1) Binding 1
Decorate 54(imageu) DescriptorSet 0

6
Test/baseResults/spv.ext.RayGenShader11.rgen.out
View File

@@ -1,5 +1,5 @@
spv.ext.RayGenShader11.rgen
// Module Version 10000
// Module Version 10400
// Generated by (magic number): 80008
// Id's are bound by 53
@@ -7,7 +7,7 @@ spv.ext.RayGenShader11.rgen
Extension "SPV_KHR_ray_tracing"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint RayGenerationKHR 4 "main" 11 21
EntryPoint RayGenerationKHR 4 "main" 11 21 29 39 52
Source GLSL 460
SourceExtension "GL_EXT_ray_tracing"
Name 4 "main"
@@ -29,7 +29,7 @@ spv.ext.RayGenShader11.rgen
Decorate 29(accEXT) Binding 0
MemberDecorate 37(block) 0 Offset 0
MemberDecorate 37(block) 1 Offset 16
Decorate 37(block) BufferBlock
Decorate 37(block) Block
Decorate 52(payload) Location 0
2: TypeVoid
3: TypeFunction 2

6
Test/baseResults/spv.ext.RayGenShaderArray.rgen.out
View File

@@ -1,5 +1,5 @@
spv.ext.RayGenShaderArray.rgen
// Module Version 10000
// Module Version 10400
// Generated by (magic number): 80008
// Id's are bound by 89
@@ -10,7 +10,7 @@ spv.ext.RayGenShaderArray.rgen
Extension "SPV_KHR_ray_tracing"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint RayGenerationKHR 4 "main" 11 21
EntryPoint RayGenerationKHR 4 "main" 11 21 30 36 60 88
Source GLSL 460
SourceExtension "GL_EXT_nonuniform_qualifier"
SourceExtension "GL_EXT_ray_tracing"
@@ -36,7 +36,7 @@ spv.ext.RayGenShaderArray.rgen
MemberDecorate 34(block) 0 Offset 0
MemberDecorate 34(block) 1 Offset 16
MemberDecorate 34(block) 2 Offset 28
Decorate 34(block) BufferBlock
Decorate 34(block) Block
Decorate 60(accEXT1) DescriptorSet 0
Decorate 60(accEXT1) Binding 1
Decorate 75 DecorationNonUniformEXT