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

Full stack: properly implement GL_EXT_device_group and GL_EXT_multiview.

Browse Source
This commit is contained in:
John Kessenich
2017-03-14 16:45:30 -06:00
parent 78cfba97e1
commit c08fb8ab9c
19 changed files with 319 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Test/baseResults/140.vert.out
View File

@@ -9,12 +9,16 @@ ERROR: 0:38: 'gl_ClipVertex' : cannot redeclare after use
ERROR: 0:39: 'gl_FogFragCoord' : cannot redeclare after use
ERROR: 0:51: 'texelFetch' : no matching overloaded function found
ERROR: 0:53: 'texture' : no matching overloaded function found
ERROR: 10 compilation errors. No code generated.
ERROR: 0:63: 'gl_DeviceIndex' : required extension not requested: GL_EXT_device_group
ERROR: 0:64: 'gl_ViewIndex' : required extension not requested: GL_EXT_multiview
ERROR: 12 compilation errors. No code generated.
Shader version: 140
Requested GL_ARB_explicit_attrib_location
Requested GL_ARB_separate_shader_objects
Requested GL_EXT_device_group
Requested GL_EXT_multiview
ERROR: node is still EOpNull!
0:9 Function Definition: main( (global void)
0:9 Function Parameters:
@@ -116,6 +120,16 @@ ERROR: node is still EOpNull!
0:58 Constant:
0:58 1 (const int)
0:58 2 (const int)
0:61 Function Definition: devi( (global void)
0:61 Function Parameters:
0:63 Sequence
0:63 'gl_DeviceIndex' (in int DeviceIndex)
0:64 'gl_ViewIndex' (in int ViewIndex)
0:75 Function Definition: devie( (global void)
0:75 Function Parameters:
0:77 Sequence
0:77 'gl_DeviceIndex' (in int DeviceIndex)
0:78 'gl_ViewIndex' (in int ViewIndex)
0:? Linker Objects
0:? 'sbuf' (uniform isamplerBuffer)
0:? 'anon@0' (layout(column_major std140 ) uniform block{layout(column_major std140 offset=0 ) uniform int anonMem})
@@ -142,6 +156,8 @@ Linked vertex stage:
Shader version: 140
Requested GL_ARB_explicit_attrib_location
Requested GL_ARB_separate_shader_objects
Requested GL_EXT_device_group
Requested GL_EXT_multiview
ERROR: node is still EOpNull!
0:9 Function Definition: main( (global void)
0:9 Function Parameters:

36
Test/baseResults/150.tesc.out
View File

@@ -232,11 +232,15 @@ ERROR: 0:87: 'location' : overlapping use of location 4
ERROR: 0:104: '' : precise qualifier must appear first
ERROR: 0:105: '' : precise qualifier must appear first
ERROR: 0:105: '' : precise qualifier must appear first
ERROR: 21 compilation errors. No code generated.
ERROR: 0:109: 'gl_DeviceIndex' : required extension not requested: GL_EXT_device_group
ERROR: 0:110: 'gl_ViewIndex' : required extension not requested: GL_EXT_multiview
ERROR: 23 compilation errors. No code generated.
Shader version: 400
Requested GL_ARB_separate_shader_objects
Requested GL_EXT_device_group
Requested GL_EXT_multiview
vertices = 4
ERROR: node is still EOpNull!
0:13 Function Definition: main( (global void)
@@ -408,6 +412,16 @@ ERROR: node is still EOpNull!
0:97 'd' (noContraction temp double)
0:97 'd' (noContraction temp double)
0:97 'd' (noContraction temp double)
0:107 Function Definition: devi( (global void)
0:107 Function Parameters:
0:109 Sequence
0:109 'gl_DeviceIndex' (in int DeviceIndex)
0:110 'gl_ViewIndex' (in int ViewIndex)
0:121 Function Definition: devie( (global void)
0:121 Function Parameters:
0:123 Sequence
0:123 'gl_DeviceIndex' (in int DeviceIndex)
0:124 'gl_ViewIndex' (in int ViewIndex)
0:? Linker Objects
0:? 'gl_out' (out 4-element array of block{out 4-component vector of float Position gl_Position, out float PointSize gl_PointSize, out implicitly-sized array of float ClipDistance gl_ClipDistance})
0:? 'outa' (global 4-element array of int)
@@ -459,11 +473,15 @@ ERROR: 0:86: '[]' : tessellation input array size must be gl_MaxPatchVertices or
ERROR: 0:96: 'location' : overlapping use of location 24
ERROR: 0:99: 'location' : overlapping use of location 24
ERROR: 0:101: 'gl_TessLevelOuter' : identifiers starting with "gl_" are reserved
ERROR: 30 compilation errors. No code generated.
ERROR: 0:109: 'gl_DeviceIndex' : required extension not requested: GL_EXT_device_group
ERROR: 0:110: 'gl_ViewIndex' : required extension not requested: GL_EXT_multiview
ERROR: 32 compilation errors. No code generated.
Shader version: 400
Requested GL_ARB_separate_shader_objects
Requested GL_EXT_device_group
Requested GL_EXT_multiview
input primitive = quads
vertex spacing = fractional_odd_spacing
triangle order = cw
@@ -559,6 +577,16 @@ ERROR: node is still EOpNull!
0:44 Constant:
0:44 2 (const int)
0:44 'cd' (temp float)
0:107 Function Definition: devi( (global void)
0:107 Function Parameters:
0:109 Sequence
0:109 'gl_DeviceIndex' (in int DeviceIndex)
0:110 'gl_ViewIndex' (in int ViewIndex)
0:121 Function Definition: devie( (global void)
0:121 Function Parameters:
0:123 Sequence
0:123 'gl_DeviceIndex' (in int DeviceIndex)
0:124 'gl_ViewIndex' (in int ViewIndex)
0:? Linker Objects
0:? 'patchIn' (patch in 4-component vector of float)
0:? 'patchOut' (patch out 4-component vector of float)
@@ -952,6 +980,8 @@ ERROR: Linking tessellation evaluation stage: Multiple function bodies in multip
Shader version: 420
Requested GL_ARB_separate_shader_objects
Requested GL_ARB_tessellation_shader
Requested GL_EXT_device_group
Requested GL_EXT_multiview
vertices = 4
0:? Sequence
0:10 Function Definition: main( (global void)
@@ -1277,6 +1307,8 @@ vertices = 4
Shader version: 420
Requested GL_ARB_separate_shader_objects
Requested GL_ARB_tessellation_shader
Requested GL_EXT_device_group
Requested GL_EXT_multiview
input primitive = quads
vertex spacing = fractional_odd_spacing
triangle order = cw

17
Test/baseResults/310.comp.out
View File

@@ -81,10 +81,14 @@ ERROR: 0:227: 'input block' : not supported in this stage: compute
ERROR: 0:231: 'output block' : not supported in this stage: compute
WARNING: 0:235: 't__' : identifiers containing consecutive underscores ("__") are reserved
WARNING: 0:238: '#define' : names containing consecutive underscores are reserved: __D
ERROR: 79 compilation errors. No code generated.
ERROR: 0:244: 'gl_DeviceIndex' : required extension not requested: GL_EXT_device_group
ERROR: 0:245: 'gl_ViewIndex' : undeclared identifier
ERROR: 0:255: 'gl_ViewIndex' : undeclared identifier
ERROR: 82 compilation errors. No code generated.
Shader version: 310
Requested GL_EXT_device_group
local_size = (2, 1, 4096)
ERROR: node is still EOpNull!
0:27 Function Definition: main( (global void)
@@ -443,6 +447,16 @@ ERROR: node is still EOpNull!
0:224 0 (const int)
0:224 Constant:
0:224 2 (const int)
0:242 Function Definition: devi( (global void)
0:242 Function Parameters:
0:244 Sequence
0:244 'gl_DeviceIndex' (in highp int DeviceIndex)
0:245 'gl_ViewIndex' (temp float)
0:252 Function Definition: devie( (global void)
0:252 Function Parameters:
0:254 Sequence
0:254 'gl_DeviceIndex' (in highp int DeviceIndex)
0:255 'gl_ViewIndex' (temp float)
0:? Linker Objects
0:? 'gl_WorkGroupSize' (const highp 3-component vector of uint WorkGroupSize)
0:? 2 (const uint)
@@ -512,6 +526,7 @@ Linked compute stage:
Shader version: 310
Requested GL_EXT_device_group
local_size = (2, 1, 4096)
ERROR: node is still EOpNull!
0:27 Function Definition: main( (global void)

18
Test/baseResults/310.frag.out
View File

@@ -133,10 +133,14 @@ ERROR: 0:427: 'blend equation' : can only apply to a standalone qualifier
ERROR: 0:428: 'blend equation' : can only apply to a standalone qualifier
ERROR: 0:429: 'blend_support' : unknown blend equation
ERROR: 0:431: 'fragment-shader array-of-array output' : not supported with this profile: es
ERROR: 125 compilation errors. No code generated.
ERROR: 0:435: 'gl_DeviceIndex' : required extension not requested: GL_EXT_device_group
ERROR: 0:436: 'gl_ViewIndex' : required extension not requested: GL_EXT_multiview
ERROR: 127 compilation errors. No code generated.
Shader version: 310
Requested GL_EXT_device_group
Requested GL_EXT_multiview
Requested GL_EXT_shader_io_blocks
Requested GL_EXT_texture_cube_map_array
Requested GL_KHR_blend_equation_advanced
@@ -916,6 +920,16 @@ ERROR: node is still EOpNull!
0:428 Function Definition: blendFoo(vf3; (global void)
0:428 Function Parameters:
0:428 'v' (in mediump 3-component vector of float)
0:433 Function Definition: devi( (global void)
0:433 Function Parameters:
0:435 Sequence
0:435 'gl_DeviceIndex' (flat in highp int DeviceIndex)
0:436 'gl_ViewIndex' (flat in highp int ViewIndex)
0:447 Function Definition: devie( (global void)
0:447 Function Parameters:
0:449 Sequence
0:449 'gl_DeviceIndex' (flat in highp int DeviceIndex)
0:450 'gl_ViewIndex' (flat in highp int ViewIndex)
0:? Linker Objects
0:? 'gl_FragCoord' (smooth in mediump 4-component vector of float)
0:? 'v3' (layout(location=2 ) smooth in mediump 3-component vector of float)
@@ -1017,6 +1031,8 @@ Linked fragment stage:
ERROR: Linking fragment stage: when more than one fragment shader output, all must have location qualifiers
Shader version: 310
Requested GL_EXT_device_group
Requested GL_EXT_multiview
Requested GL_EXT_shader_io_blocks
Requested GL_EXT_texture_cube_map_array
Requested GL_KHR_blend_equation_advanced

18
Test/baseResults/400.tesc.out
View File

@@ -21,11 +21,15 @@ ERROR: 0:87: 'location' : overlapping use of location 4
ERROR: 0:104: '' : precise qualifier must appear first
ERROR: 0:105: '' : precise qualifier must appear first
ERROR: 0:105: '' : precise qualifier must appear first
ERROR: 21 compilation errors. No code generated.
ERROR: 0:109: 'gl_DeviceIndex' : required extension not requested: GL_EXT_device_group
ERROR: 0:110: 'gl_ViewIndex' : required extension not requested: GL_EXT_multiview
ERROR: 23 compilation errors. No code generated.
Shader version: 400
Requested GL_ARB_separate_shader_objects
Requested GL_EXT_device_group
Requested GL_EXT_multiview
vertices = 4
ERROR: node is still EOpNull!
0:13 Function Definition: main( (global void)
@@ -197,6 +201,16 @@ ERROR: node is still EOpNull!
0:97 'd' (noContraction temp double)
0:97 'd' (noContraction temp double)
0:97 'd' (noContraction temp double)
0:107 Function Definition: devi( (global void)
0:107 Function Parameters:
0:109 Sequence
0:109 'gl_DeviceIndex' (in int DeviceIndex)
0:110 'gl_ViewIndex' (in int ViewIndex)
0:121 Function Definition: devie( (global void)
0:121 Function Parameters:
0:123 Sequence
0:123 'gl_DeviceIndex' (in int DeviceIndex)
0:124 'gl_ViewIndex' (in int ViewIndex)
0:? Linker Objects
0:? 'gl_out' (out 4-element array of block{out 4-component vector of float Position gl_Position, out float PointSize gl_PointSize, out implicitly-sized array of float ClipDistance gl_ClipDistance})
0:? 'outa' (global 4-element array of int)
@@ -222,6 +236,8 @@ Linked tessellation control stage:
Shader version: 400
Requested GL_ARB_separate_shader_objects
Requested GL_EXT_device_group
Requested GL_EXT_multiview
vertices = 4
ERROR: node is still EOpNull!
0:13 Function Definition: main( (global void)

18
Test/baseResults/400.tese.out
View File

@@ -30,11 +30,15 @@ ERROR: 0:86: '[]' : tessellation input array size must be gl_MaxPatchVertices or
ERROR: 0:96: 'location' : overlapping use of location 24
ERROR: 0:99: 'location' : overlapping use of location 24
ERROR: 0:101: 'gl_TessLevelOuter' : identifiers starting with "gl_" are reserved
ERROR: 30 compilation errors. No code generated.
ERROR: 0:109: 'gl_DeviceIndex' : required extension not requested: GL_EXT_device_group
ERROR: 0:110: 'gl_ViewIndex' : required extension not requested: GL_EXT_multiview
ERROR: 32 compilation errors. No code generated.
Shader version: 400
Requested GL_ARB_separate_shader_objects
Requested GL_EXT_device_group
Requested GL_EXT_multiview
input primitive = quads
vertex spacing = fractional_odd_spacing
triangle order = cw
@@ -130,6 +134,16 @@ ERROR: node is still EOpNull!
0:44 Constant:
0:44 2 (const int)
0:44 'cd' (temp float)
0:107 Function Definition: devi( (global void)
0:107 Function Parameters:
0:109 Sequence
0:109 'gl_DeviceIndex' (in int DeviceIndex)
0:110 'gl_ViewIndex' (in int ViewIndex)
0:121 Function Definition: devie( (global void)
0:121 Function Parameters:
0:123 Sequence
0:123 'gl_DeviceIndex' (in int DeviceIndex)
0:124 'gl_ViewIndex' (in int ViewIndex)
0:? Linker Objects
0:? 'patchIn' (patch in 4-component vector of float)
0:? 'patchOut' (patch out 4-component vector of float)
@@ -160,6 +174,8 @@ Linked tessellation evaluation stage:
Shader version: 400
Requested GL_ARB_separate_shader_objects
Requested GL_EXT_device_group
Requested GL_EXT_multiview
input primitive = quads
vertex spacing = fractional_odd_spacing
triangle order = cw

21
Test/baseResults/spv.310.comp.out
View File

@@ -3,14 +3,17 @@ Warning, version 310 is not yet complete; most version-specific features are pre
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 67
// Id's are bound by 69
Capability Shader
Capability DeviceGroup
Extension "SPV_KHR_device_group"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint GLCompute 4 "main" 53
EntryPoint GLCompute 4 "main" 53 64
ExecutionMode 4 LocalSize 16 32 4
Source ESSL 310
SourceExtension "GL_EXT_device_group"
Name 4 "main"
Name 13 "outb"
MemberName 13(outb) 0 "f"
@@ -29,6 +32,7 @@ Warning, version 310 is not yet complete; most version-specific features are pre
MemberName 48(outs) 1 "va"
Name 50 "outnames"
Name 53 "gl_LocalInvocationID"
Name 64 "gl_DeviceIndex"
Decorate 12 ArrayStride 16
MemberDecorate 13(outb) 0 Offset 0
MemberDecorate 13(outb) 1 Offset 4
@@ -46,7 +50,8 @@ Warning, version 310 is not yet complete; most version-specific features are pre
Decorate 48(outs) BufferBlock
Decorate 50(outnames) DescriptorSet 0
Decorate 53(gl_LocalInvocationID) BuiltIn LocalInvocationId
Decorate 66 BuiltIn WorkgroupSize
Decorate 64(gl_DeviceIndex) BuiltIn DeviceIndex
Decorate 68 BuiltIn WorkgroupSize
2: TypeVoid
3: TypeFunction 2
6: TypeInt 32 0
@@ -87,10 +92,12 @@ Warning, version 310 is not yet complete; most version-specific features are pre
53(gl_LocalInvocationID): 52(ptr) Variable Input
54: TypePointer Input 6(int)
61: TypePointer Uniform 16(int)
63: 6(int) Constant 16
64: 6(int) Constant 32
65: 6(int) Constant 4
66: 51(ivec3) ConstantComposite 63 64 65
63: TypePointer Input 16(int)
64(gl_DeviceIndex): 63(ptr) Variable Input
65: 6(int) Constant 16
66: 6(int) Constant 32
67: 6(int) Constant 4
68: 51(ivec3) ConstantComposite 65 66 67
4(main): 2 Function None 3
5: Label
ControlBarrier 7 8 9

7
Test/baseResults/spv.deviceGroup.frag.out
View File

@@ -10,13 +10,14 @@ Warning, version 450 is not yet complete; most version-specific features are pre
Extension "SPV_KHR_device_group"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 9
EntryPoint Fragment 4 "main" 9 12
ExecutionMode 4 OriginUpperLeft
Source GLSL 450
SourceExtension "GL_EXT_device_group"
Name 4 "main"
Name 9 "color"
Name 12 "gl_DeviceIndex"
Decorate 12(gl_DeviceIndex) Flat
Decorate 12(gl_DeviceIndex) BuiltIn DeviceIndex
2: TypeVoid
3: TypeFunction 2
@@ -25,8 +26,8 @@ Warning, version 450 is not yet complete; most version-specific features are pre
8: TypePointer Output 7(fvec4)
9(color): 8(ptr) Variable Output
10: TypeInt 32 1
11: TypePointer UniformConstant 10(int)
12(gl_DeviceIndex): 11(ptr) Variable UniformConstant
11: TypePointer Input 10(int)
12(gl_DeviceIndex): 11(ptr) Variable Input
15: 6(float) Constant 0
4(main): 2 Function None 3
5: Label

7
Test/baseResults/spv.multiView.frag.out
View File

@@ -10,13 +10,14 @@ Warning, version 450 is not yet complete; most version-specific features are pre
Extension "SPV_KHR_multiview"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 9
EntryPoint Fragment 4 "main" 9 12
ExecutionMode 4 OriginUpperLeft
Source GLSL 450
SourceExtension "GL_EXT_multiview"
Name 4 "main"
Name 9 "color"
Name 12 "gl_ViewIndex"
Decorate 12(gl_ViewIndex) Flat
Decorate 12(gl_ViewIndex) BuiltIn ViewIndex
2: TypeVoid
3: TypeFunction 2
@@ -25,8 +26,8 @@ Warning, version 450 is not yet complete; most version-specific features are pre
8: TypePointer Output 7(fvec4)
9(color): 8(ptr) Variable Output
10: TypeInt 32 1
11: TypePointer UniformConstant 10(int)
12(gl_ViewIndex): 11(ptr) Variable UniformConstant
11: TypePointer Input 10(int)
12(gl_ViewIndex): 11(ptr) Variable Input
15: 6(float) Constant 0
4(main): 2 Function None 3
5: Label