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

glslang -> SPV: Use the new TBuiltInVariable instead of string compares to get the type of SPV built in. Also fixed gl_FragData and gl_PrimitiveIDIn.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@31226 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2015-05-18 23:25:32 +00:00
parent dff18a2be0
commit 40e391184c
10 changed files with 81 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Test/baseResults/150.geom.out
View File

@@ -109,7 +109,7 @@ ERROR: node is still EOpNull!
0:35 1 (const int)
0:36 move second child to first child (temp int)
0:36 'gl_PrimitiveID' (layout(stream=0 ) out int PrimitiveID)
0:36 'gl_PrimitiveIDIn' (in int)
0:36 'gl_PrimitiveIDIn' (in int PrimitiveID)
0:37 move second child to first child (temp int)
0:37 'gl_Layer' (layout(stream=0 ) out int Layer)
0:37 Constant:
@@ -250,7 +250,7 @@ ERROR: node is still EOpNull!
0:35 1 (const int)
0:36 move second child to first child (temp int)
0:36 'gl_PrimitiveID' (layout(stream=0 ) out int PrimitiveID)
0:36 'gl_PrimitiveIDIn' (in int)
0:36 'gl_PrimitiveIDIn' (in int PrimitiveID)
0:37 move second child to first child (temp int)
0:37 'gl_Layer' (layout(stream=0 ) out int Layer)
0:37 Constant:

8
Test/baseResults/330.frag.out
View File

@@ -47,8 +47,8 @@ ERROR: node is still EOpNull!
0:10 'gl_FragColor' (fragColor 4-component vector of float FragColor)
0:10 'varyingVar' (smooth in 4-component vector of float)
0:11 move second child to first child (temp 4-component vector of float)
0:11 direct index (temp 4-component vector of float)
0:11 'gl_FragData' (fragColor 32-element array of 4-component vector of float)
0:11 direct index (temp 4-component vector of float FragData)
0:11 'gl_FragData' (fragColor 32-element array of 4-component vector of float FragData)
0:11 Constant:
0:11 1 (const int)
0:11 'inVar' (smooth in 4-component vector of float)
@@ -120,8 +120,8 @@ ERROR: node is still EOpNull!
0:10 'gl_FragColor' (fragColor 4-component vector of float FragColor)
0:10 'varyingVar' (smooth in 4-component vector of float)
0:11 move second child to first child (temp 4-component vector of float)
0:11 direct index (temp 4-component vector of float)
0:11 'gl_FragData' (fragColor 32-element array of 4-component vector of float)
0:11 direct index (temp 4-component vector of float FragData)
0:11 'gl_FragData' (fragColor 32-element array of 4-component vector of float FragData)
0:11 Constant:
0:11 1 (const int)
0:11 'inVar' (smooth in 4-component vector of float)

8
Test/baseResults/330comp.frag.out
View File

@@ -9,8 +9,8 @@ Shader version: 330
0:10 'gl_FragColor' (fragColor 4-component vector of float FragColor)
0:10 'varyingVar' (smooth in 4-component vector of float)
0:11 move second child to first child (temp 4-component vector of float)
0:11 direct index (temp 4-component vector of float)
0:11 'gl_FragData' (fragColor 32-element array of 4-component vector of float)
0:11 direct index (temp 4-component vector of float FragData)
0:11 'gl_FragData' (fragColor 32-element array of 4-component vector of float FragData)
0:11 Constant:
0:11 1 (const int)
0:11 vector-times-matrix (temp 4-component vector of float)
@@ -35,8 +35,8 @@ Shader version: 330
0:10 'gl_FragColor' (fragColor 4-component vector of float FragColor)
0:10 'varyingVar' (smooth in 4-component vector of float)
0:11 move second child to first child (temp 4-component vector of float)
0:11 direct index (temp 4-component vector of float)
0:11 'gl_FragData' (fragColor 32-element array of 4-component vector of float)
0:11 direct index (temp 4-component vector of float FragData)
0:11 'gl_FragData' (fragColor 32-element array of 4-component vector of float FragData)
0:11 Constant:
0:11 1 (const int)
0:11 vector-times-matrix (temp 4-component vector of float)

24
Test/baseResults/array.frag.out
View File

@@ -127,8 +127,8 @@ ERROR: node is still EOpNull!
0:43 Function Call: foo(f1[5]; (global 4-element array of float)
0:43 'u' (temp 5-element array of float)
0:45 move second child to first child (temp 4-component vector of float)
0:45 direct index (temp 4-component vector of float)
0:45 'gl_FragData' (fragColor 32-element array of 4-component vector of float)
0:45 direct index (temp 4-component vector of float FragData)
0:45 'gl_FragData' (fragColor 32-element array of 4-component vector of float FragData)
0:45 Constant:
0:45 1000 (const int)
0:45 Constant:
@@ -137,8 +137,8 @@ ERROR: node is still EOpNull!
0:45 1.000000
0:45 1.000000
0:46 move second child to first child (temp 4-component vector of float)
0:46 direct index (temp 4-component vector of float)
0:46 'gl_FragData' (fragColor 32-element array of 4-component vector of float)
0:46 direct index (temp 4-component vector of float FragData)
0:46 'gl_FragData' (fragColor 32-element array of 4-component vector of float FragData)
0:46 Constant:
0:46 -1 (const int)
0:46 Constant:
@@ -147,8 +147,8 @@ ERROR: node is still EOpNull!
0:46 1.000000
0:46 1.000000
0:47 move second child to first child (temp 4-component vector of float)
0:47 direct index (temp 4-component vector of float)
0:47 'gl_FragData' (fragColor 32-element array of 4-component vector of float)
0:47 direct index (temp 4-component vector of float FragData)
0:47 'gl_FragData' (fragColor 32-element array of 4-component vector of float FragData)
0:47 Constant:
0:47 3 (const int)
0:47 Constant:
@@ -371,8 +371,8 @@ ERROR: node is still EOpNull!
0:43 Function Call: foo(f1[5]; (global 4-element array of float)
0:43 'u' (temp 5-element array of float)
0:45 move second child to first child (temp 4-component vector of float)
0:45 direct index (temp 4-component vector of float)
0:45 'gl_FragData' (fragColor 32-element array of 4-component vector of float)
0:45 direct index (temp 4-component vector of float FragData)
0:45 'gl_FragData' (fragColor 32-element array of 4-component vector of float FragData)
0:45 Constant:
0:45 1000 (const int)
0:45 Constant:
@@ -381,8 +381,8 @@ ERROR: node is still EOpNull!
0:45 1.000000
0:45 1.000000
0:46 move second child to first child (temp 4-component vector of float)
0:46 direct index (temp 4-component vector of float)
0:46 'gl_FragData' (fragColor 32-element array of 4-component vector of float)
0:46 direct index (temp 4-component vector of float FragData)
0:46 'gl_FragData' (fragColor 32-element array of 4-component vector of float FragData)
0:46 Constant:
0:46 -1 (const int)
0:46 Constant:
@@ -391,8 +391,8 @@ ERROR: node is still EOpNull!
0:46 1.000000
0:46 1.000000
0:47 move second child to first child (temp 4-component vector of float)
0:47 direct index (temp 4-component vector of float)
0:47 'gl_FragData' (fragColor 32-element array of 4-component vector of float)
0:47 direct index (temp 4-component vector of float FragData)
0:47 'gl_FragData' (fragColor 32-element array of 4-component vector of float FragData)
0:47 Constant:
0:47 3 (const int)
0:47 Constant:

24
Test/baseResults/array100.frag.out
View File

@@ -99,8 +99,8 @@ ERROR: node is still EOpNull!
0:36 Function Call: foo(f1[5]; (global 4-element array of mediump float)
0:36 'u' (temp 5-element array of mediump float)
0:38 move second child to first child (temp mediump 4-component vector of float)
0:38 direct index (temp mediump 4-component vector of float)
0:38 'gl_FragData' (fragColor 32-element array of mediump 4-component vector of float)
0:38 direct index (temp mediump 4-component vector of float FragData)
0:38 'gl_FragData' (fragColor 32-element array of mediump 4-component vector of float FragData)
0:38 Constant:
0:38 1000 (const int)
0:38 Constant:
@@ -109,8 +109,8 @@ ERROR: node is still EOpNull!
0:38 1.000000
0:38 1.000000
0:39 move second child to first child (temp mediump 4-component vector of float)
0:39 direct index (temp mediump 4-component vector of float)
0:39 'gl_FragData' (fragColor 32-element array of mediump 4-component vector of float)
0:39 direct index (temp mediump 4-component vector of float FragData)
0:39 'gl_FragData' (fragColor 32-element array of mediump 4-component vector of float FragData)
0:39 Constant:
0:39 -1 (const int)
0:39 Constant:
@@ -119,8 +119,8 @@ ERROR: node is still EOpNull!
0:39 1.000000
0:39 1.000000
0:40 move second child to first child (temp mediump 4-component vector of float)
0:40 direct index (temp mediump 4-component vector of float)
0:40 'gl_FragData' (fragColor 32-element array of mediump 4-component vector of float)
0:40 direct index (temp mediump 4-component vector of float FragData)
0:40 'gl_FragData' (fragColor 32-element array of mediump 4-component vector of float FragData)
0:40 Constant:
0:40 3 (const int)
0:40 Constant:
@@ -236,8 +236,8 @@ ERROR: node is still EOpNull!
0:36 Function Call: foo(f1[5]; (global 4-element array of mediump float)
0:36 'u' (temp 5-element array of mediump float)
0:38 move second child to first child (temp mediump 4-component vector of float)
0:38 direct index (temp mediump 4-component vector of float)
0:38 'gl_FragData' (fragColor 32-element array of mediump 4-component vector of float)
0:38 direct index (temp mediump 4-component vector of float FragData)
0:38 'gl_FragData' (fragColor 32-element array of mediump 4-component vector of float FragData)
0:38 Constant:
0:38 1000 (const int)
0:38 Constant:
@@ -246,8 +246,8 @@ ERROR: node is still EOpNull!
0:38 1.000000
0:38 1.000000
0:39 move second child to first child (temp mediump 4-component vector of float)
0:39 direct index (temp mediump 4-component vector of float)
0:39 'gl_FragData' (fragColor 32-element array of mediump 4-component vector of float)
0:39 direct index (temp mediump 4-component vector of float FragData)
0:39 'gl_FragData' (fragColor 32-element array of mediump 4-component vector of float FragData)
0:39 Constant:
0:39 -1 (const int)
0:39 Constant:
@@ -256,8 +256,8 @@ ERROR: node is still EOpNull!
0:39 1.000000
0:39 1.000000
0:40 move second child to first child (temp mediump 4-component vector of float)
0:40 direct index (temp mediump 4-component vector of float)
0:40 'gl_FragData' (fragColor 32-element array of mediump 4-component vector of float)
0:40 direct index (temp mediump 4-component vector of float FragData)
0:40 'gl_FragData' (fragColor 32-element array of mediump 4-component vector of float FragData)
0:40 Constant:
0:40 3 (const int)
0:40 Constant:

8
Test/baseResults/dataOut.frag.out
View File

@@ -7,8 +7,8 @@ Shader version: 130
0:5 Function Parameters:
0:7 Sequence
0:7 move second child to first child (temp 4-component vector of float)
0:7 direct index (temp 4-component vector of float)
0:7 'gl_FragData' (fragColor 32-element array of 4-component vector of float)
0:7 direct index (temp 4-component vector of float FragData)
0:7 'gl_FragData' (fragColor 32-element array of 4-component vector of float FragData)
0:7 Constant:
0:7 1 (const int)
0:7 'Color' (smooth in 4-component vector of float)
@@ -25,8 +25,8 @@ Shader version: 130
0:5 Function Parameters:
0:7 Sequence
0:7 move second child to first child (temp 4-component vector of float)
0:7 direct index (temp 4-component vector of float)
0:7 'gl_FragData' (fragColor 32-element array of 4-component vector of float)
0:7 direct index (temp 4-component vector of float FragData)
0:7 'gl_FragData' (fragColor 32-element array of 4-component vector of float FragData)
0:7 Constant:
0:7 1 (const int)
0:7 'Color' (smooth in 4-component vector of float)

8
Test/baseResults/dataOutIndirect.frag.out
View File

@@ -7,8 +7,8 @@ Shader version: 130
0:7 Function Parameters:
0:9 Sequence
0:9 move second child to first child (temp 4-component vector of float)
0:9 indirect index (temp 4-component vector of float)
0:9 'gl_FragData' (fragColor 32-element array of 4-component vector of float)
0:9 indirect index (temp 4-component vector of float FragData)
0:9 'gl_FragData' (fragColor 32-element array of 4-component vector of float FragData)
0:9 'i' (uniform int)
0:9 'Color' (smooth in 4-component vector of float)
0:? Linker Objects
@@ -25,8 +25,8 @@ Shader version: 130
0:7 Function Parameters:
0:9 Sequence
0:9 move second child to first child (temp 4-component vector of float)
0:9 indirect index (temp 4-component vector of float)
0:9 'gl_FragData' (fragColor 32-element array of 4-component vector of float)
0:9 indirect index (temp 4-component vector of float FragData)
0:9 'gl_FragData' (fragColor 32-element array of 4-component vector of float FragData)
0:9 'i' (uniform int)
0:9 'Color' (smooth in 4-component vector of float)
0:? Linker Objects