AuroraMiddleware/SPIRV-Cross
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,696 Commits 1 Branch 0 Tags 17 MiB
eb89c3a428
Commit Graph

1696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chip Davis
eb89c3a428 MSL: Add support for tessellation control shaders. 
These are transpiled to kernel functions that write the output of the
shader to three buffers: one for per-vertex varyings, one for per-patch
varyings, and one for the tessellation levels. This structure is
mandated by the way Metal works, where the tessellation factors are
supplied to the draw method in their own buffer, while the per-patch and
per-vertex varyings are supplied as though they were vertex attributes;
since they have different step rates, they must be in separate buffers.

The kernel is expected to be run in a workgroup whose size is the
greater of the number of input or output control points. It uses Metal's
support for vertex-style stage input to a compute shader to get the
input values; therefore, at least one instance must run per input point.
Meanwhile, Vulkan mandates that it run at least once per output point.
Overrunning the output array is a concern, but any values written should
either be discarded or overwritten by subsequent patches. I'm probably
going to put some slop space in the buffer when I integrate this into
MoltenVK to be on the safe side.
 2019-02-07 08:51:22 -06:00
Hans-Kristian Arntzen
d9ed3dcc7a
Merge pull request #848 from cdavis5e/capture-output-buffer 
MSL: Add a setting to capture vertex shader output to a buffer.
 2019-02-07 15:11:41 +01:00
Chip Davis
ae87c41b96 Provide feedback on whether or not an output buffer is needed. 2019-02-06 17:22:12 -06:00
Chip Davis
056c0e207d Take the vertex count from any indirect parameters passed. 
This is necessary to deal with indirect draws, where the draw parameters
are given in a buffer instead of passed by the CPU. For normal draws,
the draw parameters are set with Metal's `setVertexBytes:` method.

This undoes the change to add the vertex count to the aux buffer,
rendering that entire discussion largely moot. Oh well. It was a
discussion that needed to happen anyway.
 2019-02-06 15:17:14 -06:00
Chip Davis
f55253dc1b On second thought, don't use a feature struct for the aux buffer. 2019-02-06 14:45:26 -06:00
Chip Davis
ea74e453e3 Use a macro instead of a field for the struct version. 2019-02-06 14:43:03 -06:00
Chip Davis
d86adbe550 Add a structure to hold optional members of the aux buffer. 
Programs can query the version to know what features are present, and
turn them on and off at will.
 2019-02-06 14:26:06 -06:00
Chip Davis
546f1ccbb5 Test that out variables still work in leaf functions with capture on. 2019-02-06 10:49:25 -06:00
Hans-Kristian Arntzen
12f02c3e26
Merge pull request #851 from KhronosGroup/remove-obsolete-build-systems 
Remove some obsolete build systems.
 2019-02-06 12:08:10 +01:00
Hans-Kristian Arntzen
e75f3b760f Remove some obsolete build systems. 
They are unmaintained and untested for years.
 2019-02-06 12:04:13 +01:00
Hans-Kristian Arntzen
d5385190ff
Merge pull request #850 from KhronosGroup/fix-846 
Support LUTs in single-function CFGs on Private storage class.
 2019-02-06 11:34:30 +01:00
Hans-Kristian Arntzen
5f2defc00f
Merge pull request #849 from cdavis5e/no-pass-aux-buffer 
MSL: Stop passing the aux buffer around.
 2019-02-06 10:41:29 +01:00
Hans-Kristian Arntzen
3e584f2c3f Support LUTs in single-function CFGs on Private storage class. 
Fairly common pattern in unoptimized SPIR-V. Support this case as well.
 2019-02-06 10:38:59 +01:00
Chip Davis
0757fae511 MSL: Stop passing the aux buffer around. 
Since we pass the component swizzle around now, there's no need to pass
it to every function that takes a sampled image.
 2019-02-05 20:04:32 -06:00
Chip Davis
c51e5b7911 MSL: Add a setting to capture vertex shader output to a buffer. 
This will be necessary to support transform feedback, as well as
tessellation shaders.
 2019-02-05 20:00:10 -06:00
Hans-Kristian Arntzen
84f56d0b43
Merge pull request #845 from cdavis5e/fix-assertions 
Move assertions after the check for equal types.
 2019-01-31 21:36:25 +01:00
Chip Davis
ef0b1fc841 Move assertions after the check for equal types. 
`bitcast_glsl_op()` is sometimes called for `Boolean` types, e.g. for
specialization constants. We don't want the assert to trip if this is
going to be a no-op anyway.
 2019-01-31 14:28:21 -06:00
Hans-Kristian Arntzen
0c0ceb9763
Merge pull request #844 from KhronosGroup/fix-783 
Add support for 8-bit arithmetic in GLSL and MSL
 2019-01-30 19:48:36 +01:00
Hans-Kristian Arntzen
fcbe999d99 MSL: Fix another test incompatibility. 2019-01-30 17:22:38 +01:00
Hans-Kristian Arntzen
b78ffa1cc7 Fixup MSL iOS test. 2019-01-30 16:26:41 +01:00
Hans-Kristian Arntzen
2ed171e525 GLSL/MSL: Implement 8-bit part of VK_KHR_shader_float16_int8. 
Storage was in place already, so mostly just dealing with bitcasts and
constants.

Simplies some of the bitcasting logic, and this exposed some bugs in the
implementation. Refactor to use correct width integers with explicit bitcast opcodes.
 2019-01-30 15:45:24 +01:00
Hans-Kristian Arntzen
2edee351f0 Run format_all.sh. 2019-01-30 13:42:50 +01:00
Hans-Kristian Arntzen
4e7777c443 Update to latest glslang/SPIRV-Tools. 
Fix various bugs along the way.
 2019-01-30 13:41:57 +01:00
Hans-Kristian Arntzen
8804152253
Merge pull request #843 from KhronosGroup/fix-826 
Support initializers on StorageClassOutput.
 2019-01-30 12:35:50 +01:00
Hans-Kristian Arntzen
3e09879131 Support initializers on StorageClassOutput. 2019-01-30 10:29:08 +01:00
Hans-Kristian Arntzen
a029d3faa1
Merge pull request #842 from KhronosGroup/fix-838 
MSL: Use correct alignment for structs which are members of other structs.
 2019-01-28 16:40:01 +01:00
Hans-Kristian Arntzen
5ff12d780b Run format_all.sh. 2019-01-28 15:20:30 +01:00
Hans-Kristian Arntzen
912fde95f1 MSL: Use correct size for structs. 
Need to align the size of structs to the natural alignment.
 2019-01-28 15:20:30 +01:00
Hans-Kristian Arntzen
217eb5b5f9 MSL: Add a preliminary check for bad arrays of structs. 
ArrayStride can be larger than the declared struct size.
We have no obvious solution for now, but warn about it in the MSL output
for the time being.
 2019-01-28 15:20:30 +01:00
Hans-Kristian Arntzen
8c632da461 MSL: Use correct alignment rule for whole structs. 
Structs are aligned as you would expect in MSL (maximum member
alignment), and it is not minimum 16 bytes like in std140.

Also rename the dummy "pad" members to a reserved naming scheme.
 2019-01-28 15:20:30 +01:00
Hans-Kristian Arntzen
1f124d0a81
Merge pull request #841 from KhronosGroup/fix-840 
HLSL/MSL: Fix texture projection with Dref.
 2019-01-28 11:37:36 +01:00
Hans-Kristian Arntzen
18a4accd2f HLSL/MSL: Fix texture projection with Dref. 
We need to divide the Dref by q.
 2019-01-28 10:25:13 +01:00
Hans-Kristian Arntzen
7430e78a8c
Merge pull request #836 from KhronosGroup/fix-834 
MSL: Deal with resource name aliasing.
 2019-01-18 17:18:59 +01:00
Hans-Kristian Arntzen
437fc87a89 MSL: Deal with resource name aliasing. 
Apparently we didn't use those yet. MSL seems to be able to alias struct
types and variable types to a degree, so that's why it has escaped
testing until now.
 2019-01-18 16:27:57 +01:00
Hans-Kristian Arntzen
1040cf6cc1
Merge pull request #831 from cdavis5e/force-recompile-hooks 
MSL: Hoist fixup hooks in entry_point_args() out of the compile loop.
 2019-01-17 19:42:05 +01:00
Chip Davis
f500d2f70c MSL: Hoist fixup hooks in entry_point_args() out of the compile loop. 
Otherwise, in the event of a forced recompile, we could end up adding
them twice.
 2019-01-17 10:18:38 -06:00
Hans-Kristian Arntzen
d322087d70
Merge pull request #833 from KhronosGroup/fix-829 
MSL: Fix image load/store for short vectors.
 2019-01-17 15:44:34 +01:00
Hans-Kristian Arntzen
3aa08f764e MSL: Fix image load/store for short vectors. 
Same fixes as for GLSL.
 2019-01-17 14:54:29 +01:00
Hans-Kristian Arntzen
522c4eea97
Merge pull request #832 from KhronosGroup/fix-828 
MSL: Support std140 packing rules for float[] and float2[]
 2019-01-17 14:30:06 +01:00
Hans-Kristian Arntzen
73d9da7070 Avoid unintentional name conflict with HLSL backend. 2019-01-17 12:21:16 +01:00
Hans-Kristian Arntzen
91519aaf00
Merge pull request #830 from cdavis5e/forced-signedness-var-ptr 
MSL: Fix some types I missed when implementing variable pointers.
 2019-01-17 11:54:39 +01:00
Hans-Kristian Arntzen
76bf6d0c34 Fixup some MSL comments. 2019-01-17 11:47:37 +01:00
Hans-Kristian Arntzen
432aaed737 Need to know the original packed type when unpacking loads. 2019-01-17 11:39:46 +01:00
Hans-Kristian Arntzen
40e7723051 Run format_all.sh. 2019-01-17 11:29:50 +01:00
Hans-Kristian Arntzen
f4b74f2f4f Add basic test for std140 small vector arrays. 2019-01-17 11:29:09 +01:00
Hans-Kristian Arntzen
de7e5ccd8b Refactor out packed expressions to extended decorations. 
Can't safely just cast to the original enum without lots of hacks.
 2019-01-17 11:28:51 +01:00
Hans-Kristian Arntzen
72377366d3 Replace custom use of DecorationCPacked with an explicit one. 
Will need to use more variants of this decoration, so might as well make
it clearer what is going on with CPacked.
 2019-01-17 10:36:56 +01:00
Hans-Kristian Arntzen
f4026a5618 Refactor access_chain_internal to be more readable from callsite. 2019-01-17 10:30:13 +01:00
Hans-Kristian Arntzen
15b52bee48 Deal with packing/unpacking on store. 
Still a bit buggy, since we cannot deduce between float2[] and
packed_float2. Need a deeper refactor to plumb this through ...
 2019-01-17 10:06:23 +01:00
Chip Davis
1d7d910765 MSL: Fix some types I missed when implementing variable pointers. 2019-01-16 16:15:57 -06:00