From c9b50e35c73603113fb21690d908ade8c4cf2fc2 Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Thu, 16 Dec 2021 17:27:33 +0800
Subject: [PATCH] append codes that they can output queue family properties of
 physical device.

---
 inc/hgl/graph/VKDevice.h                      | 12 +++
 inc/hgl/graph/VKDeviceAttribute.h             |  5 +-
 inc/hgl/graph/VKPhysicalDevice.h              | 31 ++++----
 .../Vulkan/VKCommandBufferRender.cpp          |  4 +-
 src/SceneGraph/Vulkan/VKDeviceAttribute.cpp   | 53 +++++++------
 src/SceneGraph/Vulkan/VKDeviceCreater.cpp     |  6 +-
 src/SceneGraph/Vulkan/VKInstance.cpp          |  1 -
 src/SceneGraph/Vulkan/VKPhysicalDevice.cpp    | 75 +++++++++++++++++--
 8 files changed, 139 insertions(+), 48 deletions(-)

diff --git a/inc/hgl/graph/VKDevice.h b/inc/hgl/graph/VKDevice.h
index 73c04d1a..6a118355 100644
--- a/inc/hgl/graph/VKDevice.h
+++ b/inc/hgl/graph/VKDevice.h
@@ -27,6 +27,18 @@ namespace hgl
 }//namespace hgl
 
 VK_NAMESPACE_BEGIN
+/*
+ * GPU设备创建信息
+ */
+struct GPUDeviceCreateInfo
+{
+    VkPhysicalDeviceType    device_type             =VK_PHYSICAL_DEVICE_TYPE_MAX_ENUM;
+
+    uint32_t                swapchain_image_count   =0;
+    VkSurfaceFormatKHR      color_format            ={PF_A2BGR10UN,VK_COLOR_SPACE_SRGB_NONLINEAR_KHR};
+    VkFormat                depth_format            =VK_FORMAT_UNDEFINED;
+};//struct GPUDeviceCreateInfo
+
 class GPUDevice
 {
     GPUDeviceAttribute *attr;
diff --git a/inc/hgl/graph/VKDeviceAttribute.h b/inc/hgl/graph/VKDeviceAttribute.h
index c5eea50d..669d7f65 100644
--- a/inc/hgl/graph/VKDeviceAttribute.h
+++ b/inc/hgl/graph/VKDeviceAttribute.h
@@ -59,8 +59,9 @@ public:
 
 private:
 
-    void RefreshSurface();
-    void RefreshQueueFamily();
+    void GetSurfaceFormatList();
+    void GetSurfacePresentMode();
+    void GetQueueFamily();
 
 public:
 
diff --git a/inc/hgl/graph/VKPhysicalDevice.h b/inc/hgl/graph/VKPhysicalDevice.h
index 6159b98d..e6cf9947 100644
--- a/inc/hgl/graph/VKPhysicalDevice.h
+++ b/inc/hgl/graph/VKPhysicalDevice.h
@@ -15,6 +15,7 @@ class GPUPhysicalDevice
     VkPhysicalDeviceMemoryProperties    memory_properties;
     List<VkLayerProperties>             layer_properties;
     List<VkExtensionProperties>         extension_properties;
+    List<VkQueueFamilyProperties>       queue_family_properties;
 
 public:
 
@@ -48,20 +49,6 @@ public:
 
     const uint32_t          GetConstantSize ()const{return properties.limits.maxPushConstantsSize;}
 
-    // support != open, so please don't direct use GetFeatures().
-    // open any features in CreateDevice()&SetDeviceFeatures() functions.
-    const bool              IsSupportMDI    ()const
-    {
-        // I found a few device support MDI, but its MaxDrawIndirectCount is 1.
-
-        return (features.multiDrawIndirect&&properties.limits.maxDrawIndirectCount>1);
-    }
-
-    const uint32_t          GetMaxMDICount  ()const
-    {
-        return properties.limits.maxDrawIndirectCount;
-    }
-
 public:
 
     /**
@@ -112,9 +99,23 @@ public:
 public:
 
     const VkBool32  SupportGeometryShader       ()const{return features.geometryShader;}
-    const VkBool32  SupportMultiDrawIndirect    ()const{return features.multiDrawIndirect;}
     const VkBool32  SupportCubeMapArray         ()const{return features.imageCubeArray;}
 
+
+    // support != open, so please don't direct use GetFeatures().
+    // open any features in CreateDevice()&SetDeviceFeatures() functions.
+    const bool              SupportMDI          ()const
+    {
+        // I found a few device support MDI, but its MaxDrawIndirectCount is 1.
+
+        return (features.multiDrawIndirect&&properties.limits.maxDrawIndirectCount>1);
+    }
+
+    const uint32_t          GetMaxMDICount      ()const
+    {
+        return properties.limits.maxDrawIndirectCount;
+    }
+
     const uint32_t  GetMaxImage1D            ()const{return properties.limits.maxImageDimension1D;}
     const uint32_t  GetMaxImage2D            ()const{return properties.limits.maxImageDimension2D;}
     const uint32_t  GetMaxImage3D            ()const{return properties.limits.maxImageDimension3D;}
diff --git a/src/SceneGraph/Vulkan/VKCommandBufferRender.cpp b/src/SceneGraph/Vulkan/VKCommandBufferRender.cpp
index af6f6703..e26e2350 100644
--- a/src/SceneGraph/Vulkan/VKCommandBufferRender.cpp
+++ b/src/SceneGraph/Vulkan/VKCommandBufferRender.cpp
@@ -170,7 +170,7 @@ void RenderCmdBuffer::DrawIndirect( VkBuffer        buffer,
                                     uint32_t        drawCount,
                                     uint32_t        stride)
 {
-    if(this->dev_attr->physical_device->IsSupportMDI())
+    if(this->dev_attr->physical_device->SupportMDI())
         vkCmdDrawIndirect(cmd_buf,buffer,offset,drawCount,stride);
     else
     for(uint32_t i=0;i<drawCount;i++)
@@ -182,7 +182,7 @@ void RenderCmdBuffer::DrawIndexedIndirect(  VkBuffer        buffer,
                                             uint32_t        drawCount,
                                             uint32_t        stride)
 {
-    if(this->dev_attr->physical_device->IsSupportMDI())
+    if(this->dev_attr->physical_device->SupportMDI())
         vkCmdDrawIndexedIndirect(cmd_buf,buffer,offset,drawCount,stride);
     else
     for(uint32_t i=0;i<drawCount;i++)
diff --git a/src/SceneGraph/Vulkan/VKDeviceAttribute.cpp b/src/SceneGraph/Vulkan/VKDeviceAttribute.cpp
index d9c85dc1..4860f633 100644
--- a/src/SceneGraph/Vulkan/VKDeviceAttribute.cpp
+++ b/src/SceneGraph/Vulkan/VKDeviceAttribute.cpp
@@ -14,8 +14,9 @@ GPUDeviceAttribute::GPUDeviceAttribute(VulkanInstance *inst,const GPUPhysicalDev
     surface=s;
 
     RefreshSurfaceCaps();
-    RefreshSurface();
-    RefreshQueueFamily();
+    GetSurfaceFormatList();
+    GetSurfacePresentMode();
+    GetQueueFamily();
 }
 
 GPUDeviceAttribute::~GPUDeviceAttribute()
@@ -49,11 +50,6 @@ void GPUDeviceAttribute::RefreshSurfaceCaps()
     VkPhysicalDevice pdevice = *physical_device;
 
     vkGetPhysicalDeviceSurfaceCapabilitiesKHR(pdevice, surface, &surface_caps);
-}
-
-void GPUDeviceAttribute::RefreshSurface()
-{
-    VkPhysicalDevice pdevice = *physical_device;
 
     {
         if (surface_caps.supportedTransforms & VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR)
@@ -63,10 +59,13 @@ void GPUDeviceAttribute::RefreshSurface()
     }
 
     {
-        constexpr VkCompositeAlphaFlagBitsKHR compositeAlphaFlags[4]={VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR,
-                                                                      VK_COMPOSITE_ALPHA_PRE_MULTIPLIED_BIT_KHR,
-                                                                      VK_COMPOSITE_ALPHA_POST_MULTIPLIED_BIT_KHR,
-                                                                      VK_COMPOSITE_ALPHA_INHERIT_BIT_KHR };
+        constexpr VkCompositeAlphaFlagBitsKHR compositeAlphaFlags[4]=
+        {
+            VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR,
+            VK_COMPOSITE_ALPHA_PRE_MULTIPLIED_BIT_KHR,
+            VK_COMPOSITE_ALPHA_POST_MULTIPLIED_BIT_KHR,
+            VK_COMPOSITE_ALPHA_INHERIT_BIT_KHR 
+        };
 
         for(auto flags:compositeAlphaFlags)
             if (surface_caps.supportedCompositeAlpha & flags)
@@ -75,6 +74,11 @@ void GPUDeviceAttribute::RefreshSurface()
                 break;
             }
     }
+}
+
+void GPUDeviceAttribute::GetSurfaceFormatList()
+{
+    VkPhysicalDevice pdevice = *physical_device;
 
     {
         uint32_t format_count;
@@ -113,19 +117,24 @@ void GPUDeviceAttribute::RefreshSurface()
             //}
         }
     }
-
-    {
-        uint32_t mode_count;
-        if (vkGetPhysicalDeviceSurfacePresentModesKHR(pdevice, surface, &mode_count, nullptr) == VK_SUCCESS)
-        {
-            present_modes.SetCount(mode_count);
-            if (vkGetPhysicalDeviceSurfacePresentModesKHR(pdevice, surface, &mode_count, present_modes.GetData()) != VK_SUCCESS)
-                present_modes.Clear();
-        }
-    }
 }
 
-void GPUDeviceAttribute::RefreshQueueFamily()
+void GPUDeviceAttribute::GetSurfacePresentMode()
+{
+    uint32_t mode_count;
+
+    VkPhysicalDevice pdevice = *physical_device;
+
+    if (!vkGetPhysicalDeviceSurfacePresentModesKHR(pdevice, surface, &mode_count, nullptr) == VK_SUCCESS)
+        return;
+    
+    present_modes.SetCount(mode_count);
+
+    if (vkGetPhysicalDeviceSurfacePresentModesKHR(pdevice, surface, &mode_count, present_modes.GetData()) != VK_SUCCESS)
+        present_modes.Clear();
+}
+
+void GPUDeviceAttribute::GetQueueFamily()
 {
     VkPhysicalDevice pdevice = *physical_device;
 
diff --git a/src/SceneGraph/Vulkan/VKDeviceCreater.cpp b/src/SceneGraph/Vulkan/VKDeviceCreater.cpp
index dc72d295..16db2101 100644
--- a/src/SceneGraph/Vulkan/VKDeviceCreater.cpp
+++ b/src/SceneGraph/Vulkan/VKDeviceCreater.cpp
@@ -49,9 +49,13 @@ namespace
 
         FEATURE_COPY(geometryShader);
         FEATURE_COPY(multiDrawIndirect);
-//        FEATURE_COPY(imageCubeArray);
         FEATURE_COPY(samplerAnisotropy);
 
+//        FEATURE_COPY(imageCubeArray);
+//        FEATURE_COPY(fullDrawIndexUint32);
+//        FEATURE_COPY(wideLines)
+//        FEATURE_COPY(largePoints)
+
         #undef FEATURE_COPY
     }
 
diff --git a/src/SceneGraph/Vulkan/VKInstance.cpp b/src/SceneGraph/Vulkan/VKInstance.cpp
index dd0483ee..e372253f 100644
--- a/src/SceneGraph/Vulkan/VKInstance.cpp
+++ b/src/SceneGraph/Vulkan/VKInstance.cpp
@@ -31,7 +31,6 @@ VulkanInstance *CreateInstance(const AnsiString &app_name,VKDebugOut *out,Create
         VK_EXT_DEBUG_REPORT_EXTENSION_NAME,
         VK_EXT_DEBUG_UTILS_EXTENSION_NAME,
 #endif//_DEBUG
-        VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME,
     };
 
     for(const char *ext_name:require_ext_list)
diff --git a/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp b/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp
index 4dc8cf1c..24a5d078 100644
--- a/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp
+++ b/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp
@@ -2,11 +2,69 @@
 #include<hgl/graph/VKInstance.h>
 
 VK_NAMESPACE_BEGIN
+namespace
+{
+    void debug_queue_family_properties_out(const char *front,const List<VkQueueFamilyProperties> &qfp_list)
+    {
+        constexpr char *queue_bit_name[]=
+        {
+            "Graphics",
+            "Compute",
+            "Transfer",
+            "SparseBinding",
+            "Protected",
+            "VideoDecode",
+            "VideoEncode"
+        };
+
+        const int count=qfp_list.GetCount();
+
+        if(count<=0)return;
+
+        const VkQueueFamilyProperties *p=qfp_list.GetData();
+
+        for(int i=0;i<count;i++)
+        {
+            std::cout<<front<<" Queue Family ["<<i<<"] count: "<<p->queueCount
+                <<", timestampValidBits: "<<p->timestampValidBits
+                <<", minImageTransferGranularity [" <<p->minImageTransferGranularity.width<<","
+                                                    <<p->minImageTransferGranularity.height<<","
+                                                    <<p->minImageTransferGranularity.depth<<"], queueFlags[";
+
+            uint32_t bits=p->queueFlags;
+
+            for(uint i=0;i<7;i++)
+            {
+                if(bits&1)
+                {
+                    std::cout<<queue_bit_name[i];
+                    bits>>=1;
+                    if(bits>0)std::cout<<",";
+                }
+                else
+                {
+                    bits>>=1;
+                }
+            }                
+
+            std::cout<<"]"<<std::endl;
+
+            ++p;
+        }
+    }
+}
+
 GPUPhysicalDevice::GPUPhysicalDevice(VkInstance inst,VkPhysicalDevice pd)
 {
     instance=inst;
     physical_device=pd;
 
+    vkGetPhysicalDeviceFeatures(physical_device,&features);
+    vkGetPhysicalDeviceMemoryProperties(physical_device,&memory_properties);
+    vkGetPhysicalDeviceProperties(physical_device,&properties);
+
+    std::string debug_front="PhysicalDevice["+std::string(properties.deviceName)+"]";
+
     {
         uint32_t property_count;
 
@@ -15,7 +73,7 @@ GPUPhysicalDevice::GPUPhysicalDevice(VkInstance inst,VkPhysicalDevice pd)
         layer_properties.SetCount(property_count);
         vkEnumerateDeviceLayerProperties(physical_device,&property_count,layer_properties.GetData());
 
-        debug_out("PhysicalDevice",layer_properties);
+        debug_out(debug_front.c_str(),layer_properties);
     }
 
     {
@@ -26,12 +84,19 @@ GPUPhysicalDevice::GPUPhysicalDevice(VkInstance inst,VkPhysicalDevice pd)
         extension_properties.SetCount(exten_count);
         vkEnumerateDeviceExtensionProperties(physical_device,nullptr,&exten_count,extension_properties.GetData());
 
-        debug_out("PhysicalDevice",extension_properties);
+        debug_out(debug_front.c_str(),extension_properties);
     }
 
-    vkGetPhysicalDeviceFeatures(physical_device,&features);
-    vkGetPhysicalDeviceMemoryProperties(physical_device,&memory_properties);
-    vkGetPhysicalDeviceProperties(physical_device,&properties);
+    {
+        uint32_t family_count;
+
+        vkGetPhysicalDeviceQueueFamilyProperties(physical_device,&family_count,nullptr);
+
+        queue_family_properties.SetCount(family_count);
+        vkGetPhysicalDeviceQueueFamilyProperties(physical_device,&family_count,queue_family_properties.GetData());
+
+        debug_queue_family_properties_out(debug_front.c_str(),queue_family_properties);
+    }
 }
 
 const bool GPUPhysicalDevice::GetLayerVersion(const AnsiString &name,uint32_t &spec,uint32_t &impl)const