Ryujinx/moltenvk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2025 from etang-cw/MiscCleanup

Browse Source 
Misc Cleanup
This commit is contained in:
Bill Hollings 2023-09-28 16:44:29 -04:00 committed by GitHub
commit 568cc3acc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 76 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MoltenVK/MoltenVK/Commands/MVKCommandBuffer.h
View File

@ -143,7 +143,7 @@ public:
bool _needsVisibilityResultMTLBuffer; bool _needsVisibilityResultMTLBuffer;
/** Called when a MVKCmdExecuteCommands is added to this command buffer. */ /** Called when a MVKCmdExecuteCommands is added to this command buffer. */
void recordExecuteCommands(const MVKArrayRef<MVKCommandBuffer*> secondaryCommandBuffers); void recordExecuteCommands(MVKArrayRef<MVKCommandBuffer*const> secondaryCommandBuffers);
/** Called when a timestamp command is added. */ /** Called when a timestamp command is added. */
void recordTimestampCommand(); void recordTimestampCommand();
@ -182,7 +182,6 @@ protected:
friend class MVKCommandEncoder; friend class MVKCommandEncoder;
friend class MVKCommandPool; friend class MVKCommandPool;
MVKBaseObject* getBaseObject() override { return this; };
void propagateDebugName() override {} void propagateDebugName() override {}
void init(const VkCommandBufferAllocateInfo* pAllocateInfo); void init(const VkCommandBufferAllocateInfo* pAllocateInfo);
bool canExecute(); bool canExecute();

8
MoltenVK/MoltenVK/Commands/MVKCommandBuffer.mm
View File

@ -310,7 +310,7 @@ MVKCommandBuffer::~MVKCommandBuffer() {
} }
// Promote the initial visibility buffer and indication of timestamp use from the secondary buffers. // Promote the initial visibility buffer and indication of timestamp use from the secondary buffers.
void MVKCommandBuffer::recordExecuteCommands(const MVKArrayRef<MVKCommandBuffer*> secondaryCommandBuffers) { void MVKCommandBuffer::recordExecuteCommands(MVKArrayRef<MVKCommandBuffer*const> secondaryCommandBuffers) {
for (MVKCommandBuffer* cmdBuff : secondaryCommandBuffers) { for (MVKCommandBuffer* cmdBuff : secondaryCommandBuffers) {
if (cmdBuff->_needsVisibilityResultMTLBuffer) { _needsVisibilityResultMTLBuffer = true; } if (cmdBuff->_needsVisibilityResultMTLBuffer) { _needsVisibilityResultMTLBuffer = true; }
if (cmdBuff->_hasStageCounterTimestampCommand) { _hasStageCounterTimestampCommand = true; } if (cmdBuff->_hasStageCounterTimestampCommand) { _hasStageCounterTimestampCommand = true; }
@ -472,8 +472,8 @@ void MVKCommandEncoder::beginRenderpass(MVKCommand* passCmd,
_attachments.assign(attachments.begin(), attachments.end()); _attachments.assign(attachments.begin(), attachments.end());
// Copy the sample positions array of arrays, one array of sample positions for each subpass index. // Copy the sample positions array of arrays, one array of sample positions for each subpass index.
_subpassSamplePositions.resize(subpassSamplePositions.size); _subpassSamplePositions.resize(subpassSamplePositions.size());
for (uint32_t spSPIdx = 0; spSPIdx < subpassSamplePositions.size; spSPIdx++) { for (uint32_t spSPIdx = 0; spSPIdx < subpassSamplePositions.size(); spSPIdx++) {
_subpassSamplePositions[spSPIdx].assign(subpassSamplePositions[spSPIdx].begin(), _subpassSamplePositions[spSPIdx].assign(subpassSamplePositions[spSPIdx].begin(),
subpassSamplePositions[spSPIdx].end()); subpassSamplePositions[spSPIdx].end());
} }
@ -593,7 +593,7 @@ void MVKCommandEncoder::beginMetalRenderPass(MVKCommandUse cmdUse) {
// and Metal will default to using default sample postions. // and Metal will default to using default sample postions.
if (_pDeviceMetalFeatures->programmableSamplePositions) { if (_pDeviceMetalFeatures->programmableSamplePositions) {
auto cstmSampPosns = getCustomSamplePositions(); auto cstmSampPosns = getCustomSamplePositions();
[mtlRPDesc setSamplePositions: cstmSampPosns.data count: cstmSampPosns.size]; [mtlRPDesc setSamplePositions: cstmSampPosns.data() count: cstmSampPosns.size()];
} }
_mtlRenderEncoder = [_mtlCmdBuffer renderCommandEncoderWithDescriptor: mtlRPDesc]; _mtlRenderEncoder = [_mtlCmdBuffer renderCommandEncoderWithDescriptor: mtlRPDesc];

8
MoltenVK/MoltenVK/Commands/MVKCommandEncoderState.h
View File

@ -143,7 +143,7 @@ public:
* The isSettingDynamically indicates that the scissor is being changed dynamically, * The isSettingDynamically indicates that the scissor is being changed dynamically,
* which is only allowed if the pipeline was created as VK_DYNAMIC_STATE_SCISSOR. * which is only allowed if the pipeline was created as VK_DYNAMIC_STATE_SCISSOR.
*/ */
void setViewports(const MVKArrayRef<VkViewport> viewports, void setViewports(MVKArrayRef<const VkViewport> viewports,
uint32_t firstViewport, uint32_t firstViewport,
bool isSettingDynamically); bool isSettingDynamically);
@ -171,7 +171,7 @@ public:
* The isSettingDynamically indicates that the scissor is being changed dynamically, * The isSettingDynamically indicates that the scissor is being changed dynamically,
* which is only allowed if the pipeline was created as VK_DYNAMIC_STATE_SCISSOR. * which is only allowed if the pipeline was created as VK_DYNAMIC_STATE_SCISSOR.
*/ */
void setScissors(const MVKArrayRef<VkRect2D> scissors, void setScissors(MVKArrayRef<const VkRect2D> scissors,
uint32_t firstScissor, uint32_t firstScissor,
bool isSettingDynamically); bool isSettingDynamically);
@ -457,7 +457,7 @@ protected:
contents[index] = value; contents[index] = value;
} }
void assertMissingSwizzles(bool needsSwizzle, const char* stageName, const MVKArrayRef<MVKMTLTextureBinding> texBindings); void assertMissingSwizzles(bool needsSwizzle, const char* stageName, MVKArrayRef<const MVKMTLTextureBinding> texBindings);
void encodeMetalArgumentBuffer(MVKShaderStage stage); void encodeMetalArgumentBuffer(MVKShaderStage stage);
virtual void bindMetalArgumentBuffer(MVKShaderStage stage, MVKMTLBufferBinding& buffBind) = 0; virtual void bindMetalArgumentBuffer(MVKShaderStage stage, MVKMTLBufferBinding& buffBind) = 0;
@ -547,7 +547,7 @@ public:
const char* pStageName, const char* pStageName,
bool fullImageViewSwizzle, bool fullImageViewSwizzle,
std::function<void(MVKCommandEncoder*, MVKMTLBufferBinding&)> bindBuffer, std::function<void(MVKCommandEncoder*, MVKMTLBufferBinding&)> bindBuffer,
std::function<void(MVKCommandEncoder*, MVKMTLBufferBinding&, const MVKArrayRef<uint32_t>)> bindImplicitBuffer, std::function<void(MVKCommandEncoder*, MVKMTLBufferBinding&, MVKArrayRef<const uint32_t>)> bindImplicitBuffer,
std::function<void(MVKCommandEncoder*, MVKMTLTextureBinding&)> bindTexture, std::function<void(MVKCommandEncoder*, MVKMTLTextureBinding&)> bindTexture,
std::function<void(MVKCommandEncoder*, MVKMTLSamplerStateBinding&)> bindSampler); std::function<void(MVKCommandEncoder*, MVKMTLSamplerStateBinding&)> bindSampler);

46
MoltenVK/MoltenVK/Commands/MVKCommandEncoderState.mm
View File

@ -54,11 +54,11 @@ void MVKPipelineCommandEncoderState::encodeImpl(uint32_t stage) {
#pragma mark - #pragma mark -
#pragma mark MVKViewportCommandEncoderState #pragma mark MVKViewportCommandEncoderState
void MVKViewportCommandEncoderState::setViewports(const MVKArrayRef<VkViewport> viewports, void MVKViewportCommandEncoderState::setViewports(MVKArrayRef<const VkViewport> viewports,
uint32_t firstViewport, uint32_t firstViewport,
bool isSettingDynamically) { bool isSettingDynamically) {
size_t vpCnt = viewports.size; size_t vpCnt = viewports.size();
uint32_t maxViewports = getDevice()->_pProperties->limits.maxViewports; uint32_t maxViewports = getDevice()->_pProperties->limits.maxViewports;
if ((firstViewport + vpCnt > maxViewports) || if ((firstViewport + vpCnt > maxViewports) ||
(firstViewport >= maxViewports) || (firstViewport >= maxViewports) ||
@ -107,11 +107,11 @@ void MVKViewportCommandEncoderState::encodeImpl(uint32_t stage) {
#pragma mark - #pragma mark -
#pragma mark MVKScissorCommandEncoderState #pragma mark MVKScissorCommandEncoderState
void MVKScissorCommandEncoderState::setScissors(const MVKArrayRef<VkRect2D> scissors, void MVKScissorCommandEncoderState::setScissors(MVKArrayRef<const VkRect2D> scissors,
uint32_t firstScissor, uint32_t firstScissor,
bool isSettingDynamically) { bool isSettingDynamically) {
size_t sCnt = scissors.size; size_t sCnt = scissors.size();
uint32_t maxScissors = getDevice()->_pProperties->limits.maxViewports; uint32_t maxScissors = getDevice()->_pProperties->limits.maxViewports;
if ((firstScissor + sCnt > maxScissors) || if ((firstScissor + sCnt > maxScissors) ||
(firstScissor >= maxScissors) || (firstScissor >= maxScissors) ||
@ -165,7 +165,7 @@ void MVKPushConstantsCommandEncoderState:: setPushConstants(uint32_t offset, MVK
// Typically any MSL struct that contains a float4 will also have a size that is rounded up to a multiple of a float4 size. // Typically any MSL struct that contains a float4 will also have a size that is rounded up to a multiple of a float4 size.
// Ensure that we pass along enough content to cover this extra space even if it is never actually accessed by the shader. // Ensure that we pass along enough content to cover this extra space even if it is never actually accessed by the shader.
size_t pcSizeAlign = getDevice()->_pMetalFeatures->pushConstantSizeAlignment; size_t pcSizeAlign = getDevice()->_pMetalFeatures->pushConstantSizeAlignment;
size_t pcSize = pushConstants.size; size_t pcSize = pushConstants.size();
size_t pcBuffSize = mvkAlignByteCount(offset + pcSize, pcSizeAlign); size_t pcBuffSize = mvkAlignByteCount(offset + pcSize, pcSizeAlign);
mvkEnsureSize(_pushConstants, pcBuffSize); mvkEnsureSize(_pushConstants, pcBuffSize);
copy(pushConstants.begin(), pushConstants.end(), _pushConstants.begin() + offset); copy(pushConstants.begin(), pushConstants.end(), _pushConstants.begin() + offset);
@ -488,7 +488,7 @@ void MVKResourcesCommandEncoderState::bindDescriptorSet(uint32_t descSetIndex,
// Update dynamic buffer offsets // Update dynamic buffer offsets
uint32_t baseDynOfstIdx = dslMTLRezIdxOffsets.getMetalResourceIndexes().dynamicOffsetBufferIndex; uint32_t baseDynOfstIdx = dslMTLRezIdxOffsets.getMetalResourceIndexes().dynamicOffsetBufferIndex;
uint32_t doCnt = descSet->getDynamicOffsetDescriptorCount(); uint32_t doCnt = descSet->getDynamicOffsetDescriptorCount();
for (uint32_t doIdx = 0; doIdx < doCnt && dynamicOffsetIndex < dynamicOffsets.size; doIdx++) { for (uint32_t doIdx = 0; doIdx < doCnt && dynamicOffsetIndex < dynamicOffsets.size(); doIdx++) {
updateImplicitBuffer(_dynamicOffsets, baseDynOfstIdx + doIdx, dynamicOffsets[dynamicOffsetIndex++]); updateImplicitBuffer(_dynamicOffsets, baseDynOfstIdx + doIdx, dynamicOffsets[dynamicOffsetIndex++]);
} }
@ -594,7 +594,7 @@ void MVKResourcesCommandEncoderState::markDirty() {
} }
// If a swizzle is needed for this stage, iterates all the bindings and logs errors for those that need texture swizzling. // If a swizzle is needed for this stage, iterates all the bindings and logs errors for those that need texture swizzling.
void MVKResourcesCommandEncoderState::assertMissingSwizzles(bool needsSwizzle, const char* stageName, const MVKArrayRef<MVKMTLTextureBinding> texBindings) { void MVKResourcesCommandEncoderState::assertMissingSwizzles(bool needsSwizzle, const char* stageName, MVKArrayRef<const MVKMTLTextureBinding> texBindings) {
if (needsSwizzle) { if (needsSwizzle) {
for (auto& tb : texBindings) { for (auto& tb : texBindings) {
VkComponentMapping vkcm = mvkUnpackSwizzle(tb.swizzle); VkComponentMapping vkcm = mvkUnpackSwizzle(tb.swizzle);
@ -684,7 +684,7 @@ void MVKGraphicsResourcesCommandEncoderState::encodeBindings(MVKShaderStage stag
const char* pStageName, const char* pStageName,
bool fullImageViewSwizzle, bool fullImageViewSwizzle,
std::function<void(MVKCommandEncoder*, MVKMTLBufferBinding&)> bindBuffer, std::function<void(MVKCommandEncoder*, MVKMTLBufferBinding&)> bindBuffer,
std::function<void(MVKCommandEncoder*, MVKMTLBufferBinding&, const MVKArrayRef<uint32_t>)> bindImplicitBuffer, std::function<void(MVKCommandEncoder*, MVKMTLBufferBinding&, MVKArrayRef<const uint32_t>)> bindImplicitBuffer,
std::function<void(MVKCommandEncoder*, MVKMTLTextureBinding&)> bindTexture, std::function<void(MVKCommandEncoder*, MVKMTLTextureBinding&)> bindTexture,
std::function<void(MVKCommandEncoder*, MVKMTLSamplerStateBinding&)> bindSampler) { std::function<void(MVKCommandEncoder*, MVKMTLSamplerStateBinding&)> bindSampler) {
@ -795,10 +795,10 @@ void MVKGraphicsResourcesCommandEncoderState::encodeImpl(uint32_t stage) {
offset: b.offset offset: b.offset
atIndex: b.index]; atIndex: b.index];
}, },
[](MVKCommandEncoder* cmdEncoder, MVKMTLBufferBinding& b, const MVKArrayRef<uint32_t> s)->void { [](MVKCommandEncoder* cmdEncoder, MVKMTLBufferBinding& b, MVKArrayRef<const uint32_t> s)->void {
cmdEncoder->setComputeBytes(cmdEncoder->getMTLComputeEncoder(kMVKCommandUseTessellationVertexTessCtl), cmdEncoder->setComputeBytes(cmdEncoder->getMTLComputeEncoder(kMVKCommandUseTessellationVertexTessCtl),
s.data, s.data(),
s.size * sizeof(uint32_t), s.byteSize(),
b.index); b.index);
}, },
[](MVKCommandEncoder* cmdEncoder, MVKMTLTextureBinding& b)->void { [](MVKCommandEncoder* cmdEncoder, MVKMTLTextureBinding& b)->void {
@ -846,10 +846,10 @@ void MVKGraphicsResourcesCommandEncoderState::encodeImpl(uint32_t stage) {
b.isDirty = true; // We haven't written it out, so leave dirty until next time. b.isDirty = true; // We haven't written it out, so leave dirty until next time.
} }
}, },
[](MVKCommandEncoder* cmdEncoder, MVKMTLBufferBinding& b, const MVKArrayRef<uint32_t> s)->void { [](MVKCommandEncoder* cmdEncoder, MVKMTLBufferBinding& b, MVKArrayRef<const uint32_t> s)->void {
cmdEncoder->setVertexBytes(cmdEncoder->_mtlRenderEncoder, cmdEncoder->setVertexBytes(cmdEncoder->_mtlRenderEncoder,
s.data, s.data(),
s.size * sizeof(uint32_t), s.byteSize(),
b.index); b.index);
}, },
[](MVKCommandEncoder* cmdEncoder, MVKMTLTextureBinding& b)->void { [](MVKCommandEncoder* cmdEncoder, MVKMTLTextureBinding& b)->void {
@ -879,10 +879,10 @@ void MVKGraphicsResourcesCommandEncoderState::encodeImpl(uint32_t stage) {
offset: b.offset offset: b.offset
atIndex: b.index]; atIndex: b.index];
}, },
[](MVKCommandEncoder* cmdEncoder, MVKMTLBufferBinding& b, const MVKArrayRef<uint32_t> s)->void { [](MVKCommandEncoder* cmdEncoder, MVKMTLBufferBinding& b, MVKArrayRef<const uint32_t> s)->void {
cmdEncoder->setComputeBytes(cmdEncoder->getMTLComputeEncoder(kMVKCommandUseTessellationVertexTessCtl), cmdEncoder->setComputeBytes(cmdEncoder->getMTLComputeEncoder(kMVKCommandUseTessellationVertexTessCtl),
s.data, s.data(),
s.size * sizeof(uint32_t), s.byteSize(),
b.index); b.index);
}, },
[](MVKCommandEncoder* cmdEncoder, MVKMTLTextureBinding& b)->void { [](MVKCommandEncoder* cmdEncoder, MVKMTLTextureBinding& b)->void {
@ -912,10 +912,10 @@ void MVKGraphicsResourcesCommandEncoderState::encodeImpl(uint32_t stage) {
offset: b.offset offset: b.offset
atIndex: b.index]; atIndex: b.index];
}, },
[](MVKCommandEncoder* cmdEncoder, MVKMTLBufferBinding& b, const MVKArrayRef<uint32_t> s)->void { [](MVKCommandEncoder* cmdEncoder, MVKMTLBufferBinding& b, MVKArrayRef<const uint32_t> s)->void {
cmdEncoder->setVertexBytes(cmdEncoder->_mtlRenderEncoder, cmdEncoder->setVertexBytes(cmdEncoder->_mtlRenderEncoder,
s.data, s.data(),
s.size * sizeof(uint32_t), s.byteSize(),
b.index); b.index);
}, },
[](MVKCommandEncoder* cmdEncoder, MVKMTLTextureBinding& b)->void { [](MVKCommandEncoder* cmdEncoder, MVKMTLTextureBinding& b)->void {
@ -945,10 +945,10 @@ void MVKGraphicsResourcesCommandEncoderState::encodeImpl(uint32_t stage) {
offset: b.offset offset: b.offset
atIndex: b.index]; atIndex: b.index];
}, },
[](MVKCommandEncoder* cmdEncoder, MVKMTLBufferBinding& b, const MVKArrayRef<uint32_t> s)->void { [](MVKCommandEncoder* cmdEncoder, MVKMTLBufferBinding& b, MVKArrayRef<const uint32_t> s)->void {
cmdEncoder->setFragmentBytes(cmdEncoder->_mtlRenderEncoder, cmdEncoder->setFragmentBytes(cmdEncoder->_mtlRenderEncoder,
s.data, s.data(),
s.size * sizeof(uint32_t), s.byteSize(),
b.index); b.index);
}, },
[](MVKCommandEncoder* cmdEncoder, MVKMTLTextureBinding& b)->void { [](MVKCommandEncoder* cmdEncoder, MVKMTLTextureBinding& b)->void {

1
MoltenVK/MoltenVK/Commands/MVKMTLBufferAllocation.h
View File

@ -99,7 +99,6 @@ public:
protected: protected:
friend class MVKMTLBufferAllocation; friend class MVKMTLBufferAllocation;
MVKBaseObject* getBaseObject() override { return this; };
MVKMTLBufferAllocation* newObject() override; MVKMTLBufferAllocation* newObject() override;
void returnAllocationUnlocked(MVKMTLBufferAllocation* ba); void returnAllocationUnlocked(MVKMTLBufferAllocation* ba);
void returnAllocation(MVKMTLBufferAllocation* ba); void returnAllocation(MVKMTLBufferAllocation* ba);

2
MoltenVK/MoltenVK/GPUObjects/MVKDescriptor.mm
View File

@ -729,7 +729,7 @@ void MVKBufferDescriptor::bind(MVKCommandEncoder* cmdEncoder,
MVKArrayRef<uint32_t> dynamicOffsets, MVKArrayRef<uint32_t> dynamicOffsets,
uint32_t& dynamicOffsetIndex) { uint32_t& dynamicOffsetIndex) {
MVKMTLBufferBinding bb; MVKMTLBufferBinding bb;
NSUInteger bufferDynamicOffset = (usesDynamicBufferOffsets() && dynamicOffsets.size > dynamicOffsetIndex NSUInteger bufferDynamicOffset = (usesDynamicBufferOffsets() && dynamicOffsets.size() > dynamicOffsetIndex
? dynamicOffsets[dynamicOffsetIndex++] : 0); ? dynamicOffsets[dynamicOffsetIndex++] : 0);
if (_mvkBuffer) { if (_mvkBuffer) {
bb.mtlBuffer = _mvkBuffer->getMTLBuffer(); bb.mtlBuffer = _mvkBuffer->getMTLBuffer();

14
MoltenVK/MoltenVK/GPUObjects/MVKDevice.h
View File

@ -959,13 +959,9 @@ public:
bool isUsingPipelineStageMetalArgumentBuffers() { return isUsingMetalArgumentBuffers() && !_device->_pMetalFeatures->descriptorSetArgumentBuffers; }; bool isUsingPipelineStageMetalArgumentBuffers() { return isUsingMetalArgumentBuffers() && !_device->_pMetalFeatures->descriptorSetArgumentBuffers; };
/** Constructs an instance for the specified device. */ /** Constructs an instance for the specified device. */
MVKDeviceTrackingMixin(MVKDevice* device) : _device(device) { assert(_device); } MVKDeviceTrackingMixin(MVKDevice* device) : _device(device) { assert(_device); }
virtual ~MVKDeviceTrackingMixin() {}
protected: protected:
virtual MVKBaseObject* getBaseObject() = 0;
MVKDevice* _device; MVKDevice* _device;
}; };
@ -980,9 +976,6 @@ public:
/** Constructs an instance for the specified device. */ /** Constructs an instance for the specified device. */
MVKBaseDeviceObject(MVKDevice* device) : MVKDeviceTrackingMixin(device) {} MVKBaseDeviceObject(MVKDevice* device) : MVKDeviceTrackingMixin(device) {}
protected:
MVKBaseObject* getBaseObject() override { return this; };
}; };
@ -999,10 +992,6 @@ public:
/** Constructs an instance for the specified device. */ /** Constructs an instance for the specified device. */
MVKVulkanAPIDeviceObject(MVKDevice* device) : MVKDeviceTrackingMixin(device) {} MVKVulkanAPIDeviceObject(MVKDevice* device) : MVKDeviceTrackingMixin(device) {}
protected:
MVKBaseObject* getBaseObject() override { return this; };
}; };
@ -1055,7 +1044,6 @@ public:
protected: protected:
T* newObject() override { return new T(_device); } T* newObject() override { return new T(_device); }
MVKBaseObject* getBaseObject() override { return this; };
}; };

2
MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
View File

@ -1530,7 +1530,7 @@ MVKArrayRef<MVKQueueFamily*> MVKPhysicalDevice::getQueueFamilies() {
VkResult MVKPhysicalDevice::getQueueFamilyProperties(uint32_t* pCount, VkResult MVKPhysicalDevice::getQueueFamilyProperties(uint32_t* pCount,
VkQueueFamilyProperties* pQueueFamilyProperties) { VkQueueFamilyProperties* pQueueFamilyProperties) {
auto qFams = getQueueFamilies(); auto qFams = getQueueFamilies();
uint32_t qfCnt = uint32_t(qFams.size); uint32_t qfCnt = uint32_t(qFams.size());
// If properties aren't actually being requested yet, simply update the returned count // If properties aren't actually being requested yet, simply update the returned count
if ( !pQueueFamilyProperties ) { if ( !pQueueFamilyProperties ) {

2
MoltenVK/MoltenVK/GPUObjects/MVKPipeline.mm
View File

@ -49,7 +49,7 @@ void MVKPipelineLayout::bindDescriptorSets(MVKCommandEncoder* cmdEncoder,
MVKArrayRef<uint32_t> dynamicOffsets) { MVKArrayRef<uint32_t> dynamicOffsets) {
if (!cmdEncoder) { clearConfigurationResult(); } if (!cmdEncoder) { clearConfigurationResult(); }
uint32_t dynamicOffsetIndex = 0; uint32_t dynamicOffsetIndex = 0;
size_t dsCnt = descriptorSets.size; size_t dsCnt = descriptorSets.size();
for (uint32_t dsIdx = 0; dsIdx < dsCnt; dsIdx++) { for (uint32_t dsIdx = 0; dsIdx < dsCnt; dsIdx++) {
MVKDescriptorSet* descSet = descriptorSets[dsIdx]; MVKDescriptorSet* descSet = descriptorSets[dsIdx];
uint32_t dslIdx = firstSet + dsIdx; uint32_t dslIdx = firstSet + dsIdx;

4
MoltenVK/MoltenVK/GPUObjects/MVKQueryPool.h
View File

@ -56,7 +56,7 @@ public:
virtual void endQuery(uint32_t query, MVKCommandEncoder* cmdEncoder); virtual void endQuery(uint32_t query, MVKCommandEncoder* cmdEncoder);
/** Finishes the specified queries and marks them as available. */ /** Finishes the specified queries and marks them as available. */
virtual void finishQueries(const MVKArrayRef<uint32_t> queries); virtual void finishQueries(MVKArrayRef<const uint32_t> queries);
/** Resets the results and availability status of the specified queries. */ /** Resets the results and availability status of the specified queries. */
virtual void resetResults(uint32_t firstQuery, uint32_t queryCount, MVKCommandEncoder* cmdEncoder); virtual void resetResults(uint32_t firstQuery, uint32_t queryCount, MVKCommandEncoder* cmdEncoder);
@ -212,7 +212,7 @@ class MVKTimestampQueryPool : public MVKGPUCounterQueryPool {
public: public:
void endQuery(uint32_t query, MVKCommandEncoder* cmdEncoder) override; void endQuery(uint32_t query, MVKCommandEncoder* cmdEncoder) override;
void finishQueries(const MVKArrayRef<uint32_t> queries) override; void finishQueries(MVKArrayRef<const uint32_t> queries) override;
#pragma mark Construction #pragma mark Construction

4
MoltenVK/MoltenVK/GPUObjects/MVKQueryPool.mm
View File

@ -52,7 +52,7 @@ void MVKQueryPool::endQuery(uint32_t query, MVKCommandEncoder* cmdEncoder) {
} }
// Mark queries as available // Mark queries as available
void MVKQueryPool::finishQueries(const MVKArrayRef<uint32_t> queries) { void MVKQueryPool::finishQueries(MVKArrayRef<const uint32_t> queries) {
lock_guard<mutex> lock(_availabilityLock); lock_guard<mutex> lock(_availabilityLock);
for (uint32_t qry : queries) { for (uint32_t qry : queries) {
if (_availability[qry] == DeviceAvailable) { if (_availability[qry] == DeviceAvailable) {
@ -379,7 +379,7 @@ void MVKTimestampQueryPool::endQuery(uint32_t query, MVKCommandEncoder* cmdEncod
} }
// If not using MTLCounterSampleBuffer, update timestamp values, then mark queries as available // If not using MTLCounterSampleBuffer, update timestamp values, then mark queries as available
void MVKTimestampQueryPool::finishQueries(const MVKArrayRef<uint32_t> queries) { void MVKTimestampQueryPool::finishQueries(MVKArrayRef<const uint32_t> queries) {
if ( !_mtlCounterBuffer ) { if ( !_mtlCounterBuffer ) {
uint64_t ts = mvkGetTimestamp(); uint64_t ts = mvkGetTimestamp();
for (uint32_t qry : queries) { _timestamps[qry] = ts; } for (uint32_t qry : queries) { _timestamps[qry] = ts; }

1
MoltenVK/MoltenVK/GPUObjects/MVKQueue.h
View File

@ -135,7 +135,6 @@ protected:
friend class MVKQueueCommandBufferSubmission; friend class MVKQueueCommandBufferSubmission;
friend class MVKQueuePresentSurfaceSubmission; friend class MVKQueuePresentSurfaceSubmission;
MVKBaseObject* getBaseObject() override { return this; };
void propagateDebugName() override; void propagateDebugName() override;
void initName(); void initName();
void initExecQueue(); void initExecQueue();

10
MoltenVK/MoltenVK/GPUObjects/MVKRenderPass.h
View File

@ -116,8 +116,8 @@ public:
void populateMTLRenderPassDescriptor(MTLRenderPassDescriptor* mtlRPDesc, void populateMTLRenderPassDescriptor(MTLRenderPassDescriptor* mtlRPDesc,
uint32_t passIdx, uint32_t passIdx,
MVKFramebuffer* framebuffer, MVKFramebuffer* framebuffer,
const MVKArrayRef<MVKImageView*> attachments, MVKArrayRef<MVKImageView*const> attachments,
const MVKArrayRef<VkClearValue> clearValues, MVKArrayRef<const VkClearValue> clearValues,
bool isRenderingEntireAttachment, bool isRenderingEntireAttachment,
bool loadOverride = false); bool loadOverride = false);
@ -126,7 +126,7 @@ public:
* when the render area is smaller than the full framebuffer size. * when the render area is smaller than the full framebuffer size.
*/ */
void populateClearAttachments(MVKClearAttachments& clearAtts, void populateClearAttachments(MVKClearAttachments& clearAtts,
const MVKArrayRef<VkClearValue> clearValues); MVKArrayRef<const VkClearValue> clearValues);
/** /**
* Populates the specified vector with VkClearRects for clearing views of a specified multiview * Populates the specified vector with VkClearRects for clearing views of a specified multiview
@ -140,11 +140,11 @@ public:
/** If a render encoder is active, sets the store actions for all attachments to it. */ /** If a render encoder is active, sets the store actions for all attachments to it. */
void encodeStoreActions(MVKCommandEncoder* cmdEncoder, void encodeStoreActions(MVKCommandEncoder* cmdEncoder,
bool isRenderingEntireAttachment, bool isRenderingEntireAttachment,
const MVKArrayRef<MVKImageView*> attachments, MVKArrayRef<MVKImageView*const> attachments,
bool storeOverride = false); bool storeOverride = false);
/** Resolves any resolve attachments that cannot be handled by native Metal subpass resolve behavior. */ /** Resolves any resolve attachments that cannot be handled by native Metal subpass resolve behavior. */
void resolveUnresolvableAttachments(MVKCommandEncoder* cmdEncoder, const MVKArrayRef<MVKImageView*> attachments); void resolveUnresolvableAttachments(MVKCommandEncoder* cmdEncoder, MVKArrayRef<MVKImageView*const> attachments);
MVKRenderSubpass(MVKRenderPass* renderPass, const VkSubpassDescription* pCreateInfo, MVKRenderSubpass(MVKRenderPass* renderPass, const VkSubpassDescription* pCreateInfo,
const VkRenderPassInputAttachmentAspectCreateInfo* pInputAspects, const VkRenderPassInputAttachmentAspectCreateInfo* pInputAspects,

10
MoltenVK/MoltenVK/GPUObjects/MVKRenderPass.mm
View File

@ -138,8 +138,8 @@ uint32_t MVKRenderSubpass::getViewCountUpToMetalPass(uint32_t passIdx) const {
void MVKRenderSubpass::populateMTLRenderPassDescriptor(MTLRenderPassDescriptor* mtlRPDesc, void MVKRenderSubpass::populateMTLRenderPassDescriptor(MTLRenderPassDescriptor* mtlRPDesc,
uint32_t passIdx, uint32_t passIdx,
MVKFramebuffer* framebuffer, MVKFramebuffer* framebuffer,
const MVKArrayRef<MVKImageView*> attachments, MVKArrayRef<MVKImageView*const> attachments,
const MVKArrayRef<VkClearValue> clearValues, MVKArrayRef<const VkClearValue> clearValues,
bool isRenderingEntireAttachment, bool isRenderingEntireAttachment,
bool loadOverride) { bool loadOverride) {
MVKPixelFormats* pixFmts = _renderPass->getPixelFormats(); MVKPixelFormats* pixFmts = _renderPass->getPixelFormats();
@ -279,7 +279,7 @@ void MVKRenderSubpass::populateMTLRenderPassDescriptor(MTLRenderPassDescriptor*
void MVKRenderSubpass::encodeStoreActions(MVKCommandEncoder* cmdEncoder, void MVKRenderSubpass::encodeStoreActions(MVKCommandEncoder* cmdEncoder,
bool isRenderingEntireAttachment, bool isRenderingEntireAttachment,
const MVKArrayRef<MVKImageView*> attachments, MVKArrayRef<MVKImageView*const> attachments,
bool storeOverride) { bool storeOverride) {
if (!cmdEncoder->_mtlRenderEncoder) { return; } if (!cmdEncoder->_mtlRenderEncoder) { return; }
if (!_renderPass->getDevice()->_pMetalFeatures->deferredStoreActions) { return; } if (!_renderPass->getDevice()->_pMetalFeatures->deferredStoreActions) { return; }
@ -308,7 +308,7 @@ void MVKRenderSubpass::encodeStoreActions(MVKCommandEncoder* cmdEncoder,
} }
void MVKRenderSubpass::populateClearAttachments(MVKClearAttachments& clearAtts, void MVKRenderSubpass::populateClearAttachments(MVKClearAttachments& clearAtts,
const MVKArrayRef<VkClearValue> clearValues) { MVKArrayRef<const VkClearValue> clearValues) {
uint32_t caCnt = getColorAttachmentCount(); uint32_t caCnt = getColorAttachmentCount();
for (uint32_t caIdx = 0; caIdx < caCnt; caIdx++) { for (uint32_t caIdx = 0; caIdx < caCnt; caIdx++) {
uint32_t attIdx = _colorAttachments[caIdx].attachment; uint32_t attIdx = _colorAttachments[caIdx].attachment;
@ -394,7 +394,7 @@ MVKMTLFmtCaps MVKRenderSubpass::getRequiredFormatCapabilitiesForAttachmentAt(uin
return caps; return caps;
} }
void MVKRenderSubpass::resolveUnresolvableAttachments(MVKCommandEncoder* cmdEncoder, const MVKArrayRef<MVKImageView*> attachments) { void MVKRenderSubpass::resolveUnresolvableAttachments(MVKCommandEncoder* cmdEncoder, MVKArrayRef<MVKImageView*const> attachments) {
MVKPixelFormats* pixFmts = cmdEncoder->getPixelFormats(); MVKPixelFormats* pixFmts = cmdEncoder->getPixelFormats();
size_t raCnt = _resolveAttachments.size(); size_t raCnt = _resolveAttachments.size();
for (uint32_t raIdx = 0; raIdx < raCnt; raIdx++) { for (uint32_t raIdx = 0; raIdx < raCnt; raIdx++) {

17
MoltenVK/MoltenVK/Utility/MVKBaseObject.h
View File

@ -105,7 +105,7 @@ public:
/** Destroys this object. Default behaviour simply deletes it. Subclasses may override to delay deletion. */ /** Destroys this object. Default behaviour simply deletes it. Subclasses may override to delay deletion. */
virtual void destroy() { delete this; } virtual void destroy() { delete this; }
virtual ~MVKBaseObject() {} virtual ~MVKBaseObject() {}
protected: protected:
static VkResult reportResult(MVKBaseObject* mvkObj, VkResult vkRslt, MVKConfigLogLevel logLevel, const char* format, va_list args) __printflike(4, 0); static VkResult reportResult(MVKBaseObject* mvkObj, VkResult vkRslt, MVKConfigLogLevel logLevel, const char* format, va_list args) __printflike(4, 0);
@ -143,7 +143,7 @@ public:
* Called when this instance has been retained as a reference by another object, * Called when this instance has been retained as a reference by another object,
* indicating that this instance will not be deleted until that reference is released. * indicating that this instance will not be deleted until that reference is released.
*/ */
void retain() { _refCount++; } void retain() { _refCount.fetch_add(1, std::memory_order_relaxed); }
/** /**
* Called when this instance has been released as a reference from another object. * Called when this instance has been released as a reference from another object.
@ -154,7 +154,7 @@ public:
* Note that the destroy() function is called on the BaseClass. * Note that the destroy() function is called on the BaseClass.
* Releasing will not call any overridden destroy() function in a descendant class. * Releasing will not call any overridden destroy() function in a descendant class.
*/ */
void release() { if (--_refCount == 0) { BaseClass::destroy(); } } void release() { if (_refCount.fetch_sub(1, std::memory_order_acq_rel) == 1) { BaseClass::destroy(); } }
/** /**
* Marks this instance as destroyed. If all previous references to this instance * Marks this instance as destroyed. If all previous references to this instance
@ -166,15 +166,10 @@ public:
MVKReferenceCountingMixin() : _refCount(1) {} MVKReferenceCountingMixin() : _refCount(1) {}
/** Copy starts with fresh reference counts. */ /** Copy starts with fresh reference counts. */
MVKReferenceCountingMixin(const MVKReferenceCountingMixin& other) { MVKReferenceCountingMixin(const MVKReferenceCountingMixin& other) : _refCount(1) {}
_refCount = 1;
}
/** Copy starts with fresh reference counts. */ /** Don't overwrite refcounted objects. */
MVKReferenceCountingMixin& operator=(const MVKReferenceCountingMixin& other) { MVKReferenceCountingMixin& operator=(const MVKReferenceCountingMixin& other) = delete;
_refCount = 1;
return *this;
}
protected: protected:
std::atomic<uint32_t> _refCount; std::atomic<uint32_t> _refCount;

29
MoltenVK/MoltenVK/Utility/MVKFoundation.h
View File

@ -478,20 +478,21 @@ std::size_t mvkHash(const N* pVals, std::size_t count = 1, std::size_t seed = 53
*/ */
template<typename Type> template<typename Type>
struct MVKArrayRef { struct MVKArrayRef {
Type* data; public:
const size_t size; constexpr Type* begin() const { return _data; }
constexpr Type* end() const { return &_data[_size]; }
constexpr Type* data() const { return _data; }
constexpr size_t size() const { return _size; }
constexpr size_t byteSize() const { return _size * sizeof(Type); }
constexpr Type& operator[]( const size_t i ) const { return _data[i]; }
constexpr MVKArrayRef() : MVKArrayRef(nullptr, 0) {}
constexpr MVKArrayRef(Type* d, size_t s) : _data(d), _size(s) {}
template <typename Other, std::enable_if_t<std::is_convertible_v<Other(*)[], Type(*)[]>, bool> = true>
constexpr MVKArrayRef(MVKArrayRef<Other> other) : _data(other.data()), _size(other.size()) {}
const Type* begin() const { return data; } protected:
const Type* end() const { return &data[size]; } Type* _data;
const Type& operator[]( const size_t i ) const { return data[i]; } size_t _size;
Type& operator[]( const size_t i ) { return data[i]; }
MVKArrayRef<Type>& operator=(const MVKArrayRef<Type>& other) {
data = other.data;
*(size_t*)&size = other.size;
return *this;
}
MVKArrayRef() : MVKArrayRef(nullptr, 0) {}
MVKArrayRef(Type* d, size_t s) : data(d), size(s) {}
}; };
/** Ensures the size of the specified container is at least the specified size. */ /** Ensures the size of the specified container is at least the specified size. */
@ -598,7 +599,7 @@ bool mvkAreEqual(const T* pV1, const T* pV2, size_t count = 1) {
* which works on individual chars or char arrays, not strings. * which works on individual chars or char arrays, not strings.
* Returns false if either string is null. * Returns false if either string is null.
*/ */
static constexpr bool mvkStringsAreEqual(const char* pV1, const char* pV2, size_t count = 1) { static constexpr bool mvkStringsAreEqual(const char* pV1, const char* pV2) {
return pV1 && pV2 && (pV1 == pV2 || strcmp(pV1, pV2) == 0); return pV1 && pV2 && (pV1 == pV2 || strcmp(pV1, pV2) == 0);
} }

8
MoltenVK/MoltenVK/Utility/MVKSmallVector.h
View File

@ -298,12 +298,12 @@ public:
reverse_iterator rbegin() const { return reverse_iterator( end() ); } reverse_iterator rbegin() const { return reverse_iterator( end() ); }
reverse_iterator rend() const { return reverse_iterator( begin() ); } reverse_iterator rend() const { return reverse_iterator( begin() ); }
const MVKArrayRef<Type> contents() const { return MVKArrayRef<Type>(data(), size()); } MVKArrayRef<const Type> contents() const { return MVKArrayRef<const Type>(data(), size()); }
MVKArrayRef<Type> contents() { return MVKArrayRef<Type>(data(), size()); } MVKArrayRef< Type> contents() { return MVKArrayRef< Type>(data(), size()); }
const Type &operator[]( const size_t i ) const { return alc[i]; } const Type &operator[]( const size_t i ) const { return alc[i]; }
Type &operator[]( const size_t i ) { return alc[i]; } Type &operator[]( const size_t i ) { return alc[i]; }
const Type &at( const size_t i ) const { return alc[i]; } const Type &at( const size_t i ) const { return alc[i]; }
Type &at( const size_t i ) { return alc[i]; } Type &at( const size_t i ) { return alc[i]; }
const Type &front() const { return alc[0]; } const Type &front() const { return alc[0]; }
Type &front() { return alc[0]; } Type &front() { return alc[0]; }

2
MoltenVK/MoltenVK/Vulkan/vulkan.mm
View File

@ -1964,7 +1964,7 @@ static void mvkCmdBeginRenderPass(
MVKAddCmdFrom5Thresholds(BeginRenderPass, MVKAddCmdFrom5Thresholds(BeginRenderPass,
pRenderPassBegin->clearValueCount, 1, 2, pRenderPassBegin->clearValueCount, 1, 2,
attachments.size, 0, 1, 2, attachments.size(), 0, 1, 2,
commandBuffer, commandBuffer,
pRenderPassBegin, pRenderPassBegin,
pSubpassBeginInfo, pSubpassBeginInfo,