Commit Graph

1319 Commits

Author SHA1 Message Date
Hans-Kristian Arntzen
f1eacba244
Merge pull request #587 from zeux/master
Fix textureGrad compilation for legacy targets
2018-05-24 09:14:17 +01:00
Arseny Kapoulkine
91fd41816f Fix textureGrad compilation for legacy targets
textureGrad isn't part of core GL2 or GLES2. In desktop GL, it's
provided by GL_ARB_shader_texture_lod and is called texture2DGradARB; in
ES, it's provided by GL_EXT_shader_texture_lod and is called
texture2DGradEXT.

This change rewrites textureGrad similarly to textureProj as per above.
2018-05-23 14:06:37 -07:00
Hans-Kristian Arntzen
8cc1fdbb30
Merge pull request #586 from KhronosGroup/fix-584
Add support for inheriting bindings for combined image samplers.
2018-05-23 22:01:48 +01:00
Hans-Kristian Arntzen
ba15daee33 Add support for inheriting bindings for combined image samplers. 2018-05-23 20:34:26 +01:00
Hans-Kristian Arntzen
f929c361c5
Merge pull request #577 from KhronosGroup/fix-575
Fix atomic_compare_exchange_weak_explicit.
2018-05-16 11:09:12 +02:00
Hans-Kristian Arntzen
bcaae84c76 Deal with scoping for Private variables. 2018-05-16 10:49:30 +02:00
Hans-Kristian Arntzen
26b887ec99 Fix atomic_compare_exchange_weak_explicit.
Need to emit a CAS loop.
Fix shared memory declaration.
Declare atomic ops with correct memory scope.
2018-05-15 16:04:21 +02:00
Hans-Kristian Arntzen
62c6d2d498
Merge pull request #576 from KhronosGroup/fix-574
Fix OpSpecConstantComposite if it contains a SpecConstantOp.
2018-05-15 14:46:35 +02:00
Hans-Kristian Arntzen
fb7181bff1 Run format_all.sh. 2018-05-15 14:24:59 +02:00
Hans-Kristian Arntzen
c643addacd Only reflect spec constant if it actually has a constant ID. 2018-05-15 14:24:44 +02:00
Hans-Kristian Arntzen
991b655c72 Declare OpSpecConstantOp up-front on relevant targets.
Required, since spec constants can include results from constant ops.
2018-05-15 14:20:16 +02:00
Hans-Kristian Arntzen
0617b98613 Run format_all.sh. 2018-05-15 11:16:35 +02:00
Hans-Kristian Arntzen
3951b9456f Fix SpecConstantComposite if input is SpecConstantOp. 2018-05-15 11:16:06 +02:00
Hans-Kristian Arntzen
c74dc4578a
Merge pull request #572 from KhronosGroup/vulkan-glsl-sampler-mediump
Use mediump on images in --vulkan-semantics as well.
2018-05-11 11:21:51 +02:00
Hans-Kristian Arntzen
01080365fa Use mediump on images in --vulkan-semantics as well. 2018-05-11 10:59:29 +02:00
Hans-Kristian Arntzen
9d370aca58
Merge pull request #571 from KhronosGroup/fix-570
Handle inout properly with split access chains.
2018-05-11 10:39:54 +02:00
Hans-Kristian Arntzen
7eba247864 Handle inout properly with split access chains.
Found some other issues. Had some bugs with variable writes not properly
invalidating if writes came from split access chains.
2018-05-11 10:15:42 +02:00
Hans-Kristian Arntzen
97e38bcd38
Merge pull request #569 from KhronosGroup/fix-566
Fix split access chains for builtin arrays.
2018-05-08 15:54:17 +02:00
Hans-Kristian Arntzen
b71f5dfc0c Fix split access chains for builtin arrays. 2018-05-08 15:34:20 +02:00
Hans-Kristian Arntzen
e4694a8403
Merge pull request #568 from KhronosGroup/fix-567
Fix GCC 8.1 build.
2018-05-08 00:07:54 +02:00
Hans-Kristian Arntzen
903b798da7 Fix GCC 8.1 build. 2018-05-07 23:41:53 +02:00
Hans-Kristian Arntzen
d3b966322d
Merge pull request #565 from pmuetschard/master
Don't limit GLSL identifiers with HLSL keywords.
2018-05-07 21:07:01 +02:00
Pascal Muetschard
aced6058b4 Don't limit GLSL identifiers with HLSL keywords.
- The HLSL compiler now has its own list of keywords in addition to
   the ones from GLSL.
 - Added "buffer", "precise", and "shared" to the GLSL keywords.
2018-05-07 10:58:52 -07:00
Hans-Kristian Arntzen
2792f8f3f2
Merge pull request #564 from KhronosGroup/fix-563
Do not use RMW rewrite for matrices.
2018-05-04 10:56:39 +02:00
Hans-Kristian Arntzen
85a8f066f4 Do not use RMW rewrite for matrices.
Does not work on MSL.
2018-05-04 10:35:56 +02:00
Hans-Kristian Arntzen
04f0a08cfc
Merge pull request #562 from KhronosGroup/fix-561
Do not clear spv_function_implementations on MSL.
2018-05-04 10:08:13 +02:00
Hans-Kristian Arntzen
d2df067dd4 Force recompile if we add row-major transpose functions in MSL. 2018-05-04 09:43:34 +02:00
Hans-Kristian Arntzen
7b95168c3d Do not clear spv_function_implementations on MSL.
Will fail when recompiles are necessary.
2018-05-02 21:37:36 +02:00
Hans-Kristian Arntzen
9279750a1d
Merge pull request #560 from KhronosGroup/fix-557
Deal with fake overloads when using combined image samplers.
2018-05-02 11:03:12 +02:00
Hans-Kristian Arntzen
17be3c652f Deal with fake overloads when using combined image samplers. 2018-05-02 10:36:00 +02:00
Hans-Kristian Arntzen
e80d6e0142
Merge pull request #559 from KhronosGroup/fix-558
Fix OpCompositeConstruct with arrays in MSL.
2018-05-02 10:18:05 +02:00
Hans-Kristian Arntzen
3187d89c31 Reduce test case ... MSL can't deal with certain unusual cases yet. 2018-05-02 10:01:08 +02:00
Hans-Kristian Arntzen
f3e810b8b3 Fix OpCompositeConstruct with arrays in MSL. 2018-05-02 09:38:41 +02:00
Hans-Kristian Arntzen
9d43e9c02a
Merge pull request #556 from billhollings/master
Compiler MSL default gather offset when component specified.
2018-05-01 01:20:28 +02:00
Bill Hollings
ba1026b899 Merge branch 'master' of https://github.com/KhronosGroup/SPIRV-Cross 2018-04-30 16:31:19 -04:00
Bill Hollings
57213cb7ca Compiler MSL default gather offset when component specified. 2018-04-30 16:30:29 -04:00
Hans-Kristian Arntzen
1ebccb4466
Mention Wiki in README. 2018-04-30 16:47:49 +02:00
Hans-Kristian Arntzen
8f07df016b
Merge pull request #555 from KhronosGroup/fix-553
Fix GatherDref on GLSL.
2018-04-30 13:08:01 +02:00
Hans-Kristian Arntzen
7e23e69f2a Run format_all.sh. 2018-04-30 12:46:21 +02:00
Hans-Kristian Arntzen
47081f810a Fix GatherDref on GLSL. 2018-04-30 12:45:23 +02:00
Hans-Kristian Arntzen
6b478c928d
Merge pull request #554 from KhronosGroup/query-fixes
Fix OpImageFetch without explicit LOD and query functions without combined sampler.
2018-04-30 12:34:50 +02:00
Hans-Kristian Arntzen
40bbf6be7a Build combined dummy samplers for Query functions without sampler as well.
Deal with various query functions which require dummy sampler.
In SPIR-V, separate images are used, but GLSL (even Vulkan GLSL)
requires combined sampler images ...
2018-04-30 12:08:33 +02:00
Hans-Kristian Arntzen
d93807a625 Deal with OpImageFetch without explicit LOD. 2018-04-30 10:54:44 +02:00
Hans-Kristian Arntzen
454691f434
Merge pull request #547 from KhronosGroup/op-image-usage-tracking
Fix usage tracking issue for OpImage.
2018-04-27 11:29:31 +02:00
Hans-Kristian Arntzen
aaf397cd1f Fix usage tracking issue for OpImage. 2018-04-27 11:11:24 +02:00
Hans-Kristian Arntzen
bbf6b60350
Merge pull request #546 from KhronosGroup/fix-545
Fix multiple uses of combined image samplers on Vulkan GLSL
2018-04-27 10:47:31 +02:00
Hans-Kristian Arntzen
893ed379d5 Remove some stale test files. 2018-04-27 10:33:27 +02:00
Hans-Kristian Arntzen
cd442b9c2f Clean and fix some issues with test_shaders.py. 2018-04-27 10:31:39 +02:00
Hans-Kristian Arntzen
18958ecccb Add test for combined-sampler-reuse on GLSL. 2018-04-27 10:31:25 +02:00
Hans-Kristian Arntzen
0280800a8f Fix case where SampledImage would get flushed to temporary. 2018-04-27 10:06:30 +02:00