From 05885e443ab0f077c85a6871503f62fb65c7d6eb Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Thu, 11 May 2023 21:56:07 +0800 Subject: [PATCH] added VulkanDeviceCreater::ChooseSurfaceFormat --- inc/hgl/graph/VKDeviceAttribute.h | 1 - inc/hgl/graph/VKDeviceCreater.h | 18 ++++++ src/SceneGraph/Vulkan/VKDevice.cpp | 23 ------- src/SceneGraph/Vulkan/VKDeviceAttribute.cpp | 44 ------------- src/SceneGraph/Vulkan/VKDeviceCreater.cpp | 68 ++++++++++++++++++++- src/SceneGraph/Vulkan/VKDeviceMaterial.cpp | 12 ++-- 6 files changed, 91 insertions(+), 75 deletions(-) diff --git a/inc/hgl/graph/VKDeviceAttribute.h b/inc/hgl/graph/VKDeviceAttribute.h index dd106cd4..e9e7782c 100644 --- a/inc/hgl/graph/VKDeviceAttribute.h +++ b/inc/hgl/graph/VKDeviceAttribute.h @@ -32,7 +32,6 @@ struct GPUDeviceAttribute List family_properties; List supports_present; - List surface_formats_list; VkSurfaceFormatKHR surface_format; List present_modes; diff --git a/inc/hgl/graph/VKDeviceCreater.h b/inc/hgl/graph/VKDeviceCreater.h index d249116c..df04b09c 100644 --- a/inc/hgl/graph/VKDeviceCreater.h +++ b/inc/hgl/graph/VKDeviceCreater.h @@ -140,6 +140,17 @@ struct PreferFormats //偏好格式需从低质量到高质量排列 const VkFormat *formats; uint count; + +public: + + const int Find(const VkFormat fmt)const + { + for(int i=0;i VK_NAMESPACE_BEGIN -void LogSurfaceFormat(const List &surface_format_list) -{ - const uint32_t format_count=surface_format_list.GetCount(); - const VkSurfaceFormatKHR *sf=surface_format_list.GetData(); - - LOG_INFO(OS_TEXT("Current physics device support ")+OSString::numberOf(format_count)+OS_TEXT(" surface format")); - - const VulkanFormat *vf; - const VulkanColorSpace *cs; - - for(uint32_t i=0;iformat); - cs=GetVulkanColorSpace(sf->colorSpace); - - LOG_INFO(" "+AnsiString::numberOf(i)+": "+AnsiString(vf->name)+", "+AnsiString(cs->name)); - - ++sf; - } -} - GPUDevice::GPUDevice(GPUDeviceAttribute *da) { attr=da; @@ -46,8 +25,6 @@ GPUDevice::GPUDevice(GPUDeviceAttribute *da) texture_cmd_buf=CreateTextureCommandBuffer(); texture_queue=CreateQueue(); - - LogSurfaceFormat(attr->surface_formats_list); } GPUDevice::~GPUDevice() diff --git a/src/SceneGraph/Vulkan/VKDeviceAttribute.cpp b/src/SceneGraph/Vulkan/VKDeviceAttribute.cpp index 9c1e0a0d..f7138117 100644 --- a/src/SceneGraph/Vulkan/VKDeviceAttribute.cpp +++ b/src/SceneGraph/Vulkan/VKDeviceAttribute.cpp @@ -14,7 +14,6 @@ GPUDeviceAttribute::GPUDeviceAttribute(VulkanInstance *inst,const GPUPhysicalDev surface=s; RefreshSurfaceCaps(); - GetSurfaceFormatList(); GetSurfacePresentMode(); GetQueueFamily(); } @@ -83,49 +82,6 @@ void GPUDeviceAttribute::RefreshSurfaceCaps() } } -void GPUDeviceAttribute::GetSurfaceFormatList() -{ - VkPhysicalDevice pdevice = *physical_device; - - { - uint32_t format_count; - - surface_format.format = PF_A2BGR10UN; - surface_format.colorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR; - - if (vkGetPhysicalDeviceSurfaceFormatsKHR(pdevice, surface, &format_count, nullptr) == VK_SUCCESS) - { - surface_formats_list.SetCount(format_count); - - if (vkGetPhysicalDeviceSurfaceFormatsKHR(pdevice, surface, &format_count, surface_formats_list.GetData()) != VK_SUCCESS) - { - surface_formats_list.Clear(); - } - //else - //{ - // VkSurfaceFormatKHR *sf = surface_formats_list.GetData(); - - // if (format_count == 1 && sf->format == VK_FORMAT_UNDEFINED) - // { - // } - // else - // { - // surface_format.format=VK_FORMAT_UNDEFINED; - - // for(uint32_t i=0;iformat>surface_format.format - // &&sf->colorSpace==VK_COLOR_SPACE_SRGB_NONLINEAR_KHR) - // surface_format=*sf; - - // ++sf; - // } - // } - //} - } - } -} - void GPUDeviceAttribute::GetSurfacePresentMode() { uint32_t mode_count; diff --git a/src/SceneGraph/Vulkan/VKDeviceCreater.cpp b/src/SceneGraph/Vulkan/VKDeviceCreater.cpp index 8b481c35..b8655d2a 100644 --- a/src/SceneGraph/Vulkan/VKDeviceCreater.cpp +++ b/src/SceneGraph/Vulkan/VKDeviceCreater.cpp @@ -16,6 +16,29 @@ VkPipelineCache CreatePipelineCache(VkDevice device,const VkPhysicalDeviceProper #ifdef _DEBUG DebugMaker *CreateDebugMaker(VkDevice); DebugUtils *CreateDebugUtils(VkDevice); + +void LogSurfaceFormat(const VkSurfaceFormatKHR *surface_format_list,const uint32_t format_count,const uint32_t select) +{ + const VkSurfaceFormatKHR *sf=surface_format_list; + + std::cout<<"Current physics device support "<format); + cs=GetVulkanColorSpace(sf->colorSpace); + + if(select==i) + std::cout<<" * "<name<<", "<name<name<<", "<name< surface_formats_list(format_count); + + if (vkGetPhysicalDeviceSurfaceFormatsKHR(*physical_device, surface, &format_count, surface_formats_list) == VK_SUCCESS) + { + int index=-1; + int result; + uint32_t sel=0; + + for(uint32_t i=0;iFind(surface_formats_list[i].format); + + if(result>index) + { + surface_format=surface_formats_list[i]; + + index=result; + sel=i; + } + } + + #ifdef _DEBUG + LogSurfaceFormat(surface_formats_list,format_count,sel); + #endif//_DEBUG + + if(index!=-1) + return; + } + + surface_format.format=PF_RGBA8s; + surface_format.colorSpace=VK_COLOR_SPACE_SRGB_NONLINEAR_KHR; +} + GPUDevice *VulkanDeviceCreater::CreateRenderDevice() { GPUDeviceAttribute *device_attr=new GPUDeviceAttribute(instance,physical_device,surface); @@ -209,6 +272,10 @@ GPUDevice *VulkanDeviceCreater::CreateRenderDevice() SetDeviceExtension(&ext_list,physical_device,require); SetDeviceFeatures(&features,physical_device->GetFeatures10(),require); + ChooseSurfaceFormat(); + + device_attr->surface_format=surface_format; + device_attr->device=CreateDevice(device_attr->graphics_family); if(!device_attr->device) @@ -322,7 +389,6 @@ GPUDevice *VulkanDeviceCreater::Create() OutputPhysicalDeviceCaps(physical_device); #endif//_DEBUG - if(!RequirementCheck()) return(false); diff --git a/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp b/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp index d077ea94..db84d3db 100644 --- a/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp +++ b/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp @@ -136,12 +136,12 @@ Material *GPUDevice::CreateMaterial(const UTF8String &mtl_name,ShaderModuleMap * // 但只要我们限制一个MI数据不超过64/256字节，一次渲染不超过256种材质实例，就无需解决此问题。 - if(desc_manager->hasSet(DescriptorSetType::PerMaterial)) - { - data->mi_size - data->mi_data=new uint8[data->mi_size*256]; - } - else + //if(desc_manager->hasSet(DescriptorSetType::PerMaterial)) + //{ + // data->mi_size + // data->mi_data=new uint8[data->mi_size*256]; + //} + //else { data->mi_size=0; data->mi_data=nullptr;