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

Fix typo.

Browse Source
This commit is contained in:
michael 2020-05-26 19:07:12 +08:00 committed by michael
parent e2ef10b977
commit 7448fe5b60
25 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,7 +146,7 @@ protected:
friend class MVKCommandPool;
MVKBaseObject* getBaseObject() override { return this; };
void propogateDebugName() override {}
void propagateDebugName() override {}
void init(const VkCommandBufferAllocateInfo* pAllocateInfo);
bool canExecute();
bool canPrefill();

2
MoltenVK/MoltenVK/Commands/MVKCommandPool.h
View File

@ -100,7 +100,7 @@ public:
~MVKCommandPool() override;
protected:
void propogateDebugName() override {}
void propagateDebugName() override {}
MVKDeviceObjectPool<MVKCommandBuffer> _commandBufferPool;
std::unordered_set<MVKCommandBuffer*> _allocatedCommandBuffers;
MVKCommandEncodingPool _commandEncodingPool;

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

@ -88,7 +88,7 @@ protected:
friend class MVKDeviceMemory;
using MVKResource::needsHostReadSync;
void propogateDebugName() override;
void propagateDebugName() override;
bool needsHostReadSync(VkPipelineStageFlags srcStageMask,
VkPipelineStageFlags dstStageMask,
MVKPipelineBarrier& barrier);
@ -129,7 +129,7 @@ public:
~MVKBufferView() override;
protected:
void propogateDebugName() override;
void propagateDebugName() override;
MVKBuffer* _buffer;
id<MTLTexture> _mtlTexture;

12
MoltenVK/MoltenVK/GPUObjects/MVKBuffer.mm
View File

@ -28,7 +28,7 @@ using namespace std;
#pragma mark -
#pragma mark MVKBuffer
void MVKBuffer::propogateDebugName() {
void MVKBuffer::propagateDebugName() {
if (!_debugName) { return; }
if (_deviceMemory &&
_deviceMemory->isDedicatedAllocation() &&
@ -88,7 +88,7 @@ VkResult MVKBuffer::bindDeviceMemory(MVKDeviceMemory* mvkMem, VkDeviceSize memOf
}
#endif
propogateDebugName();
propagateDebugName();
return _deviceMemory ? _deviceMemory->addBuffer(this) : VK_SUCCESS;
}
@ -171,7 +171,7 @@ id<MTLBuffer> MVKBuffer::getMTLBuffer() {
_mtlBuffer = [_deviceMemory->getMTLHeap() newBufferWithLength: getByteCount()
options: _deviceMemory->getMTLResourceOptions()
offset: _deviceMemoryOffset]; // retained
propogateDebugName();
propagateDebugName();
return _mtlBuffer;
#if MVK_MACOS
} else if (_isHostCoherentTexelBuffer) {
@ -179,7 +179,7 @@ id<MTLBuffer> MVKBuffer::getMTLBuffer() {
// But texel buffers on Mac cannot use shared memory. So we need to use host-cached memory here.
_mtlBuffer = [_device->getMTLDevice() newBufferWithLength: getByteCount()
options: MTLResourceStorageModeManaged]; // retained
propogateDebugName();
propagateDebugName();
return _mtlBuffer;
#endif
} else {
@ -228,7 +228,7 @@ MVKBuffer::~MVKBuffer() {
#pragma mark -
#pragma mark MVKBufferView
void MVKBufferView::propogateDebugName() {
void MVKBufferView::propagateDebugName() {
setLabelIfNotNil(_mtlTexture, _debugName);
}
@ -264,7 +264,7 @@ id<MTLTexture> MVKBufferView::getMTLTexture() {
_mtlTexture = [mtlBuff newTextureWithDescriptor: mtlTexDesc
offset: _mtlBufferOffset
bytesPerRow: _mtlBytesPerRow];
propogateDebugName();
propagateDebugName();
}
return _mtlTexture;
}

8
MoltenVK/MoltenVK/GPUObjects/MVKDescriptorSet.h
View File

@ -81,7 +81,7 @@ protected:
friend class MVKDescriptorSet;
friend class MVKDescriptorPool;
void propogateDebugName() override {}
void propagateDebugName() override {}
inline uint32_t getDescriptorCount() { return _descriptorCount; }
uint32_t getDescriptorIndex(uint32_t binding, uint32_t elementIndex);
inline MVKDescriptorSetLayoutBinding* getBinding(uint32_t binding) { return &_bindings[_bindingToIndex[binding]]; }
@ -133,7 +133,7 @@ protected:
friend class MVKDescriptorSetLayoutBinding;
friend class MVKDescriptorPool;
void propogateDebugName() override {}
void propagateDebugName() override {}
inline MVKDescriptor* getDescriptor(uint32_t index) { return _descriptors[index]; }
MVKDescriptorSetLayout* _layout;
@ -239,7 +239,7 @@ public:
protected:
friend class MVKDescriptorSet;
void propogateDebugName() override {}
void propagateDebugName() override {}
VkResult allocateDescriptorSet(MVKDescriptorSetLayout* mvkDSL, VkDescriptorSet* pVKDS);
void freeDescriptorSet(MVKDescriptorSet* mvkDS);
VkResult allocateDescriptor(VkDescriptorType descriptorType, MVKDescriptor** pMVKDesc);
@ -281,7 +281,7 @@ public:
~MVKDescriptorUpdateTemplate() override = default;
protected:
void propogateDebugName() override {}
void propagateDebugName() override {}
VkDescriptorUpdateTemplateTypeKHR _type;
MVKSmallVector<VkDescriptorUpdateTemplateEntryKHR, 1> _entries;

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

@ -332,7 +332,7 @@ public:
protected:
friend class MVKDevice;
void propogateDebugName() override {}
void propagateDebugName() override {}
MTLFeatureSet getMaximalMTLFeatureSet();
void initMetalFeatures();
void initFeatures();
@ -695,7 +695,7 @@ public:
}
protected:
void propogateDebugName() override {}
void propagateDebugName() override {}
MVKResource* addResource(MVKResource* rez);
MVKResource* removeResource(MVKResource* rez);
void initPerformanceTracking();

2
MoltenVK/MoltenVK/GPUObjects/MVKDeviceMemory.h
View File

@ -134,7 +134,7 @@ protected:
friend MVKBuffer;
friend MVKImage;
void propogateDebugName() override;
void propagateDebugName() override;
VkDeviceSize adjustMemorySize(VkDeviceSize size, VkDeviceSize offset);
VkResult addBuffer(MVKBuffer* mvkBuff);
void removeBuffer(MVKBuffer* mvkBuff);

6
MoltenVK/MoltenVK/GPUObjects/MVKDeviceMemory.mm
View File

@ -32,7 +32,7 @@ using namespace std;
#pragma mark MVKDeviceMemory
void MVKDeviceMemory::propogateDebugName() {
void MVKDeviceMemory::propagateDebugName() {
setLabelIfNotNil(_mtlHeap, _debugName);
setLabelIfNotNil(_mtlBuffer, _debugName);
}
@ -205,7 +205,7 @@ bool MVKDeviceMemory::ensureMTLHeap() {
[heapDesc release];
if (!_mtlHeap) { return false; }
propogateDebugName();
propagateDebugName();
return true;
}
@ -237,7 +237,7 @@ bool MVKDeviceMemory::ensureMTLBuffer() {
if (!_mtlBuffer) { return false; }
_pMemory = isMemoryHostAccessible() ? _mtlBuffer.contents : nullptr;
propogateDebugName();
propagateDebugName();
return true;
}

2
MoltenVK/MoltenVK/GPUObjects/MVKFramebuffer.h
View File

@ -52,7 +52,7 @@ public:
MVKFramebuffer(MVKDevice* device, const VkFramebufferCreateInfo* pCreateInfo);
protected:
void propogateDebugName() override {}
void propagateDebugName() override {}
VkExtent2D _extent;
uint32_t _layerCount;

6
MoltenVK/MoltenVK/GPUObjects/MVKImage.h
View File

@ -229,7 +229,7 @@ protected:
friend class MVKImageView;
using MVKResource::needsHostReadSync;
void propogateDebugName() override;
void propagateDebugName() override;
MVKImageSubresource* getSubresource(uint32_t mipLevel, uint32_t arrayLayer);
void validateConfig(const VkImageCreateInfo* pCreateInfo, bool isAttachment);
VkSampleCountFlagBits validateSamples(const VkImageCreateInfo* pCreateInfo, bool isAttachment);
@ -475,7 +475,7 @@ public:
~MVKImageView() override;
protected:
void propogateDebugName() override;
void propagateDebugName() override;
id<MTLTexture> newMTLTexture();
void initMTLTextureViewSupport();
void validateImageViewConfig(const VkImageViewCreateInfo* pCreateInfo);
@ -523,7 +523,7 @@ public:
~MVKSampler() override;
protected:
void propogateDebugName() override {}
void propagateDebugName() override {}
MTLSamplerDescriptor* newMTLSamplerDescriptor(const VkSamplerCreateInfo* pCreateInfo);
void initConstExprSampler(const VkSamplerCreateInfo* pCreateInfo);

8
MoltenVK/MoltenVK/GPUObjects/MVKImage.mm
View File

@ -35,7 +35,7 @@ using namespace SPIRV_CROSS_NAMESPACE;
#pragma mark MVKImage
void MVKImage::propogateDebugName() { setLabelIfNotNil(_mtlTexture, _debugName); }
void MVKImage::propagateDebugName() { setLabelIfNotNil(_mtlTexture, _debugName); }
VkImageType MVKImage::getImageType() { return mvkVkImageTypeFromMTLTextureType(_mtlTextureType); }
@ -277,7 +277,7 @@ id<MTLTexture> MVKImage::getMTLTexture() {
_mtlTexture = newMTLTexture(); // retained
propogateDebugName();
propagateDebugName();
}
return _mtlTexture;
}
@ -1075,7 +1075,7 @@ MVKPeerSwapchainImage::MVKPeerSwapchainImage(MVKDevice* device,
#pragma mark -
#pragma mark MVKImageView
void MVKImageView::propogateDebugName() { setLabelIfNotNil(_mtlTexture, _debugName); }
void MVKImageView::propagateDebugName() { setLabelIfNotNil(_mtlTexture, _debugName); }
void MVKImageView::populateMTLRenderPassAttachmentDescriptor(MTLRenderPassAttachmentDescriptor* mtlAttDesc) {
mtlAttDesc.texture = getMTLTexture(); // Use image view, necessary if image view format differs from image format
@ -1115,7 +1115,7 @@ id<MTLTexture> MVKImageView::getMTLTexture() {
_mtlTexture = newMTLTexture(); // retained
propogateDebugName();
propagateDebugName();
}
return _mtlTexture;
} else {

6
MoltenVK/MoltenVK/GPUObjects/MVKInstance.h
View File

@ -177,7 +177,7 @@ public:
protected:
friend MVKDevice;
void propogateDebugName() override {}
void propagateDebugName() override {}
void initProcAddrs();
void initDebugCallbacks(const VkInstanceCreateInfo* pCreateInfo);
VkDebugReportFlagsEXT getVkDebugReportFlagsFromASLLevel(int aslLvl);
@ -233,7 +233,7 @@ public:
protected:
friend MVKInstance;
void propogateDebugName() override {}
void propagateDebugName() override {}
MVKInstance* _mvkInstance;
VkDebugReportCallbackCreateInfoEXT _info;
@ -271,7 +271,7 @@ public:
protected:
friend MVKInstance;
void propogateDebugName() override {}
void propagateDebugName() override {}
MVKInstance* _mvkInstance;
VkDebugUtilsMessengerCreateInfoEXT _info;

6
MoltenVK/MoltenVK/GPUObjects/MVKPipeline.h
View File

@ -105,7 +105,7 @@ public:
~MVKPipelineLayout() override;
protected:
void propogateDebugName() override {}
void propagateDebugName() override {}
MVKSmallVector<MVKDescriptorSetLayout*, 1> _descriptorSetLayouts;
MVKSmallVector<MVKShaderResourceBinding, 1> _dslMTLResourceIndexOffsets;
@ -168,7 +168,7 @@ public:
MVKPipeline(MVKDevice* device, MVKPipelineCache* pipelineCache, MVKPipelineLayout* layout, MVKPipeline* parent);
protected:
void propogateDebugName() override {}
void propagateDebugName() override {}
MVKPipelineCache* _pipelineCache;
MVKShaderImplicitRezBinding _swizzleBufferIndex;
@ -378,7 +378,7 @@ public:
~MVKPipelineCache() override;
protected:
void propogateDebugName() override {}
void propagateDebugName() override {}
MVKShaderLibraryCache* getShaderLibraryCache(MVKShaderModuleKey smKey);
void readData(const VkPipelineCacheCreateInfo* pCreateInfo);
void writeData(std::ostream& outstream, bool isCounting = false);

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

@ -151,7 +151,7 @@ public:
MVKTimestampQueryPool(MVKDevice* device, const VkQueryPoolCreateInfo* pCreateInfo);
protected:
void propogateDebugName() override {}
void propagateDebugName() override {}
void getResult(uint32_t query, void* pQryData, bool shouldOutput64Bit) override;
id<MTLBuffer> getResultBuffer(MVKCommandEncoder* cmdEncoder, uint32_t firstQuery, uint32_t queryCount, NSUInteger& offset) override;
void encodeSetResultBuffer(MVKCommandEncoder* cmdEncoder, uint32_t firstQuery, uint32_t queryCount, uint32_t index) override;
@ -187,7 +187,7 @@ public:
~MVKOcclusionQueryPool() override;
protected:
void propogateDebugName() override;
void propagateDebugName() override;
void getResult(uint32_t query, void* pQryData, bool shouldOutput64Bit) override;
id<MTLBuffer> getResultBuffer(MVKCommandEncoder* cmdEncoder, uint32_t firstQuery, uint32_t queryCount, NSUInteger& offset) override;
void encodeSetResultBuffer(MVKCommandEncoder* cmdEncoder, uint32_t firstQuery, uint32_t queryCount, uint32_t index) override;
@ -207,7 +207,7 @@ public:
MVKPipelineStatisticsQueryPool(MVKDevice* device, const VkQueryPoolCreateInfo* pCreateInfo);
protected:
void propogateDebugName() override {}
void propagateDebugName() override {}
};
@ -221,6 +221,6 @@ public:
MVKUnsupportedQueryPool(MVKDevice* device, const VkQueryPoolCreateInfo* pCreateInfo);
protected:
void propogateDebugName() override {}
void propagateDebugName() override {}
};

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

@ -223,7 +223,7 @@ MVKTimestampQueryPool::MVKTimestampQueryPool(MVKDevice* device,
#pragma mark -
#pragma mark MVKOcclusionQueryPool
void MVKOcclusionQueryPool::propogateDebugName() { setLabelIfNotNil(_visibilityResultMTLBuffer, _debugName); }
void MVKOcclusionQueryPool::propagateDebugName() { setLabelIfNotNil(_visibilityResultMTLBuffer, _debugName); }
// If a dedicated visibility buffer has been established, use it, otherwise fetch the
// current global visibility buffer, but don't cache it because it could be replaced later.

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

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

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

@ -62,7 +62,7 @@ MVKQueueFamily::~MVKQueueFamily() {
#pragma mark -
#pragma mark MVKQueue
void MVKQueue::propogateDebugName() { setLabelIfNotNil(_mtlQueue, _debugName); }
void MVKQueue::propagateDebugName() { setLabelIfNotNil(_mtlQueue, _debugName); }
#pragma mark Queue submissions

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

@ -171,7 +171,7 @@ protected:
friend class MVKRenderSubpass;
friend class MVKRenderPassAttachment;
void propogateDebugName() override {}
void propagateDebugName() override {}
MVKSmallVector<MVKRenderPassAttachment, kMVKDefaultAttachmentCount> _attachments;
MVKSmallVector<MVKRenderSubpass, 1> _subpasses;

2
MoltenVK/MoltenVK/GPUObjects/MVKShaderModule.h
View File

@ -224,7 +224,7 @@ public:
protected:
friend MVKShaderCacheIterator;
void propogateDebugName() override {}
void propagateDebugName() override {}
MVKGLSLConversionShaderStage getMVKGLSLConversionShaderStage(SPIRVToMSLConversionConfiguration* pContext);
MVKShaderLibraryCache _shaderLibraryCache;

2
MoltenVK/MoltenVK/GPUObjects/MVKSurface.h
View File

@ -76,7 +76,7 @@ public:
~MVKSurface() override;
protected:
void propogateDebugName() override {}
void propagateDebugName() override {}
void initLayerObserver();
MVKInstance* _mvkInstance;

2
MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.h
View File

@ -105,7 +105,7 @@ public:
protected:
friend class MVKPresentableSwapchainImage;
void propogateDebugName() override;
void propagateDebugName() override;
void initCAMetalLayer(const VkSwapchainCreateInfoKHR* pCreateInfo, uint32_t imgCnt);
void initSurfaceImages(const VkSwapchainCreateInfoKHR* pCreateInfo, uint32_t imgCnt);
void releaseUndisplayedSurfaces();

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

@ -42,7 +42,7 @@ using namespace std;
#pragma mark -
#pragma mark MVKSwapchain
void MVKSwapchain::propogateDebugName() {
void MVKSwapchain::propagateDebugName() {
if (_debugName) {
size_t imgCnt = _presentableImages.size();
for (size_t imgIdx = 0; imgIdx < imgCnt; imgIdx++) {

6
MoltenVK/MoltenVK/GPUObjects/MVKSync.h
View File

@ -159,7 +159,7 @@ public:
MVKSemaphore(MVKDevice* device, const VkSemaphoreCreateInfo* pCreateInfo) : MVKVulkanAPIDeviceObject(device) {}
protected:
void propogateDebugName() override {}
void propagateDebugName() override {}
};
@ -270,7 +270,7 @@ public:
MVKVulkanAPIDeviceObject(device), _isSignaled(mvkAreAllFlagsEnabled(pCreateInfo->flags, VK_FENCE_CREATE_SIGNALED_BIT)) {}
protected:
void propogateDebugName() override {}
void propagateDebugName() override {}
void notifySitters();
std::mutex _lock;
@ -349,7 +349,7 @@ public:
MVKEvent(MVKDevice* device, const VkEventCreateInfo* pCreateInfo) : MVKVulkanAPIDeviceObject(device) {}
protected:
void propogateDebugName() override {}
void propagateDebugName() override {}
};

2
MoltenVK/MoltenVK/GPUObjects/MVKVulkanAPIObject.h
View File

@ -101,7 +101,7 @@ public:
~MVKVulkanAPIObject() override;
protected:
virtual void propogateDebugName() = 0;
virtual void propagateDebugName() = 0;
std::atomic<uint32_t> _refCount;
NSString* _debugName = nil;

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

@ -40,7 +40,7 @@ VkResult MVKVulkanAPIObject::setDebugName(const char* pObjectName) {
if (pObjectName) {
[_debugName release];
_debugName = [[NSString alloc] initWithUTF8String: pObjectName]; // retained
propogateDebugName();
propagateDebugName();
}
return VK_SUCCESS;
}