Commit Graph

854 Commits

Author SHA1 Message Date
Bill Hollings
1014847f17 Fixes from review #3 of PR 321. 2017-11-10 16:40:33 -05:00
Bill Hollings
696bf0db0f Fixes from review #2 of PR 321. 2017-11-08 13:54:28 -05:00
Bill Hollings
2086274b62 spriv_msl.hpp fix casting warning when setting MSL version option. 2017-11-07 16:27:21 -05:00
Bill Hollings
6ea0dd95ea spriv_msl.hpp add explicit include of <limits>. 2017-11-07 15:53:20 -05:00
Bill Hollings
bac657d873 Fixes from review of PR 321. 2017-11-07 15:38:13 -05:00
Bill Hollings
c8ee17b740 Merge branch 'master' of https://github.com/KhronosGroup/SPIRV-Cross 2017-11-07 13:21:00 -05:00
Hans-Kristian Arntzen
886fa8129d
Merge pull request #319 from amerkoleci/fix_cast
Just minor warning fix when compiling under x64
2017-11-06 21:32:51 +01:00
Amer Koleci
3404ee1690 Fix to_plain_buffer_length cast. 2017-11-06 19:58:20 +01:00
Bill Hollings
42e718b77d Merge branch 'master' of https://github.com/KhronosGroup/SPIRV-Cross 2017-11-06 09:06:46 -05:00
Hans-Kristian Arntzen
42f9e76276
Merge pull request #318 from KhronosGroup/warning-fix
Fix some warnings on older GCC.
2017-11-06 10:12:55 +01:00
Hans-Kristian Arntzen
ca69b614e5 Fix some warnings on older GCC. 2017-11-06 09:49:52 +01:00
Bill Hollings
ba865733eb Merge branch 'master' of https://github.com/KhronosGroup/SPIRV-Cross 2017-11-05 22:49:08 -05:00
Bill Hollings
1c18078811 Enhancements to MSL compute and entry point naming.
Support Workgroup (threadgroup) variables.
Mark if SPIRConstant is used as an array length, since it cannot be specialized.
Resolve specialized array length constants.
Support passing an array to MSL function.
Support emitting GLSL array assignments in MSL via an array copy function.
Support for memory and control barriers.
Struct packing enhancements, including packing nested structs.
Enhancements to replacing illegal MSL variable and function names.
Add Compiler::get_entry_point_name_map() function to retrieve entry point renamings.
Remove CompilerGLSL::clean_func_name() as obsolete.
Fixes to types in bitcast MSL functions.
Add Variant::get_id() member function.
Add CompilerMSL::Options::msl_version option.
Add numerous MSL compute tests.
2017-11-05 21:34:42 -05:00
Hans-Kristian Arntzen
0d2d11c477
Merge pull request #315 from KhronosGroup/hlsl-matrix-ssbo
HLSL RWByteAddressBuffer support for row/column matrices
2017-10-30 09:22:57 +01:00
Hans-Kristian Arntzen
4a6d754f27 Run format_all.sh. 2017-10-26 17:43:03 +02:00
Hans-Kristian Arntzen
22e94913d4 Add test for row/col-major matrix read/write for HLSL. 2017-10-26 17:40:45 +02:00
Hans-Kristian Arntzen
afce030bf4 Add support for writing row/col-major matrices to RWByteAddressBuffer. 2017-10-26 17:16:32 +02:00
Hans-Kristian Arntzen
551424ce43 Support loading col/row-major matrices from ByteAddressBuffer. 2017-10-26 16:35:18 +02:00
Hans-Kristian Arntzen
43d178f780 Merge pull request #314 from KhronosGroup/fix-313
Rename nested Image struct type.
2017-10-24 10:51:19 +02:00
Hans-Kristian Arntzen
b91ddf5acf Merge pull request #311 from KhronosGroup/hlsl-image-load-store
HLSL image load/store, atomics, shared memory, barriers
2017-10-24 10:44:18 +02:00
Hans-Kristian Arntzen
afc2c0c8e6 Rename nested Image struct type.
Reuses an enum name as a struct type, creates friction for API wrappers.
2017-10-24 10:25:38 +02:00
Hans-Kristian Arntzen
2ba7ed1c09 Fix tests after rebase. 2017-10-24 09:56:08 +02:00
Hans-Kristian Arntzen
a95295cb23 Remap swizzle for HLSL and RWBuffer. 2017-10-24 09:55:25 +02:00
Hans-Kristian Arntzen
ab3f114120 Use remap_swizzle for image load-store more actively. 2017-10-24 09:55:25 +02:00
Hans-Kristian Arntzen
f4f497dc85 Run format_all.sh. 2017-10-24 09:55:25 +02:00
Hans-Kristian Arntzen
ae236e7056 Add GroupSync() in HLSL. 2017-10-24 09:55:25 +02:00
Hans-Kristian Arntzen
85eb972259 Add some HLSL tests for atomics and image load store. 2017-10-24 09:55:25 +02:00
Hans-Kristian Arntzen
044d3c8911 Basic image load store and atomics. 2017-10-24 09:55:25 +02:00
Hans-Kristian Arntzen
e620c99c04 Merge pull request #312 from rossy/hlsl-static-spec-const
Use 'static const' for spec constants in HLSL
2017-10-21 13:43:38 +02:00
James Ross-Gowan
1f16f0d260 Use 'static const' for spec constants in HLSL
If 'const' is used, the shader expects the variable to be backed by a
constant buffer. 'static const' is probably preferred for a value that
is initialized with a constant in the HLSL source code.

FXC also emits a warning for 'const' variables with initializers, since
'static const' was probably intended.
2017-10-21 19:19:32 +11:00
Hans-Kristian Arntzen
129d8b534f Merge pull request #309 from KhronosGroup/fix-308
Do not emit layout(location) for fragment output pre-330.
2017-10-19 16:48:36 +02:00
Hans-Kristian Arntzen
f4d23cd779 Also check IO location for blocks. 2017-10-19 14:17:18 +02:00
Hans-Kristian Arntzen
b5938e0538 Do not emit layout(location) for fragment output pre-330. 2017-10-19 10:31:48 +02:00
Hans-Kristian Arntzen
cbcf7a4eeb Merge pull request #306 from KhronosGroup/fix-305
Only emit layout() on vertex inputs in version 330/300 es.
2017-10-18 11:01:24 +02:00
Hans-Kristian Arntzen
712084b5b2 Only emit layout() on vertex inputs in version 330/300 es. 2017-10-18 09:56:13 +02:00
Hans-Kristian Arntzen
0cabdcb7c2 Merge pull request #304 from KhronosGroup/buffer-packing-improvements
Overhaul buffer packing in HLSL and GLSL
2017-10-11 09:27:14 +02:00
Hans-Kristian Arntzen
d48876ac41 Add test for stripped cbuffer members. 2017-10-10 17:40:37 +02:00
Hans-Kristian Arntzen
94ff355812 Fix some naming issues for stripped and flattened structs. 2017-10-10 17:32:26 +02:00
Hans-Kristian Arntzen
1ec1bec296 Try to fix Travis on OSX. 2017-10-10 16:38:56 +02:00
Hans-Kristian Arntzen
c68c72c5be Fix ARB_enhanced_layout test. 2017-10-10 16:25:47 +02:00
Hans-Kristian Arntzen
7464232f67 Run format_all.sh. 2017-10-10 16:13:03 +02:00
Hans-Kristian Arntzen
620d01c5d6 Generate decorations for row_major/column_major in HLSL. 2017-10-10 16:11:25 +02:00
Hans-Kristian Arntzen
6feff98295 Update HLSL cbuffer tests. 2017-10-10 15:37:53 +02:00
Hans-Kristian Arntzen
b9814a09bc Add more robust HLSL packing support. 2017-10-10 15:23:07 +02:00
Hans-Kristian Arntzen
f0200bb18d Use packoffset in HLSL.
Rewrite how cbuffers are emitted.
2017-10-10 13:15:49 +02:00
Hans-Kristian Arntzen
a8e991dec6 Run format_all.sh. 2017-10-10 11:31:05 +02:00
Hans-Kristian Arntzen
4d11220aa8 Add a test for enhanced layouts. 2017-10-10 11:30:29 +02:00
Hans-Kristian Arntzen
5a89606f26 Add support for GL_ARB_enhanced_layouts. 2017-10-10 11:05:46 +02:00
Hans-Kristian Arntzen
1079e7930b Run format_all.sh. 2017-10-10 10:22:40 +02:00
Hans-Kristian Arntzen
6a7b95d2d6 Validate that std140 packing can actually be used. 2017-10-10 10:12:27 +02:00