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

glslang -> SPV: swap arguments as needed for OpVectorTimesScalar and OpMatrixTimesScalar, and check for correct types for those as well as OpMatrixTimesVector, OpVectorTimesMatrix, and OpMatrixTimesMatrix.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@31486 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2015-06-13 00:48:48 +00:00
parent 8d64d44c3f
commit e5e0f6e37a
8 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Test/baseResults/spv.100ops.frag.out
View File

@@ -73,7 +73,7 @@ Linked fragment stage:
39: 16(int) Load 18(z)
40: 7(float) ConvertSToF 39
41: 35(fvec4) CompositeConstruct 40 40 40 40
42: 35(fvec4) VectorTimesScalar 38 41
42: 35(fvec4) VectorTimesScalar 41 38
43: 7(float) FunctionCall 9(foo()
44: 35(fvec4) CompositeConstruct 43 43 43 43
45: 35(fvec4) FAdd 42 44

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

@@ -127,12 +127,12 @@ Linked geometry stage:
EmitVertex
55: 20(ptr) AccessChain 19(fromV) 13 13
56: 8(fvec3) Load 55
57: 8(fvec3) VectorTimesScalar 54 56
57: 8(fvec3) VectorTimesScalar 56 54
58: 23(ptr) AccessChain 11 13
Store 58 57
59: 35(ptr) AccessChain 34(gl_in) 13 13
60: 25(fvec4) Load 59
61: 25(fvec4) VectorTimesScalar 54 60
61: 25(fvec4) VectorTimesScalar 60 54
62: 38(ptr) AccessChain 30 13
Store 62 61
63: 42(ptr) AccessChain 34(gl_in) 41 40

2
Test/baseResults/spv.prepost.frag.out
View File

@@ -145,7 +145,7 @@ Linked fragment stage:
Store 74(v) 91
94: 11(float) Load 67(z)
95: 72(fvec4) Load 74(v)
96: 72(fvec4) VectorTimesScalar 94 95
96: 72(fvec4) VectorTimesScalar 95 94
Store 93(gl_FragColor) 96
Branch 6
6: Label

2
Test/baseResults/spv.structAssignment.frag.out
View File

@@ -90,7 +90,7 @@ Linked fragment stage:
41: 38 Load 40(sampler)
45: 42(fvec2) Load 44(coord)
46: 30(fvec4) TextureSample 41 45
47: 30(fvec4) VectorTimesScalar 37 46
47: 30(fvec4) VectorTimesScalar 46 37
Store 32(gl_FragColor) 47
Branch 6
6: Label

2
Test/baseResults/spv.structDeref.frag.out
View File

@@ -185,7 +185,7 @@ Linked fragment stage:
114: 111 Load 113(sampler)
115: 60(fvec2) Load 62(coord)
116: 95(fvec4) TextureSample 114 115
117: 95(fvec4) VectorTimesScalar 110 116
117: 95(fvec4) VectorTimesScalar 116 110
Store 97(gl_FragColor) 117
Branch 6
6: Label

2
Test/baseResults/spv.structure.frag.out
View File

@@ -97,7 +97,7 @@ Linked fragment stage:
52: 49 Load 51(sampler)
56: 53(fvec2) Load 55(coord)
57: 17(fvec4) TextureSample 52 56
58: 17(fvec4) VectorTimesScalar 48 57
58: 17(fvec4) VectorTimesScalar 57 48
Store 47(gl_FragColor) 58
Branch 6
6: Label

2
Test/baseResults/spv.variableArrayIndex.frag.out
View File

@@ -118,7 +118,7 @@ Linked fragment stage:
60: 57 Load 59(sampler)
64: 61(fvec2) Load 63(coord)
65: 53(fvec4) TextureSample 60 64
66: 53(fvec4) VectorTimesScalar 56 65
66: 53(fvec4) VectorTimesScalar 65 56
Store 55(gl_FragColor) 66
70: 61(fvec2) Load 63(coord)
71: 13(float) Load 31(scale)