Commit Graph

2863 Commits

Author SHA1 Message Date
Hans-Kristian Arntzen
46bf1e99d6
Merge pull request #1525 from cdavis5e/msl-interpolation-functions
MSL: Support pull-model interpolation on MSL 2.3+.
2020-11-07 17:04:56 +01:00
rdb
509908d8db GLSL: Add error checking and extension fallback for textureGather 2020-11-07 16:49:18 +01:00
Hans-Kristian Arntzen
683c3f5c3f
Merge pull request #1530 from rdb/legacy-glsl-round
GLSL: Provide round/roundEven for legacy GLSL
2020-11-07 16:40:18 +01:00
Hans-Kristian Arntzen
ea334c14bc
Merge pull request #1527 from rdb/legacy-transpose
GLSL: implement transpose() in GLSL 1.10 / ES 1.00
2020-11-07 16:37:59 +01:00
Hans-Kristian Arntzen
2417010046
Merge pull request #1528 from rdb/fix-legacy-vertex-shader-lod
GLSL: Fix support for textureLod in legacy vertex shaders
2020-11-07 16:33:50 +01:00
Hans-Kristian Arntzen
1648747fa7
Merge pull request #1529 from KhronosGroup/fix-msl-gather-regression
MSL: Fix regression in image gather handling.
2020-11-07 16:32:38 +01:00
rdb
b3bd674aa7 GLSL: Remove unused lod argument from legacy_tex_op() 2020-11-07 12:43:53 +01:00
rdb
bf71994dae GLSL: implement transpose() in GLSL 1.10 / ES 1.00 2020-11-06 22:27:54 +01:00
rdb
9e6e5d2738 GLSL: Fix round/roundEven for legacy GLSL. 2020-11-06 17:34:38 +01:00
rdb
e8c500ceef GLSL: Fix support for textureLod in legacy vertex shaders 2020-11-06 16:37:27 +01:00
Hans-Kristian Arntzen
db13762297 MSL: Fix regression in image gather handling.
It was not always possible to get backing variable for a late-combined
image sampler.
2020-11-06 16:21:30 +01:00
Chip Davis
aca9b6879a MSL: Support pull-model interpolation on MSL 2.3+.
New in MSL 2.3 is a template that can be used in the place of a scalar
type in a stage-in struct. This template has methods which interpolate
the varying at the given points. Curiously, you can't set interpolation
attributes on such a varying; perspective-correctness is encoded in the
type, while interpolation must be done using one of the methods. This
makes using this somewhat awkward from SPIRV-Cross, requiring us to jump
through a bunch of hoops to make this all work.

Using varyings from functions in particular is a pain point, requiring
us to pass the stage-in struct itself around. An alternative is to pass
references to the interpolants; except this will fall over badly with
composite types, which naturally must be flattened.  As with
tessellation, dynamic indexing isn't supported with pull-model
interpolation. This is because of the need to reference the original
struct member in order to call one of the pull-model interpolation
methods on it. Also, this is done at the variable level; this means that
if one varying in a struct is used with the pull-model functions, then
the entire struct is emitted as pull-model interpolants.

For some reason, this was not documented in the MSL spec, though there
is a property on `MTLDevice`, `supportsPullModelInterpolation`,
indicating support for this, which *is* documented. This does not appear
to be implemented yet for AMD: it returns `NO` from
`supportsPullModelInterpolation`, and pipelines with shaders using the
templates fail to compile. It *is* implemeted for Intel. It's probably
also implemented for Apple GPUs: on Apple Silicon, OpenGL calls down to
Metal, and it wouldn't be possible to use the interpolation functions
without this implemented in Metal.

Based on my testing, where SPIR-V and GLSL have the offset relative to
the pixel center, in Metal it appears to be relative to the pixel's
upper-left corner, as in HLSL. Therefore, I've added an offset 0.4375,
i.e. one half minus one sixteenth, to all arguments to
`interpolate_at_offset()`.

This also fixes a long-standing bug: if a pull-model interpolation
function is used on a varying, make sure that varying is declared. We
were already doing this only for the AMD pull-model function,
`interpolateAtVertexAMD()`; for reasons which are completely beyond me,
we weren't doing this for the base interpolation functions. I also note
that there are no tests for the interpolation functions for GLSL or
HLSL.
2020-11-05 11:57:45 -06:00
Hans-Kristian Arntzen
a20c768698
Merge pull request #1524 from rdb/hlsl-round-even
HLSL: Support roundEven() in HLSL SM 4.0 and above
2020-11-05 13:24:25 +01:00
rdb
854f566869 HLSL: Support roundEven() in HLSL SM 4.0 and above 2020-11-03 21:28:07 +01:00
Hans-Kristian Arntzen
2e1bdeb212
Merge pull request #1520 from rdb/dx9-dref-samplers
HLSL: Support depth comparison texture sampling in SM 2/3.
2020-11-03 20:51:17 +01:00
rdb
135933d59e HLSL: Add regression test for SM3.0 texture samplers 2020-11-03 18:15:05 +01:00
rdb
18893ba3b9 HLSL: Support depth comparison texture sampling in SM 2/3. 2020-11-03 18:10:43 +01:00
Hans-Kristian Arntzen
fc644b50e6
Merge pull request #1523 from KhronosGroup/fix-1512
HLSL: Add option to flatten matrix vertex input semantics.
2020-11-03 13:16:54 +01:00
Hans-Kristian Arntzen
512e851185
Merge pull request #1522 from KhronosGroup/fix-1510
Parser: Don't assume OpTypePointer will always take a SPIRType.
2020-11-03 13:16:18 +01:00
Hans-Kristian Arntzen
b3344174f7 HLSL: Add option to flatten matrix vertex input semantics.
Helps translation layers where we expect inputs to be multiple float
vectors rather than an indexed matrix.
2020-11-03 11:18:32 +01:00
Hans-Kristian Arntzen
1f018b0fb8 Parser: Don't assume OpTypePointer will always take a SPIRType.
Possible to receive a function prototype here. Don't try to do anything
smart here, just don't crash during parsing.
2020-11-03 10:53:37 +01:00
Hans-Kristian Arntzen
244839d350
Merge pull request #1516 from billhollings/VK_EXT_descriptor_indexing
MSL: Support run-time sized image and sampler arrays
2020-11-03 10:15:36 +01:00
Bill Hollings
4bdd49df3f Syntax and format updates from code review. 2020-11-02 22:15:20 -05:00
Hans-Kristian Arntzen
c5a3f37a1c
Merge pull request #1519 from cdavis5e/msl-mac-comparison-bias-grad
MSL: Allow Bias and Grad arguments with comparison on Mac in MSL 2.3.
2020-11-02 20:01:14 +01:00
Hans-Kristian Arntzen
dcd66c283c
Merge pull request #1521 from devshgraphicsprogramming/master
Fix some bad assumptions about emulating `subgroupBarrier`
2020-11-02 19:52:43 +01:00
criss
6402586015 Updated ref file for subgroups_basicvoteballot.vk.comp 2020-11-02 18:40:56 +01:00
Mateusz Kielan
9a1af25f02
Merge pull request #2 from KhronosGroup/master
AMD workaround
2020-10-31 21:54:58 +01:00
devsh
6c5f394b09 Fix some bad assumptions about emulating subgroupBarrier 2020-10-31 21:46:59 +01:00
Bill Hollings
7f67abe0fe Minor format and typo updates from code review. 2020-10-30 16:05:44 -04:00
Chip Davis
547c29f7bb MSL: Allow Bias and Grad arguments with comparison on Mac in MSL 2.3.
I kept the code to replace constant zero arguments, because `Bias` and
`Grad` still have some problems on desktop GPUs.

`Bias` works on AMD GPUs. `Grad` does not. Both work on Intel. Still
needs testing on NV. It will definitely work with Apple GPUs.
2020-10-30 11:14:59 -05:00
Hans-Kristian Arntzen
8884b34940
Merge pull request #1517 from atyuwen/master
fixed compile error with -std=c++20.
2020-10-30 15:51:18 +01:00
Hans-Kristian Arntzen
303f813166
Merge pull request #1518 from KhronosGroup/fix-nonuniform-bracket-handling
GLSL: Fix nonuniformEXT injection.
2020-10-30 15:48:37 +01:00
Hans-Kristian Arntzen
439b666829 GLSL: Fix nonuniformEXT injection.
Needs to consider that other expressions might be using brackets as well
...
2020-10-30 14:11:16 +01:00
atyuwen
871a023877 fixed compile error with -std=c++20 2020-10-30 17:30:46 +08:00
Hans-Kristian Arntzen
541a801fed
Merge pull request #1514 from cdavis5e/msl-mac-framebuffer-fetch
MSL: Allow framebuffer fetch on Mac in MSL 2.3.
2020-10-30 08:09:41 +01:00
Yuwen Wu
c8a43876c7
added metal keyworld: "level" (#1501)
* added metal keyworld: "level"

* added more metal keywords

* updated test case.
2020-10-30 08:07:25 +01:00
Bill Hollings
b7b0e804e5 MSL: Support run-time sized image and sampler arrays
(GL_EXT_nonuniform_qualifier/SPV_EXT_descriptor_indexing).

MSLResourceBinding includes array size through API, and substitutes
in that size if the image or sampler array is not explicitly sized.
OpCopyObject supports SPIRCombinedImageSampler type in MSL.
2020-10-29 18:50:42 -04:00
Chip Davis
c20d5945a2 MSL: Allow framebuffer fetch on Mac in MSL 2.3.
Another Apple GPU feature that will now be supported on Apple Silicon
Macs.
2020-10-29 10:50:59 -05:00
Hans-Kristian Arntzen
78c6d2d628
Merge pull request #1509 from cdavis5e/mac-post-depth-coverage
MSL: Allow post-depth coverage on Mac in MSL 2.3.
2020-10-29 09:50:44 +01:00
Hans-Kristian Arntzen
08e49bfd67
Merge pull request #1508 from KhronosGroup/fix-1507
Handle case where block is loop header, continue AND break block.
2020-10-28 16:04:14 +01:00
Hans-Kristian Arntzen
346b0b6c21
Merge pull request #1493 from KhronosGroup/ubo-row-major-load-workaround
GLSL: Support a workaround for loading row-major matrices
2020-10-28 10:31:54 +01:00
Chip Davis
d48d2a95c7 MSL: Allow post-depth coverage on Mac in MSL 2.3.
It's still only supported on Apple GPUs, but Macs will have those soon.
2020-10-27 22:07:01 -05:00
Hans-Kristian Arntzen
542d460364 Handle case where block is loop header, continue AND break block. 2020-10-27 12:29:08 +01:00
Hans-Kristian Arntzen
e47561a28b GLSL: Support a workaround for loading row-major matrices.
On AMD Windows OpenGL, it has been reported that we need to load
matrices via a wrapper function.
2020-10-27 12:07:09 +01:00
Hans-Kristian Arntzen
5ae9153a78
Merge pull request #1505 from cdavis5e/msl-vertex-writes
MSL: For 2.1+, don't disable rasterization for vertex writes.
2020-10-27 12:00:42 +01:00
Chip Davis
1b6b9705e6 MSL: For 2.1+, don't disable rasterization for vertex writes.
Writing to buffers actually works starting in MSL 2.1 (macOS 10.14,
iOS 12). Writing to textures works starting in MSL 2.2 (macOS 10.15, iOS
13).

No tests unfortunately, because the MSL 2.2 compiler and above produce a
warning that cannot be disabled, because it has no associated option.
2020-10-26 11:43:13 -05:00
Hans-Kristian Arntzen
1a95017d11
Merge pull request #1503 from KhronosGroup/travis-python-update
Update TravisCI python reference.
2020-10-26 17:40:59 +01:00
Hans-Kristian Arntzen
b3a74f3a22
Merge pull request #1504 from KhronosGroup/fix-1502
MSL: Do not use component::x gather for depth2d textures.
2020-10-26 17:40:46 +01:00
Hans-Kristian Arntzen
f65f259ab7 MSL: Do not use component::x gather for depth2d textures. 2020-10-26 10:18:17 +01:00
Hans-Kristian Arntzen
1d68cbfb1b Update TravisCI python reference. 2020-10-26 09:55:10 +01:00