428 Commits

Author SHA1 Message Date
Bill Hollings
759bb6df5c Merge branch 'master' of https://github.com/KhronosGroup/MoltenVK 2018-11-06 16:03:55 -05:00
Bill Hollings
38160b3eb3 MoltenVK 1.0.26.
Fixes to create_dylib.sh to cleanup bitcode and architecture support.
Update to latest SPIRV-Cross version.
Update MoltenVK version to 1.0.26.
Update Xcode projects to Xcode 10.1.
Update What's New document.
2018-11-06 16:01:36 -05:00
Bill Hollings
8a807b7c47
Merge pull request #336 from cdavis5e/no-optimal-shared-mac
MVKImage: Don't say shared memory is allowed on Mac.
2018-11-06 15:48:35 -05:00
Chip Davis
56096fb8be Don't leak resource objects after replacing them in a descriptor. 2018-11-06 01:14:10 -06:00
Chip Davis
01f2751a8b Move shader resources over to MVKRefCountedDeviceObject.
As a result, we can gut all the rest of the code I wrote.
2018-11-06 00:36:27 -06:00
Chip Davis
00bb47ef44 Factor out the reference-counting code from MVKSignalable.
Put it into a base class, MVKRefCountedDeviceObject. The intent is that
MVKImageView, MVKSampler, MVKBuffer, and MVKBufferView will all derive
from this and get reference-counting semantics, which will reduce all
the horrible duplication of code from the original change, and fix the
race condition as well.
2018-11-06 00:07:53 -06:00
Chip Davis
b4aef20c04 Remove destroyed resources from descriptor sets.
According to the Vulkan spec:

  "Entries that are not used by a pipeline can have uninitialized
   descriptors or _descriptors of resources that have been destroyed_,
   and executing a draw or dispatch with such a descriptor set bound
   does not cause undefined behavior." [emphasis added]

But, in the current implementation, if a resource is destroyed, and a
descriptor set to which it was bound is subsequently bound to a
pipeline, then the now-freed object for the destroyed resource will be
passed to Metal, which almost always results in a segfault. To avoid
this, resources now keep track of descriptors to which they are bound,
and tell them to forget the resources when they are destroyed.
Conversely, if a descriptor set is destroyed before its bound resources,
the resources must now not notify the destroyed set. In this case, the
descriptor binding now tells the resource to forget the descriptor.

There is a race condition present if two threads attempt to destroy a
descriptor set and a resource at the same time. I've tried to mitigate
this with locking, but it won't help in the case where the resource
destruction happens first--the descriptor set will subsequently attempt
to modify a freed object. I don't know how to fix this.
2018-11-06 00:07:53 -06:00
Chip Davis
9c9b207b0a MVKImage: Don't say shared memory is allowed on Mac.
It isn't. Unfortunately, we have to say it is allowed for linear images,
per the Vulkan spec.
2018-11-05 16:16:02 -06:00
Bill Hollings
1d64dae0cc
Merge pull request #326 from DiegoAce/master
Force Bitcode When Building
2018-11-05 17:14:57 -05:00
Bill Hollings
976aa8cd47
Merge pull request #335 from ryandesign/script-cleanup
create_dylib.sh cleanup
2018-11-05 16:58:32 -05:00
Bill Hollings
6e1c10e03a
Merge pull request #333 from spadix0/fix-memorytypes-order
Fix memoryTypes order on macOS to match spec
2018-11-05 16:44:15 -05:00
Bill Hollings
e8ca167d5e
Merge pull request #332 from cdavis5e/3d-2d-image-view-checks
MVKImageView: Perform the usage check if we're mapping a subset of a 3D image.
2018-11-05 16:16:18 -05:00
Bill Hollings
3cd21a40d1
Merge pull request #331 from cdavis5e/all-unused-attachments
MVKPipeline: Also create a dummy attachment if all attachments are unused.
2018-11-05 16:13:24 -05:00
Ryan Schmidt
7354f8ddcd Use the -arch flag(s) specified by Xcode 2018-11-05 06:57:19 -06:00
Ryan Schmidt
82cf1328f2 Use the C++ library specified by Xcode.
It's almost certainly libc++ but it doesn't hurt to specify it.
2018-11-05 06:57:19 -06:00
Ryan Schmidt
b25e207c3b Don't manually link with -lSystem
The compiler adds the system library automatically.
2018-11-05 06:57:19 -06:00
Ryan Schmidt
d367bc7109 Use clang++ not clang to link C++ code
When using a C++ compiler it's unnecessary to specify -lc++ because
that's done automatically.
2018-11-05 06:57:06 -06:00
spadix0
de28fe1a9c Fix memoryTypes order on macOS to match spec
Fixes #314
2018-11-01 14:22:05 -07:00
Chip Davis
bbd6f18f66 MVKImageView: Perform the usage check if we're mapping a subset of a 3D image.
If only some of the 3D image is selected by the view, then we would skip
the usage checks after printing the warning about using a subset.
2018-11-01 10:04:12 -05:00
Chip Davis
32238634ba MVKPipeline: Also create a dummy attachment if all attachments are unused.
Some clients (DXVK primarily) always set all eight color attachments,
even if they are unused. Metal will treat them as though they weren't
specified at all. If none are used, then Metal won't know how big to
make the render area, and the pipeline will fail validation. We have to
treat this case the same as if no attachments were given.
2018-11-01 10:01:32 -05:00
Chip Davis
c9f42d5a94 MVKDeviceMemory: Relax memory requirements for linear images.
Allow linear images to use host-coherent memory. But map its internal
storage mode to `MTLStorageModeManaged`, so we know that we need to keep
it in sync manually.
2018-11-01 09:58:48 -05:00
DiegoAce
b91882cfc8 Force Bitcode When Building
Enabling bitcode in Xcode only adds the -fembed-bitcode-marker flag, which doesn't actually create bitcode. The Archive action transforms that flag to -fembed-bitcode which actually creates the bitcode. Adding the User-Defined Setting BITCODE_GENERATION_MODE=bitcode forces bitcode to be created without archiving.
2018-10-31 16:44:59 -05:00
Bill Hollings
a670412cf8 Fix Travis build and rename MVKPipelineLayout::getMaxTextureIndex() to getTextureCount(). 2018-10-31 13:28:42 -04:00
Bill Hollings
403cedf0c8 Add README placeholder files for empty template directories. 2018-10-31 00:18:25 -04:00
Bill Hollings
025259426c Refactor the build environment.
Support creation of static library and build framework and dynamic library from it.
Add Makefile to better support command line or script building integration.
Update demos to each use one of framework, static library, and dynamic library.
Refactor and rename the build scripts.
Refactor and rename the Xcode Schemes.
Update build and runtime documentation.
Update What's New document.
2018-10-30 23:16:12 -04:00
Bill Hollings
480d5b239a Support polygonMode VK_POLYGON_MODE_POINT.
Support MTLPrimitiveTopologyClass on iOS in addition to macOS.
2018-10-24 17:06:19 -04:00
Bill Hollings
ac61f9185f vkCreateInstance returns VK_ERROR_INCOMPATIBLE_DRIVER if Metal not available. 2018-10-22 17:21:55 -04:00
Bill Hollings
af0c1a08f1 Update shader caching for compatibility with texture swizzling.
MVKPipelineLayout set auxiliary buffer MSL index relative to already-calculated
push constant buffer MSL index.
MVKPipeline destructor release auxiliary buffer MTLBuffer instance.
Nudge MVK_VERSION_PATCH.
2018-10-17 16:57:21 -07:00
Bill Hollings
6c0ab0f4c2
Merge pull request #304 from cdavis5e/wolf2-packed-pixels
Correct MTLPixelFormats for a couple of formats.
2018-10-16 14:55:44 -04:00
Chip Davis
e7af5bed64 Correct MTLPixelFormats for a couple of formats.
Set `MTLPixelFormatRG11B10Float` for `VK_FORMAT_B10G11R11_UFLOAT_PACK32`
and `MTLPixelFormatRGB9E5Float` for `VK_FORMAT_E5B9R9G9_UFLOAT_PACK32`.

This should fix the rest of #302.
2018-10-16 11:41:46 -05:00
Chip Davis
082d282b28 Support arbitrary swizzles of image data.
The swizzles are passed to shaders that need them using an "auxiliary
buffer", for which there must be room in the function argument table.
Code is inserted into the shaders to swizzle reads from sampled
textures--per the Vulkan spec, component mappings must only be applied
to sampled images.

Update SPIRV-Cross to pull in some fixes for handling swizzled image
data. Bump MoltenVK version.
2018-10-16 11:33:13 -05:00
Bill Hollings
7dd143411a
Merge pull request #298 from francoisbertelatschrodinger/whitespaces
Make PhaseScriptExecution works when SRCROOT path has whitespaces.
2018-10-15 13:54:07 -04:00
Bill Hollings
aad51f82f2 Merge branch 'master' of https://github.com/KhronosGroup/MoltenVK 2018-10-09 11:56:42 -04:00
Bill Hollings
2adc450c62 Include struct size parameter in VK_MVK_moltenvk extension functions
that pass structs that might change size across extension versions
2018-10-08 20:22:12 -04:00
François Bertel
014b936c4e Make PhaseScriptExecution works when SRCROOT path has whitespaces. 2018-10-08 14:11:39 -04:00
Bill Hollings
4640d273af
Merge pull request #296 from cdavis5e/copy-image-compat-format
vkCmdCopyImage: Allow copies between compatible formats.
2018-10-03 13:14:35 -04:00
Chip Davis
b8202e7b65 Forbid copying between 3D texture and a 2D array texture.
Metal doesn't support that yet.
2018-10-03 11:24:49 -05:00
Bill Hollings
2204113b86
Merge pull request #295 from cdavis5e/blend-state-unused
MVKPipeline: Don't set blend state for unused attachments.
2018-10-03 12:00:07 -04:00
Bill Hollings
2444dfee37
Merge pull request #294 from cdavis5e/vertex-rgb10a2-unorm
Map VK_FORMAT_A2B10G10R10_UNORM_PACKED to an MTLVertexFormat.
2018-10-03 11:59:49 -04:00
Bill Hollings
b173ea5964
Merge pull request #293 from cdavis5e/linear-tiled-props
MVKDevice: Correct properties of linear-tiled images.
2018-10-03 10:50:11 -04:00
Bill Hollings
d0b111ef46
Merge pull request #292 from cdavis5e/dedicated-free
MVKDeviceMemory: Allow dedicated allocations to forget their resources.
2018-10-03 10:44:14 -04:00
Chip Davis
44c9aaa957 vkCmdCopyImage: Allow copies between compatible formats.
The docs for the `MTLBlitCommandEncoder`'s `copyFromTexture:...` method
state that the source and destination textures must have the same
format.

This was true when it was written in the iOS 8 timeframe for Metal 1.0.
But, I suspect it was changed in Metal 1.1 when support was added for
texture views of differing formats. Like with texture views, the two
formats now need only be compatible. This is the same behavior that
Vulkan prescribes.
2018-10-03 09:42:31 -05:00
Chip Davis
a0a93e0cdb MVKPipeline: Don't set blend state for unused attachments.
Some clients always set blend state for all eight attachments, even if
the attachments are unused. Since the attachments are unused, the
expectation is that the corresponding blend states won't matter. But in
Metal, there's no way to tell if an attachment won't be used. So, if you
enable blending on an unused attachment, its pixel format will be
`MTLPixelFormatInvalid`, which doesn't support blending; Metal will
assert on this.
2018-10-03 09:39:42 -05:00
Chip Davis
0171fd46c5 Set the VERTEX_BUFFER feature bit on VK_FORMAT_A2B10G10R10_UNORM_PACK32.
Since we can use it in a vertex buffer now.
2018-10-03 09:37:31 -05:00
Bill Hollings
4fba647123 Optimize scheme configuration and make consistent. 2018-10-03 10:09:47 -04:00
Chip Davis
230ec2569e Map VK_FORMAT_A2B10G10R10_UNORM_PACKED to an MTLVertexFormat.
Use `MTLVertexFormatUInt1010102Normalized`. This is the unsigned
equivalent to the signed `MTLVertexFormatInt1010102Normalized`, which we
already use for `VK_FORMAT_A2B10G10R10_SNORM_PACKED`.
2018-10-02 18:24:49 -05:00
Chip Davis
b86e6b2be3 MVKDevice: Correct properties of linear-tiled images.
According to the Vulkan spec, linear-tiled images *may* not be supported
unless certain restrictions are satisfied. That means that
implementations may support features--or restrictions--above and beyond
the restrictions given in the Vulkan spec.

Metal places these limitations on linear textures:
* They must be 2D.
* They may only have one mip level.
* They may only have one array layer.
* They may not be multisampled--sample count must be one.
* On macOS, they may not be used as attachments.
* They may not be depth/stencil textures.
* They may not have a compressed format.

Have `vkGetPhysicalDeviceFormatProperties()` and
`vkGetPhysicalDeviceImageFormatProperties()` return results consistent
with these constraints. Also, allow creation of linear textures with
usages other than `VK_IMAGE_USAGE_TRANSFER_{SRC,DST}_BIT`.
2018-10-02 18:14:33 -05:00
Chip Davis
6da32e55b0 MVKDeviceMemory: Allow dedicated allocations to forget their resources.
Otherwise, if the resource is destroyed first (which it almost always
will be), then when the `VkDeviceMemory` is freed, it will access a
freed resource, at which point it will then proceed to fandango on core.
2018-10-02 18:00:38 -05:00
Chip Davis
9490e96164 MVKPipeline: Fix getting the vertex attribute divisor struct.
Bah. I read the spec wrong. It's hung off the vertex input state, not
the top-level create info.
2018-10-02 18:00:13 -05:00
Bill Hollings
a3f571e89b Include version number in VK_MVK_moltenvk extension functions that pass structs that might change. 2018-10-02 12:48:51 -04:00