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

Merge pull request #1094 from billhollings/refactor-gpu-props

Browse Source 
MVKPhysicalDevice remove need to call initGPUInfoProperties() twice.
This commit is contained in:
Bill Hollings 2020-10-07 13:32:00 -04:00 committed by GitHub
commit b60e3c393d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -349,6 +349,7 @@ protected:
void initMetalFeatures();
void initFeatures();
void initProperties();
void initLimits();
void initGPUInfoProperties();
void initMemoryProperties();
void setMemoryHeap(uint32_t heapIndex, VkDeviceSize heapSize, VkMemoryHeapFlags heapFlags);

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

@ -1000,15 +1000,27 @@ MVKPhysicalDevice::MVKPhysicalDevice(MVKInstance* mvkInstance, id<MTLDevice> mtl
_supportedExtensions(this, true),
_pixelFormats(this) { // Set after _mtlDevice
initMetalFeatures(); // Call first.
initFeatures(); // Call second.
initProperties(); // Call third.
initProperties(); // Call first.
initMetalFeatures(); // Call second.
initFeatures(); // Call third.
initLimits(); // Call fourth.
initExtensions();
initMemoryProperties();
initExternalMemoryProperties();
logGPUInfo();
}
// Initializes the physical device properties (except limits).
void MVKPhysicalDevice::initProperties() {
mvkClear(&_properties); // Start with everything cleared
_properties.apiVersion = MVK_VULKAN_API_VERSION;
_properties.driverVersion = MVK_VERSION;
initGPUInfoProperties();
initPipelineCacheUUID();
}
// Initializes the Metal-specific physical device features of this instance.
void MVKPhysicalDevice::initMetalFeatures() {
@ -1248,7 +1260,6 @@ void MVKPhysicalDevice::initMetalFeatures() {
#if MVK_MACOS
if (mvkOSVersionIsAtLeast(10.14)) {
static const uint32_t kAMDVendorId = 0x1002;
initGPUInfoProperties(); // Need to know the vendor ID for this.
_metalFeatures.subgroupSize = (_properties.vendorID == kAMDVendorId) ? 64 : 32;
}
#endif
@ -1453,17 +1464,9 @@ void MVKPhysicalDevice::initFeatures() {
// VkBool32 inheritedQueries; // done
//} VkPhysicalDeviceFeatures;
/** Initializes the physical device properties of this instance. */
void MVKPhysicalDevice::initProperties() {
mvkClear(&_properties); // Start with everything cleared
// Initializes the physical device property limits.
void MVKPhysicalDevice::initLimits() {
_properties.apiVersion = MVK_VULKAN_API_VERSION;
_properties.driverVersion = MVK_VERSION;
initGPUInfoProperties();
initPipelineCacheUUID();
// Limits
#if MVK_TVOS
_properties.limits.maxColorAttachments = kMVKCachedColorAttachmentCount;
#endif