9 Commits

Author SHA1 Message Date
twinaphex
ceaa0259e5 Merge commit 'c8366b0b0f6ab996adcbcf1ee09a3ed6298e7d4e' 2018-07-06 05:17:39 +02:00
twinaphex
155f797ccb Merge commit '2da12dca5803c3dcde920a1cff838fd98aecb36f' 2018-07-04 22:51:43 +02:00
twinaphex
8a1c0be83c (Android) Another potential buildfix; define ENABLE_HLSL
(slang_process) Put HLSL/Cg code around ENABLE_HLSL ifdef
(SPIRV-Cross) Make sure macros no longer need to be redefined; make them
unique in both glsl and hlsl files; needed for Griffin builds
2018-06-26 13:18:17 +02:00
twinaphex
4fb79dfffe Merge commit '032829847454432a4b149452d6354c13c5888239' 2018-06-20 09:32:45 +02:00
aliaspider
ff6d24cbef (SPIRV-Cross) Merge commit 'f48c1800c0122e8e7957f572c359e4594932cd4c' 2018-03-06 04:11:59 +01:00
twinaphex
2963288b29 SPIRV-Cross and glslang will compile with Griffin/MSVC targets now 2018-02-04 14:21:34 +01:00
aliaspider
553f9b705e Merge commit '501fd33b6849de260c6a81fd9575c3aa8a01f7a5' as 'deps/SPIRV-Cross' 2018-02-02 11:53:59 +01:00
aliaspider
cd5852d3b0 use git subtree for deps/SPIRV-Cross 2018-02-02 11:53:23 +01:00
aliaspider
5af5222249 update SPIRV-Cross
- https://github.com/KhronosGroup/SPIRV-Cross/commit/
66a407285e36a0f772e3209cb86ded6e3d900f6a
2018-01-26 13:48:17 +01:00