Skip to content

Commit 79700d5

Browse files
Merge pull request #1262 from KhronosGroup/json-reflection-improvements
Reflection: Various improvements
2 parents 57b7022 + 762c87a commit 79700d5

20 files changed

Lines changed: 463 additions & 59 deletions

reference/shaders-reflection/asm/aliased-entry-point-names.asm.multi.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,19 @@
3434
"type" : "float",
3535
"array" : [
3636
1
37+
],
38+
"array_size_is_literal" : [
39+
true
3740
]
3841
},
3942
{
4043
"name" : "_m3",
4144
"type" : "float",
4245
"array" : [
4346
1
47+
],
48+
"array_size_is_literal" : [
49+
true
4450
]
4551
}
4652
]

reference/shaders-reflection/asm/op-source-glsl-ssbo-1.asm.comp.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@
2525
"array" : [
2626
0
2727
],
28-
"offset" : 0
28+
"array_size_is_literal" : [
29+
true
30+
],
31+
"offset" : 0,
32+
"array_stride" : 16
2933
}
3034
]
3135
}

reference/shaders-reflection/asm/op-source-glsl-ssbo-2.asm.comp.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@
2525
"array" : [
2626
0
2727
],
28-
"offset" : 0
28+
"array_size_is_literal" : [
29+
true
30+
],
31+
"offset" : 0,
32+
"array_stride" : 16
2933
}
3034
]
3135
},
@@ -38,7 +42,11 @@
3842
"array" : [
3943
0
4044
],
41-
"offset" : 0
45+
"array_size_is_literal" : [
46+
true
47+
],
48+
"offset" : 0,
49+
"array_stride" : 16
4250
}
4351
]
4452
}

reference/shaders-reflection/asm/op-source-hlsl-uav-1.asm.comp.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@
2525
"array" : [
2626
0
2727
],
28-
"offset" : 0
28+
"array_size_is_literal" : [
29+
true
30+
],
31+
"offset" : 0,
32+
"array_stride" : 16
2933
}
3034
]
3135
}

reference/shaders-reflection/asm/op-source-hlsl-uav-2.asm.comp.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@
2525
"array" : [
2626
0
2727
],
28-
"offset" : 0
28+
"array_size_is_literal" : [
29+
true
30+
],
31+
"offset" : 0,
32+
"array_stride" : 16
2933
}
3034
]
3135
}

reference/shaders-reflection/asm/op-source-none-ssbo-1.asm.comp.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@
2525
"array" : [
2626
0
2727
],
28-
"offset" : 0
28+
"array_size_is_literal" : [
29+
true
30+
],
31+
"offset" : 0,
32+
"array_stride" : 16
2933
}
3034
]
3135
}

reference/shaders-reflection/asm/op-source-none-ssbo-2.asm.comp.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@
2525
"array" : [
2626
0
2727
],
28-
"offset" : 0
28+
"array_size_is_literal" : [
29+
true
30+
],
31+
"offset" : 0,
32+
"array_stride" : 16
2933
}
3034
]
3135
},
@@ -38,7 +42,11 @@
3842
"array" : [
3943
0
4044
],
41-
"offset" : 0
45+
"array_size_is_literal" : [
46+
true
47+
],
48+
"offset" : 0,
49+
"array_stride" : 16
4250
}
4351
]
4452
}

reference/shaders-reflection/asm/op-source-none-uav-1.asm.comp.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@
2525
"array" : [
2626
0
2727
],
28-
"offset" : 0
28+
"array_size_is_literal" : [
29+
true
30+
],
31+
"offset" : 0,
32+
"array_stride" : 16
2933
}
3034
]
3135
}

reference/shaders-reflection/asm/op-source-none-uav-2.asm.comp.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@
2525
"array" : [
2626
0
2727
],
28-
"offset" : 0
28+
"array_size_is_literal" : [
29+
true
30+
],
31+
"offset" : 0,
32+
"array_stride" : 16
2933
}
3034
]
3135
}

reference/shaders-reflection/comp/struct-layout.comp.json

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
{
2323
"name" : "m",
2424
"type" : "mat4",
25-
"offset" : 0
25+
"offset" : 0,
26+
"matrix_stride" : 16
2627
}
2728
]
2829
},
@@ -35,7 +36,11 @@
3536
"array" : [
3637
0
3738
],
38-
"offset" : 0
39+
"array_size_is_literal" : [
40+
true
41+
],
42+
"offset" : 0,
43+
"array_stride" : 64
3944
}
4045
]
4146
},
@@ -48,7 +53,11 @@
4853
"array" : [
4954
0
5055
],
51-
"offset" : 0
56+
"array_size_is_literal" : [
57+
true
58+
],
59+
"offset" : 0,
60+
"array_stride" : 64
5261
}
5362
]
5463
}

0 commit comments

Comments
 (0)