print device info (gpu name, driver info)

K1ngst0m · Oct 23, 2023 · e014f64 · e014f64
1 parent e656848
commit e014f64
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 25 deletions.
diff --git a/engine/api/vulkan/physicalDevice.cpp b/engine/api/vulkan/physicalDevice.cpp
@@ -43,12 +43,14 @@ PhysicalDevice::PhysicalDevice(HandleType handle) : ResourceHandle(handle)
 #endif
     vkGetPhysicalDeviceFeatures2(getHandle(), &m_features2);
 
+    m_driverProperties = {};
+    m_driverProperties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES;
     // Get device properties
     VkPhysicalDeviceSubgroupProperties subgroupProperties = {};
     subgroupProperties.sType                              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES;
-    subgroupProperties.pNext                              = nullptr;
+    subgroupProperties.pNext                              = &m_driverProperties;
+
     m_properties2.sType                                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR;
-    // subgroupProperties.pNext                              = m_properties2.pNext;
     m_properties2.pNext = &subgroupProperties;
     vkGetPhysicalDeviceProperties2(getHandle(), &m_properties2);
 
@@ -68,16 +70,16 @@ PhysicalDevice::PhysicalDevice(HandleType handle) : ResourceHandle(handle)
     }
 
     {
-        auto* gpuProperties = &m_properties2;
+        auto* gpuProperties2 = &m_properties2;
         auto* gpuSettings   = &m_settings;
         auto* gpuFeatures   = &m_features2;
         gpuSettings->uniformBufferAlignment =
-            (uint32_t)gpuProperties->properties.limits.minUniformBufferOffsetAlignment;
+            (uint32_t)gpuProperties2->properties.limits.minUniformBufferOffsetAlignment;
         gpuSettings->uploadBufferTextureAlignment =
-            (uint32_t)gpuProperties->properties.limits.optimalBufferCopyOffsetAlignment;
+            (uint32_t)gpuProperties2->properties.limits.optimalBufferCopyOffsetAlignment;
         gpuSettings->uploadBufferTextureRowAlignment =
-            (uint32_t)gpuProperties->properties.limits.optimalBufferCopyRowPitchAlignment;
-        gpuSettings->maxVertexInputBindings = gpuProperties->properties.limits.maxVertexInputBindings;
+            (uint32_t)gpuProperties2->properties.limits.optimalBufferCopyRowPitchAlignment;
+        gpuSettings->maxVertexInputBindings = gpuProperties2->properties.limits.maxVertexInputBindings;
         gpuSettings->multiDrawIndirect      = gpuFeatures->features.multiDrawIndirect;
         gpuSettings->indirectRootConstant   = false;
         gpuSettings->builtinDrawID          = true;
@@ -111,13 +113,15 @@ PhysicalDevice::PhysicalDevice(HandleType handle) : ResourceHandle(handle)
         gpuSettings->samplerAnisotropySupported = gpuFeatures->features.samplerAnisotropy;
 
         // save vendor and model Id as string
-        sprintf(gpuSettings->GpuVendorPreset.modelId.data(), "%#x", gpuProperties->properties.deviceID);
-        sprintf(gpuSettings->GpuVendorPreset.vendorId.data(), "%#x", gpuProperties->properties.vendorID);
-        strncpy(gpuSettings->GpuVendorPreset.gpuName.data(), gpuProperties->properties.deviceName,
-                MAX_GPU_VENDOR_STRING_LENGTH);
+        gpuSettings->GpuVendorPreset.modelId = std::format("{:#x}", gpuProperties2->properties.deviceID);
+        gpuSettings->GpuVendorPreset.vendorId = std::format("{:#x}", gpuProperties2->properties.vendorID);
+        gpuSettings->GpuVendorPreset.gpuName = gpuProperties2->properties.deviceName;
+
+        // driver info
+        gpuSettings->GpuVendorPreset.gpuDriverVersion = std::format("{} - {}", m_driverProperties.driverInfo, m_driverProperties.driverName);
 
         // TODO: Fix once vulkan adds support for revision ID
-        strncpy(gpuSettings->GpuVendorPreset.revisionId.data(), "0x00", MAX_GPU_VENDOR_STRING_LENGTH);
+        gpuSettings->GpuVendorPreset.revisionId = "0x00";
     }
 }
 
@@ -282,7 +286,7 @@ VkPipelineStageFlags utils::determinePipelineStageFlags(PhysicalDevice* pGPU, Vk
 {
     VkPipelineStageFlags flags = 0;
 
-    auto* gpuSupport = pGPU->getSettings();
+    auto* gpuSupport = &pGPU->getSettings();
     switch(queueType)
     {
     case aph::QueueType::GRAPHICS:

diff --git a/engine/api/vulkan/physicalDevice.h b/engine/api/vulkan/physicalDevice.h
@@ -23,25 +23,27 @@ class PhysicalDevice : public ResourceHandle<VkPhysicalDevice>
                                                           VkFormatFeatureFlags features) const;
     size_t                            padUniformBufferSize(size_t originalSize) const;
     const VkPhysicalDeviceProperties* getProperties() const { return &m_properties; }
-    const GPUSettings*                getSettings() const { return &m_settings; }
+    const GPUSettings&                getSettings() const { return m_settings; }
 
 private:
-    GPUSettings                                          m_settings;
-    VkPhysicalDeviceProperties                           m_properties;
-    VkPhysicalDeviceProperties2                          m_properties2;
-    VkPhysicalDeviceFeatures                             m_features;
-    VkPhysicalDeviceFeatures2                            m_features2;
-    VkPhysicalDeviceMemoryProperties                     m_memoryProperties;
-    std::vector<std::string>                             m_supportedExtensions;
-    std::vector<VkQueueFamilyProperties>                 m_queueFamilyProperties;
-    std::unordered_map<QueueType, std::vector<uint32_t>> m_queueFamilyMap;
+    GPUSettings                                          m_settings              = {};
+    VkPhysicalDeviceDriverProperties                     m_driverProperties      = {};
+    VkPhysicalDeviceProperties                           m_properties            = {};
+    VkPhysicalDeviceProperties2                          m_properties2           = {};
+    VkPhysicalDeviceFeatures                             m_features              = {};
+    VkPhysicalDeviceFeatures2                            m_features2             = {};
+    VkPhysicalDeviceMemoryProperties                     m_memoryProperties      = {};
+    std::vector<std::string>                             m_supportedExtensions   = {};
+    std::vector<VkQueueFamilyProperties>                 m_queueFamilyProperties = {};
+    std::unordered_map<QueueType, std::vector<uint32_t>> m_queueFamilyMap        = {};
 };
 
 }  // namespace aph::vk
 
-namespace aph::vk::utils {
+namespace aph::vk::utils
+{
 // Determines pipeline stages involved for given accesses
 VkPipelineStageFlags determinePipelineStageFlags(PhysicalDevice* pGPU, VkAccessFlags accessFlags, QueueType queueType);
-        }
+}  // namespace aph::vk::utils
 
 #endif  // PHYSICALDEVICE_H_
diff --git a/engine/renderer/api/vulkan/renderer.cpp b/engine/renderer/api/vulkan/renderer.cpp
@@ -105,6 +105,13 @@ Renderer::Renderer(WSI* wsi, const RenderConfig& config) : IRenderer(wsi, config
         };
 
         m_pDevice = Device::Create(createInfo);
+        // output device info
+        {
+            const GPUSettings& setting = m_pDevice->getPhysicalDevice()->getSettings();
+            VK_LOG_INFO(" == Device creation ==");
+            VK_LOG_INFO("Device Name: %s", setting.GpuVendorPreset.gpuName);
+            VK_LOG_INFO("Driver Version: %s", setting.GpuVendorPreset.gpuDriverVersion);
+        }
         APH_ASSERT(m_pDevice != nullptr);
 
         // get 3 type queue