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

Clean up recent commits for iOS compatibility.

Browse Source 
Test for _pMetalFeatures->layeredRendering before setting
MTLRenderPassDescriptor.renderTargetArrayLength.
Change NSString comparisons using isEqualTo: to isEqualToString:.
This commit is contained in:
Bill Hollings 2019-04-01 23:05:42 -04:00
parent dfd5638a0f
commit 6a77fc950a
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MoltenVK/MoltenVK/Commands/MVKCmdTransfer.mm
View File

@ -1054,7 +1054,8 @@ void MVKCmdClearImage::encode(MVKCommandEncoder* cmdEncoder) {
mtlRPCADesc.level = mipLvl; mtlRPCADesc.level = mipLvl;
mtlRPDADesc.level = mipLvl; mtlRPDADesc.level = mipLvl;
mtlRPSADesc.level = mipLvl; mtlRPSADesc.level = mipLvl;
mtlRPDesc.renderTargetArrayLengthMVK = mvkMipmapLevelSizeFromBaseSize3D(imgBaseExtent, mipLvl).depth; uint32_t imgLayerCount = mvkMipmapLevelSizeFromBaseSize3D(imgBaseExtent, mipLvl).depth;
mtlRPDesc.renderTargetArrayLengthMVK = getDevice()->_pMetalFeatures->layeredRendering ? imgLayerCount : 0;
for (uint32_t layer = layerStart; layer < layerEnd; layer++) { for (uint32_t layer = layerStart; layer < layerEnd; layer++) {
mtlRPCADesc.slice = layer; mtlRPCADesc.slice = layer;

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

@ -246,10 +246,11 @@ void MVKCommandEncoder::beginMetalRenderPass() {
endCurrentMetalEncoding(); endCurrentMetalEncoding();
auto pMTLFeats = _device->_pMetalFeatures;
MTLRenderPassDescriptor* mtlRPDesc = [MTLRenderPassDescriptor renderPassDescriptor]; MTLRenderPassDescriptor* mtlRPDesc = [MTLRenderPassDescriptor renderPassDescriptor];
getSubpass()->populateMTLRenderPassDescriptor(mtlRPDesc, _framebuffer, _clearValues, _isRenderingEntireAttachment); getSubpass()->populateMTLRenderPassDescriptor(mtlRPDesc, _framebuffer, _clearValues, _isRenderingEntireAttachment);
mtlRPDesc.visibilityResultBuffer = _occlusionQueryState.getVisibilityResultMTLBuffer(); mtlRPDesc.visibilityResultBuffer = _occlusionQueryState.getVisibilityResultMTLBuffer();
mtlRPDesc.renderTargetArrayLengthMVK = _framebuffer->getLayerCount(); mtlRPDesc.renderTargetArrayLengthMVK = pMTLFeats->layeredRendering ? _framebuffer->getLayerCount() : 0;
mtlRPDesc.renderTargetWidthMVK = min(_framebuffer->getExtent2D().width, _renderArea.offset.x + _renderArea.extent.width); mtlRPDesc.renderTargetWidthMVK = min(_framebuffer->getExtent2D().width, _renderArea.offset.x + _renderArea.extent.width);
mtlRPDesc.renderTargetHeightMVK = min(_framebuffer->getExtent2D().height, _renderArea.offset.y + _renderArea.extent.height); mtlRPDesc.renderTargetHeightMVK = min(_framebuffer->getExtent2D().height, _renderArea.offset.y + _renderArea.extent.height);

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

@ -62,7 +62,7 @@ MVKSurface::MVKSurface(MVKInstance* mvkInstance,
// Sometimes, the owning view can replace its CAMetalLayer. In that case, the client // Sometimes, the owning view can replace its CAMetalLayer. In that case, the client
// needs to recreate the surface. // needs to recreate the surface.
_layerObserver = [MVKBlockObserver observerWithBlock: ^(NSString* path, id, NSDictionary*, void*) { _layerObserver = [MVKBlockObserver observerWithBlock: ^(NSString* path, id, NSDictionary*, void*) {
if ( ![path isEqualTo: @"layer"] ) { return; } if ( ![path isEqualToString: @"layer"] ) { return; }
std::lock_guard<std::mutex> lock(this->_lock); std::lock_guard<std::mutex> lock(this->_lock);
[this->_mtlCAMetalLayer release]; [this->_mtlCAMetalLayer release];
this->_mtlCAMetalLayer = nil; this->_mtlCAMetalLayer = nil;

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

@ -226,7 +226,7 @@ void MVKSwapchain::initCAMetalLayer(const VkSwapchainCreateInfoKHR* pCreateInfo,
// Sometimes, the owning view can replace its CAMetalLayer. In that case, the client // Sometimes, the owning view can replace its CAMetalLayer. In that case, the client
// needs to recreate the swapchain, or no content will be displayed. // needs to recreate the swapchain, or no content will be displayed.
_layerObserver = [MVKBlockObserver observerWithBlock: ^(NSString* path, id, NSDictionary*, void*) { _layerObserver = [MVKBlockObserver observerWithBlock: ^(NSString* path, id, NSDictionary*, void*) {
if ( ![path isEqualTo: @"layer"] ) { return; } if ( ![path isEqualToString: @"layer"] ) { return; }
this->_surfaceLost = true; this->_surfaceLost = true;
[this->_layerObserver release]; [this->_layerObserver release];
this->_layerObserver = nil; this->_layerObserver = nil;