2374 Commits

Author SHA1 Message Date
Bill Hollings
8e6731fd8e Revert to prefer MTLEvent over MTLFence for VkSemaphore, except on NVIDIA.
Prefer MTLEvent over MTLFence for VkSemaphore, because MTLEvent handles
sync across MTLCommandBuffers and MTLCommandQueues, except on NVIDIA GPUs,
which have demonstrated trouble with MTLEvents, prefer MTLFence.
Add MVKDevice::VkSemaphoreStyle enum.
2021-08-10 10:29:09 -04:00
Bill Hollings
f9696449ea
Merge pull request #1416 from billhollings/resolve-unresolvable
Support resolving attachments with formats that Metal does not natively resolve.
2021-08-04 14:32:52 -04:00
Bill Hollings
edcaa08923 One more MVKArrayRef reference-to-value change. 2021-08-04 13:28:46 -04:00
Bill Hollings
8b1435ca88 Pass MVKArrayRef by reference to functions.
Per cdavis5e observation:
Since an MVKArrayRef<T> is just a pointer and a size, passing it around by
reference doesn't buy much. It might actually hurt performance, since cache
lines might be evicted to make room for the MVKArrayRef in memory.
For this reason, LLVM passes its ArrayRefs by value.

Unrelatedly, update runcts to log errors by default.
2021-08-04 13:16:25 -04:00
Bill Hollings
12f0089d0c Support resolving attachments with formats that Metal does not natively resolve.
Metal does not support resolving all formats that support MSAA, whereas Vulkan
assumes any MSAA format can be resolved. We fix that by running an optional
post-renderpass compute shader that resolves such textures by simply taking the
first sample as the resolved sample. This works to fix all failing CTS tests,
because such formats are all integer formats, and Vulkan allows an arbitrary
single sample value to be selected.

If we need to resolve, but the Metal format doesn't support it,
cause the Metal renderpass to store the MSAA attachment results.

MVKRenderSubpass don't establish Metal resolve attachment textures if format
is not natively resolvable, and encode Metal renderpass store actions accordingly.
MVKCommandEncodingPool add MTLComputePipelineStates to run simple resolve
compute shaders on attachments that cannot be resolved in Metal renderpass.
Add MVKRenderSubpass::resolveUnresolvableAttachments() and call from
MVKCommandEncoder::endMetalRenderEncoding(), before subpass index is updated.
Rename MVKCommandEncodingPool::getClearStateIndex() to
getRenderpassLoadStoreStateIndex() and remove MVK_MACOS restriction on
clearing shaders to allow compatibility with resolve shader handling.
MVKRenderPassAttachment remove validation of whether a format can be resolved.
MVKPixelFormats::getMTLTextureUsage() add read and write usage as appropriate
to allow compute shader to run to resolve formats not natively resolvable.
MVKPixelFormats remove obsolete unit test code.
MVKImageView clean up access functions and obsolete constructor
use of MVKConfiguration.
2021-08-03 18:47:13 -04:00
Bill Hollings
36aa71db65
Merge pull request #1415 from billhollings/renderpass-testing-fixes
Fix pipeline barriers not working inside self-dependent subpasses on Apple GPUs.
2021-07-30 17:38:45 -04:00
Bill Hollings
c243db9267 Remove unreachable code when setting barrier features on Apple Silicon.
MVKPhysicalDeviceMetalFeatures::memoryBarriers and ::textureBarriers
are never enabled on Apple Silicon. Remove it as an possibility.
2021-07-30 16:15:57 -04:00
Bill Hollings
086c680436 Fix pipeline barriers not working inside self-dependent subpasses on Apple GPUs.
On Apple GPUs, MVKCmdPipelineBarrier restarts Metal renderpass when encountered
inside self-dependent Vulkan subpass where the same attachment acts as both
input attachment and render attachment.
2021-07-30 15:25:59 -04:00
Bill Hollings
d5e04421dc
Merge pull request #1411 from billhollings/blit-from-compressed
Fix issue with vkCmdBlitImage() from compressed textures.
2021-07-27 19:41:47 -04:00
Bill Hollings
665dbfd632 Fix issue with vkCmdBlitImage() from compressed textures. 2021-07-27 18:08:50 -04:00
Bill Hollings
1d118b3b11
Merge pull request #1410 from billhollings/swapchain-image-acquisition-order
Fix issue where swapchain images were acquired out of order under heavy load.
2021-07-27 15:52:48 -04:00
Bill Hollings
b40dba904d Fix issue where swapchain images were acquired out of order under heavy load.
Move update of MVKSwapchainImageAvailability::acquisitionID to the acquisition
time instead of the become available again time, so other images will be preferred
if either all images are available or no images are available.
2021-07-27 15:42:43 -04:00
Bill Hollings
3236796839
Merge pull request #1408 from billhollings/handle-bad-api-pointers
Properly ignore non-null pipeline creation pointers that should be ignored.
2021-07-26 18:15:48 -04:00
Bill Hollings
7a2def4604
Merge pull request #1404 from billhollings/timestamp-using-metal-gpu-counters
Vulkan timestamp query pools use Metal GPU counters when available.
2021-07-26 18:15:25 -04:00
Bill Hollings
0de4cafb72 Fixes from PR code review.
Inline MVKRenderSubpass::hasDepthStencilAttachment() and fix minor comment typo.
2021-07-26 16:51:58 -04:00
Bill Hollings
6372ba4792 Fixes from PR code review.
Remove dead code and make GPU counter creation error message generic.
2021-07-26 16:40:34 -04:00
Bill Hollings
293c049a16 Properly ignore non-null pipeline creation pointers that should be ignored.
See for reference spec description of VkGraphicsPipelineCreateInfo, and CTS test
dEQP-VK.api.pipeline.pipeline_invalid_pointers_unused_structs.graphics
2021-07-24 20:33:21 -04:00
Bill Hollings
2adb24bde2 Merge master branch into timestamp-using-metal-gpu-counters branch. 2021-07-23 12:42:27 -04:00
Bill Hollings
9bf9030236
Merge pull request #1406 from billhollings/update-spirv-cross
Update to latest SPIRV-Cross version.
2021-07-23 12:36:59 -04:00
Bill Hollings
386bde9c78 Update to latest SPIRV-Cross version.
MSL: Adjust gl_SampleMaskIn for sample-shading and/or fixed sample mask.
MSL: Fix setting SPIRVCrossDecorationInterpolantComponentExpr decoration.
MSL: Simplify spvSubgroupBallot().
2021-07-22 11:03:52 -04:00
Bill Hollings
a582924bcf Update Metal GPU counters to support macOS 10.15 and build under Xcode 11.7. 2021-07-21 19:18:29 -04:00
Bill Hollings
6ae1745a9c Vulkan timestamp query pools use Metal GPU counters when available.
Add MVKPhysicalDeviceMetalFeatures::counterSamplingPoints
to track platform availability of GPU counters.
MVKPhysicalDevice creates and manages MTLCounterSets and checks for and enables
flags within MVKPhysicalDeviceMetalFeatures::counterSamplingPoints.
Add abstract MVKGPUCounterQueryPool class as parent of MVKTimestampQueryPool
and MVKPipelineStatisticsQueryPool concrete classes and refactor access to host
and command copy tracking data to allow extraction from MTLCounterSampleBuffer.
MVKTimestampQueryPool uses MTLCounterSampleBuffer if supported, otherwise reverts
to using host data for timestamps.
MVKCommandEncoder encodes Vulkan timestamp commands either as Metal staged or
command timestamps, depending on whether the GPU is tile-based or immediate-mode.
For Metal stage counters, we use a light-weight dummy BLIT encoder to mark
timestamp commands executed in the previous Metal encoding pass.
Add MVKDevice::getDummyBlitMTLBuffer() to supply a dummy single-byte buffer that
can be used by a stand-alone MTLBlitCommandEncoder as dummy work to mark timestamps.
2021-07-20 22:13:04 -04:00
Bill Hollings
feb8d41444
Merge pull request #1401 from billhollings/alpha-to-coverage-no-color-attachment
Support alpha-to-coverage without a color attachment.
2021-07-10 21:18:57 -04:00
Bill Hollings
b1a8b59f66 Support alpha-to-coverage without a color attachment.
If alpha-to-coverage is enabled, we must enable the fragment shader first color output,
even without a color attachment present or in use, so that coverage can be calculated.
2021-07-10 15:38:02 -04:00
Bill Hollings
a7ffaad975
Merge pull request #1399 from billhollings/e5b9g9r9-disable-blending
Disable blending for VK_FORMAT_E5B9G9R9_UFLOAT_PACK32 on macOS Apple Silicon.
2021-07-08 22:18:00 -04:00
Bill Hollings
ccc81c45d3
Merge pull request #1400 from billhollings/packed-swizzle-fixes
Fix occasional crash when swizzling used but shader swizzling not enabled.
2021-07-08 22:17:46 -04:00
Bill Hollings
c2f27e40c1 Fix occasional crash when swizzling used but shader swizzling not enabled.
MVKImageViewPlane distinguish tracking of native and shader swizzling.
Only provide packed swizzle value if shader swizzling is used.
2021-07-08 16:43:22 -04:00
Bill Hollings
b3cf74401f Disable VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT for
VK_FORMAT_E5B9G9R9_UFLOAT_PACK32 on macOS Apple Silicon.

On Apple Silicon (iOS/tvOs/macOS M1), format VK_FORMAT_E5B9G9R9_UFLOAT_PACK32
is fully supported as a color attachment except that format components cannot
be individually write-enabled. All components must either be write-enabled or
write-disabled together. This is causing several hundred Vulkan CTS blending
tests to fail on M1. The least intrusive behavioural change to allow the CTS
tests to report Not Supported instead, is to disable blending for this format.
2021-07-08 15:52:34 -04:00
Bill Hollings
bde3a86180
Merge pull request #1397 from billhollings/depth-stencil-swizzle-fixes
Fix swizzle of depth and stencil values into RGBA (float4) variable in shaders.
2021-07-08 10:31:55 -04:00
Bill Hollings
e482ac95df Use unswizzled MTLTexture for attachments.
Depth/stencil attachments that are also sampled might have an artificially forced
swizzled texture view. The original unswizzled texture must be used for attachments.
Add MVKImageViewPlane::getUnswizzledMTLTexture().
2021-07-07 13:09:40 -04:00
Bill Hollings
53a2223abd Fix swizzle of depth and stencil values into RGBA (float4) variable in shaders.
MVKImageViewPlane track Vulkan component swizzle instead of just packed
swizzle, and modify swizzle when using depth or stencil sampling or reading.
2021-07-06 17:57:47 -04:00
Bill Hollings
1748686d0d Refactor MVKImageView::validateSwizzledMTLPixelFormat().
Move MVKImageView::validateSwizzledMTLPixelFormat() to
MVKImageViewPlane::initSwizzledMTLPixelFormat(), make it non-static, and use
instance member content instead of passing all the data as function arguments.
2021-07-06 14:19:26 -04:00
Bill Hollings
9534c3b9ef
Merge pull request #1395 from billhollings/apple-silicon-clear-color-adjustment
Fix incorrect translation of clear color values on Apple Silicon.
2021-07-05 14:04:53 -04:00
Bill Hollings
97ab675915 Set MVKPhysicalDeviceMetalFeatures::clearColorFloatRounding based on GPU vendorID. 2021-07-05 13:10:39 -04:00
Bill Hollings
bbcdc8dcf6
Merge pull request #1394 from VZout/patch-3
Fix execution order of `encodeBindings` for `bufferBindings`
2021-07-04 17:46:27 -04:00
Bill Hollings
2d30c0ae13 Fix incorrect translation of clear color values on Apple Silicon.
The same set of CTS tests either fails or passes on different GPUs
based on whether or not we adjust float clear colors by one ULP.
Add MVKFloatRounding enum.
Add MVKPhysicalDeviceMetalFeatures::clearColorFloatRounding.
Disable ULP adjustment for clear colors on Apple Silicon.
For consistency and to simplify bookkeepping, calculate
clear color ULP adjustment from bit width of format component.
Update MoltenVK version to 1.1.5.
Update VK_MVK_MOLTENVK_SPEC_VERSION to 32.
2021-07-04 11:41:39 -04:00
Viktor Zoutman
d7b4775bba
Fix order of binding encoding 2021-07-01 09:28:10 +02:00
Bill Hollings
4f7f0dc209
Merge pull request #1392 from billhollings/sdk-1.2.182
Update dependency libraries to match Vulkan SDK 1.2.182.
2021-06-28 08:11:38 -04:00
Bill Hollings
30e7b5b0fc
Merge pull request #1393 from billhollings/retain-queue-during-submit
Retain MVKQueue in MVKQueueSubmission to avoid possible race condition.
2021-06-28 08:10:49 -04:00
Bill Hollings
e3cf071ace
Merge pull request #1387 from billhollings/occlusion-query-fixes-for-M1
Occlusion query fixes for M1
2021-06-28 08:10:17 -04:00
Bill Hollings
382da23410 Retain MVKQueue in MVKQueueSubmission to avoid possible race condition. 2021-06-25 17:16:42 -04:00
Bill Hollings
55c5cee233 Update dependency libraries to match Vulkan SDK 1.2.182. 2021-06-25 15:32:34 -04:00
Bill Hollings
45ffcc9564 Occlusion query fixes from PR review.
MVKOcclusionQueryCommandEncoderState::beginOcclusionQuery() check for visibility
buffer exhaustion, and if needed, log an error and disable further visibility
tracking for the remainder of the current MTLCommandBuffer.
Create visibility buffer if needed during MVKCommandEncoder::beginMetalRenderPass.
Simplify MVKCommandEncodingContext to PODS.
2021-06-25 08:46:52 -04:00
Bill Hollings
1421c1e9a4
Merge pull request #1391 from danginsburg/stencil_clear_fix
Fixes #1390 - when MVKRenderSubpass::populateClearAttachments determi…
2021-06-24 15:49:55 -04:00
danginsburg
5d8a76f927 Address code review feedback. 2021-06-24 15:03:59 -04:00
Bill Hollings
84e8e9ed73
Merge pull request #1389 from billhollings/add-cts-script
Add Scripts/runcts script as a convenience for running Vulkan CTS tests.
2021-06-24 13:14:16 -04:00
danginsburg
2c7db45aa1 Fixes #1390 - when MVKRenderSubpass::populateClearAttachments determines whether to clear stencil, it was using the loadOp for the depth. It needs to look at the loadOp for the stencil which is set independently. 2021-06-24 12:08:15 -04:00
Bill Hollings
51e3ae0d23 Additional documentation clarification in Scripts/runcts script. 2021-06-24 08:32:06 -04:00
Bill Hollings
b65d8f8677 Fixes to Scripts/runcts script from PR review.
Consolidate portability command line options selection.
Document magic numbers used to limit portability option
to Vulkan 1.0 and limited extensions.
2021-06-24 08:27:28 -04:00
Bill Hollings
368044b8b4
Merge pull request #1388 from billhollings/fix-block-observer-leak
Fix small memory leak during swapchain creation.
2021-06-22 19:53:35 -04:00