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

Merge pull request #200 from billhollings/master

Browse Source 
Report correct workgroup sizes from MTLDevice.
This commit is contained in:
Bill Hollings 2018-07-24 00:16:15 -04:00 committed by GitHub
commit b70932b262
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MoltenVK/MoltenVK/API/mvk_datatypes.h
View File

@ -383,16 +383,26 @@ static inline VkExtent2D mvkVkExtent2DFromCGSize(CGSize cgSize) {
return vkExt;
}
/** Returns a Metal MTLOrigin constructed from the specified VkOffset3D. */
/** Returns a Metal MTLOrigin constructed from a VkOffset3D. */
static inline MTLOrigin mvkMTLOriginFromVkOffset3D(VkOffset3D vkOffset) {
return MTLOriginMake(vkOffset.x, vkOffset.y, vkOffset.z);
}
/** Returns a Metal MTLSize constructed from the specified VkExtent3D. */
/** Returns a Vulkan VkOffset3D constructed from a Metal MTLOrigin. */
static inline VkOffset3D mvkVkOffset3DFromMTLSize(MTLOrigin mtlOrigin) {
return { (int32_t)mtlOrigin.x, (int32_t)mtlOrigin.y, (int32_t)mtlOrigin.z };
}
/** Returns a Metal MTLSize constructed from a VkExtent3D. */
static inline MTLSize mvkMTLSizeFromVkExtent3D(VkExtent3D vkExtent) {
return MTLSizeMake(vkExtent.width, vkExtent.height, vkExtent.depth);
}
/** Returns a Vulkan VkExtent3D constructed from a Metal MTLSize. */
static inline VkExtent3D mvkVkExtent3DFromMTLSize(MTLSize mtlSize) {
return { (uint32_t)mtlSize.width, (uint32_t)mtlSize.height, (uint32_t)mtlSize.depth };
}
#pragma mark -
#pragma mark Memory options

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

@ -35,6 +35,7 @@
#include <MoltenVKSPIRVToMSLConverter/SPIRVToMSLConverter.h>
#include "mvk_datatypes.h"
#include "vk_mvk_moltenvk.h"
#import "CAMetalLayer+MoltenVK.h"
using namespace std;
@ -590,7 +591,6 @@ void MVKPhysicalDevice::initProperties() {
_properties.limits.optimalBufferCopyOffsetAlignment = 256;
#endif
_properties.limits.maxVertexOutputComponents = _properties.limits.maxFragmentInputComponents;
_properties.limits.optimalBufferCopyRowPitchAlignment = 1;
@ -605,30 +605,31 @@ void MVKPhysicalDevice::initProperties() {
_properties.limits.lineWidthRange[1] = 1;
_properties.limits.pointSizeGranularity = 1;
#if MVK_IOS
if ([_mtlDevice supportsFeatureSet: MTLFeatureSet_iOS_GPUFamily4_v1]) {
_properties.limits.maxComputeSharedMemorySize = (32 * KIBI);
_properties.limits.maxComputeWorkGroupInvocations = (1 * KIBI);
} else if ([_mtlDevice supportsFeatureSet: MTLFeatureSet_iOS_GPUFamily3_v1]) {
_properties.limits.maxComputeSharedMemorySize = (16 * KIBI);
_properties.limits.maxComputeWorkGroupInvocations = 512;
} else {
_properties.limits.maxComputeSharedMemorySize = ((16 * KIBI) - 32);
_properties.limits.maxComputeWorkGroupInvocations = 512;
}
#endif
#if MVK_MACOS
_properties.limits.maxComputeSharedMemorySize = (32 * KIBI);
_properties.limits.maxComputeWorkGroupInvocations = (1 * KIBI);
#endif
_properties.limits.standardSampleLocations = VK_FALSE;
_properties.limits.strictLines = VK_FALSE;
_properties.limits.maxComputeWorkGroupSize[0] = _properties.limits.maxComputeWorkGroupInvocations;
_properties.limits.maxComputeWorkGroupSize[1] = _properties.limits.maxComputeWorkGroupInvocations;
_properties.limits.maxComputeWorkGroupSize[2] = _properties.limits.maxComputeWorkGroupInvocations;
VkExtent3D wgSize = mvkVkExtent3DFromMTLSize(_mtlDevice.maxThreadsPerThreadgroup);
_properties.limits.maxComputeWorkGroupSize[0] = wgSize.width;
_properties.limits.maxComputeWorkGroupSize[1] = wgSize.height;
_properties.limits.maxComputeWorkGroupSize[2] = wgSize.depth;
_properties.limits.maxComputeWorkGroupInvocations = max({wgSize.width, wgSize.height, wgSize.depth});
if ( [_mtlDevice respondsToSelector: @selector(maxThreadgroupMemoryLength)] ) {
_properties.limits.maxComputeSharedMemorySize = (uint32_t)_mtlDevice.maxThreadgroupMemoryLength;
} else {
#if MVK_IOS
if ([_mtlDevice supportsFeatureSet: MTLFeatureSet_iOS_GPUFamily4_v1]) {
_properties.limits.maxComputeSharedMemorySize = (32 * KIBI);
} else if ([_mtlDevice supportsFeatureSet: MTLFeatureSet_iOS_GPUFamily3_v1]) {
_properties.limits.maxComputeSharedMemorySize = (16 * KIBI);
} else {
_properties.limits.maxComputeSharedMemorySize = ((16 * KIBI) - 32);
}
#endif
#if MVK_MACOS
_properties.limits.maxComputeSharedMemorySize = (32 * KIBI);
#endif
}
// Features with no specific limits - default to unlimited int values

4
MoltenVK/MoltenVK/OS/CAMetalLayer+MoltenVK.m
View File

@ -39,14 +39,14 @@
-(BOOL) displaySyncEnabledMVK {
#if MVK_MACOS
if ( [self respondsToSelector: @selector(displaySyncEnabled)]) { return self.displaySyncEnabled; }
if ( [self respondsToSelector: @selector(displaySyncEnabled)] ) { return self.displaySyncEnabled; }
#endif
return YES;
}
-(void) setDisplaySyncEnabledMVK: (BOOL) enabled {
#if MVK_MACOS
if ( [self respondsToSelector: @selector(setDisplaySyncEnabled:)]) { self.displaySyncEnabled = enabled; }
if ( [self respondsToSelector: @selector(setDisplaySyncEnabled:)] ) { self.displaySyncEnabled = enabled; }
#endif
}

4
MoltenVK/MoltenVK/OS/MTLSamplerDescriptor+MoltenVK.m
View File

@ -22,12 +22,12 @@
@implementation MTLSamplerDescriptor (MoltenVK)
-(MTLCompareFunction) compareFunctionMVK {
if ( [self respondsToSelector: @selector(compareFunction)]) { return self.compareFunction; }
if ( [self respondsToSelector: @selector(compareFunction)] ) { return self.compareFunction; }
return MTLCompareFunctionNever;
}
-(void) setCompareFunctionMVK: (MTLCompareFunction) cmpFunc {
if ( [self respondsToSelector: @selector(setCompareFunction:)]) { self.compareFunction = cmpFunc; }
if ( [self respondsToSelector: @selector(setCompareFunction:)] ) { self.compareFunction = cmpFunc; }
}
@end

8
MoltenVK/MoltenVK/OS/MTLTextureDescriptor+MoltenVK.m
View File

@ -22,21 +22,21 @@
@implementation MTLTextureDescriptor (MoltenVK)
-(MTLTextureUsage) usageMVK {
if ( [self respondsToSelector: @selector(usage)]) { return self.usage; }
if ( [self respondsToSelector: @selector(usage)] ) { return self.usage; }
return MTLTextureUsageUnknown;
}
-(void) setUsageMVK: (MTLTextureUsage) usage {
if ( [self respondsToSelector: @selector(setUsage:)]) { self.usage = usage; }
if ( [self respondsToSelector: @selector(setUsage:)] ) { self.usage = usage; }
}
-(MTLStorageMode) storageModeMVK {
if ( [self respondsToSelector: @selector(storageMode)]) { return self.storageMode; }
if ( [self respondsToSelector: @selector(storageMode)] ) { return self.storageMode; }
return MTLStorageModeShared;
}
-(void) setStorageModeMVK: (MTLStorageMode) storageMode {
if ( [self respondsToSelector: @selector(setStorageMode:)]) { self.storageMode = storageMode; }
if ( [self respondsToSelector: @selector(setStorageMode:)] ) { self.storageMode = storageMode; }
}
@end