From 0e789b6f47375f8017ae0b697fa85d079a48e5d9 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Sat, 17 May 2025 20:26:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=84=E7=A7=8D=E7=B1=BB=E5=90=8D=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E5=90=8D=E4=BC=98=E5=8C=96=EF=BC=8C=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E4=BD=BF=E7=94=A8GPU=E5=BC=80=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/2dVector/LerpLine.cpp | 2 +- example/Basic/BillboardTest.cpp | 4 +-- example/Basic/auto_instance.cpp | 2 +- .../Basic/auto_merge_material_instance.cpp | 2 +- example/Basic/draw_triangle_in_NDC.cpp | 2 +- example/Basic/draw_triangle_use_UBO.cpp | 2 +- example/Gizmo/GizmoResource.cpp | 10 +++---- example/Gizmo/MetricCellsGrid.cpp | 2 +- example/Gizmo/PlaneGrid3D.cpp | 2 +- example/Gizmo/RayPicking.cpp | 2 +- .../LightBasic/BlinnPhongDirectionLight.cpp | 4 +-- example/Texture/texture_format_list.cpp | 6 ++-- example/Texture/texture_quad.cpp | 4 +-- example/Texture/texture_rect.cpp | 4 +-- example/Texture/texture_rect_array.cpp | 4 +-- example/Vulkan/Deferred.cpp | 4 +-- example/Vulkan/DeferredRender.cpp | 8 +++--- example/Vulkan/InlineGeometryScene.cpp | 2 +- example/common/VulkanAppFramework.h | 4 +-- inc/hgl/WorkObject.h | 6 ++-- inc/hgl/graph/MaterialRenderList.h | 4 +-- inc/hgl/graph/PrimitiveCreater.h | 4 +-- inc/hgl/graph/RenderFramework.h | 8 +++--- inc/hgl/graph/RenderList.h | 4 +-- inc/hgl/graph/VK.h | 8 +++--- inc/hgl/graph/VKArrayBuffer.h | 14 ++++------ inc/hgl/graph/VKBuffer.h | 2 +- inc/hgl/graph/VKCommandBuffer.h | 28 +++++++++---------- inc/hgl/graph/VKDevice.h | 20 ++++++------- inc/hgl/graph/VKDeviceAttribute.h | 10 +++---- inc/hgl/graph/VKDeviceCreater.h | 18 ++++++------ inc/hgl/graph/VKDynamicBufferAccess.h | 2 +- inc/hgl/graph/VKFence.h | 2 +- inc/hgl/graph/VKIndexBuffer.h | 2 +- inc/hgl/graph/VKIndirectCommandBuffer.h | 8 +++--- inc/hgl/graph/VKInstance.h | 6 ++-- inc/hgl/graph/VKMemory.h | 2 +- inc/hgl/graph/VKMemoryAllocator.h | 4 +-- inc/hgl/graph/VKPhysicalDevice.h | 14 +++++----- inc/hgl/graph/VKQueue.h | 4 +-- inc/hgl/graph/VKRenderContext.h | 4 +-- inc/hgl/graph/VKRenderResource.h | 6 ++-- inc/hgl/graph/VKRenderTarget.h | 2 +- inc/hgl/graph/VKSampler.h | 2 +- inc/hgl/graph/VKSemaphore.h | 2 +- inc/hgl/graph/VKTextureLoader.h | 4 +-- inc/hgl/graph/VKVertexAttribBuffer.h | 2 +- inc/hgl/graph/VertexDataManager.h | 6 ++-- inc/hgl/graph/font/TextPrimitive.h | 4 +-- inc/hgl/graph/font/TextRender.h | 8 +++--- inc/hgl/graph/module/GraphModule.h | 6 ++-- inc/hgl/graph/module/GraphModuleManager.h | 2 +- inc/hgl/graph/module/RenderModule.h | 2 +- inc/hgl/graph/mtl/Material2DCreateConfig.h | 12 ++++---- inc/hgl/graph/mtl/Material3DCreateConfig.h | 10 +++---- inc/hgl/graph/mtl/MaterialLibrary.h | 12 ++++---- inc/hgl/graph/mtl/StdMaterial.h | 4 +-- inc/hgl/gui/ThemeEngine.h | 8 +++--- inc/hgl/shadergen/MaterialCreateInfo.h | 4 +-- src/GUI/DefaultThemeEngine.cpp | 2 +- src/GUI/ThemeEngine.cpp | 8 +++--- src/SceneGraph/PrimitiveCreater.cpp | 2 +- src/SceneGraph/VertexDataManager.cpp | 2 +- .../Debug/VKPhysicalDeviceCapsOutput.cpp | 2 +- .../Vulkan/Texture/VKDeviceTexture2DArray.cpp | 8 +++--- .../Vulkan/Texture/VKDeviceTextureCube.cpp | 8 +++--- src/SceneGraph/Vulkan/VKArrayBuffer.cpp | 22 +++++++-------- src/SceneGraph/Vulkan/VKCommandBuffer.cpp | 12 ++++---- .../Vulkan/VKCommandBufferRender.cpp | 2 +- src/SceneGraph/Vulkan/VKDevice.cpp | 16 +++++------ src/SceneGraph/Vulkan/VKDeviceAttribute.cpp | 12 ++++---- src/SceneGraph/Vulkan/VKDeviceBuffer.cpp | 22 +++++++-------- src/SceneGraph/Vulkan/VKDeviceCreater.cpp | 20 ++++++------- src/SceneGraph/Vulkan/VKDeviceMaterial.cpp | 2 +- src/SceneGraph/Vulkan/VKDeviceMemory.cpp | 2 +- src/SceneGraph/Vulkan/VKDeviceSampler.cpp | 4 +-- .../Vulkan/VKIndirectCommandBuffer.cpp | 8 +++--- src/SceneGraph/Vulkan/VKInstance.cpp | 8 +++--- src/SceneGraph/Vulkan/VKMemory.cpp | 2 +- src/SceneGraph/Vulkan/VKMemoryAllocator.cpp | 2 +- src/SceneGraph/Vulkan/VKPhysicalDevice.cpp | 16 +++++------ .../Vulkan/VKPipelineLayoutData.cpp | 2 +- src/SceneGraph/Vulkan/VKPrimitiveData.cpp | 8 +++--- src/SceneGraph/Vulkan/VKPrimitiveData.h | 2 +- src/SceneGraph/Vulkan/VKQueue.cpp | 2 +- .../Vulkan/VKRenderResourceMaterial.cpp | 8 +++--- src/SceneGraph/Vulkan/VKRenderTarget.cpp | 2 +- src/SceneGraph/Vulkan/VKShaderModule.cpp | 2 +- src/SceneGraph/Vulkan/VKTileData.cpp | 2 +- src/SceneGraph/font/TextPrimitive.cpp | 2 +- src/SceneGraph/font/TextRender.cpp | 4 +-- src/SceneGraph/module/GraphModule.cpp | 8 +++--- src/SceneGraph/module/GraphModuleManager.cpp | 2 +- src/SceneGraph/module/RenderPassManager.cpp | 2 +- src/SceneGraph/module/RenderTargetManager.cpp | 2 +- src/SceneGraph/module/SwapchainModule.cpp | 14 +++++----- src/SceneGraph/module/TextureManager.cpp | 4 +-- src/SceneGraph/render/MaterialRenderList.cpp | 2 +- src/SceneGraph/render/RenderAssignBuffer.cpp | 2 +- src/SceneGraph/render/RenderAssignBuffer.h | 4 +-- src/SceneGraph/render/RenderList.cpp | 2 +- src/ShaderGen/2d/M_PureColor2D.cpp | 2 +- src/ShaderGen/2d/M_PureTexture2D.cpp | 2 +- src/ShaderGen/2d/M_RectTexture2D.cpp | 2 +- src/ShaderGen/2d/M_RectTexture2DArray.cpp | 2 +- src/ShaderGen/2d/M_VertexColor2D.cpp | 2 +- src/ShaderGen/2d/Std2DMaterialLoader.cpp | 2 +- src/ShaderGen/3d/M_BillboardDynamicSize.cpp | 2 +- src/ShaderGen/3d/M_BillboardFixedSize.cpp | 2 +- src/ShaderGen/3d/M_Gizmo3D.cpp | 2 +- src/ShaderGen/3d/M_VertexColor3D.cpp | 2 +- src/ShaderGen/3d/M_VertexLum3D.cpp | 2 +- src/ShaderGen/3d/Std3DMaterialLoader.cpp | 2 +- src/ShaderGen/GLSLCompiler.cpp | 2 +- src/ShaderGen/MaterialCreateInfo.cpp | 2 +- src/ShaderGen/MaterialLibrary.cpp | 2 +- src/ShaderGen/StandardMaterial.cpp | 2 +- src/Work/WorkManager.cpp | 2 +- 118 files changed, 314 insertions(+), 318 deletions(-) diff --git a/example/2dVector/LerpLine.cpp b/example/2dVector/LerpLine.cpp index f09f1b43..8218c044 100644 --- a/example/2dVector/LerpLine.cpp +++ b/example/2dVector/LerpLine.cpp @@ -46,7 +46,7 @@ private: bool InitAutoMaterial() { - mtl::Material2DCreateConfig cfg(device->GetDeviceAttribute(),"VertexColor2D",PrimitiveType::Lines); + mtl::Material2DCreateConfig cfg(device->GetDevAttr(),"VertexColor2D",PrimitiveType::Lines); cfg.coordinate_system=CoordinateSystem2D::NDC; cfg.local_to_world=false; diff --git a/example/Basic/BillboardTest.cpp b/example/Basic/BillboardTest.cpp index 27b4afe8..141cfdec 100644 --- a/example/Basic/BillboardTest.cpp +++ b/example/Basic/BillboardTest.cpp @@ -47,7 +47,7 @@ private: bool InitPlaneGridMP() { - mtl::Material3DCreateConfig cfg(device->GetDeviceAttribute(),"VertexLuminance3D",PrimitiveType::Lines); + mtl::Material3DCreateConfig cfg(device->GetDevAttr(),"VertexLuminance3D",PrimitiveType::Lines); cfg.local_to_world=true; @@ -73,7 +73,7 @@ private: bool InitBillboardMP() { - mtl::BillboardMaterialCreateConfig cfg(device->GetDeviceAttribute(),"Billboard2D",PrimitiveType::Billboard); + mtl::BillboardMaterialCreateConfig cfg(device->GetDevAttr(),"Billboard2D",PrimitiveType::Billboard); { cfg.fixed_size=true; diff --git a/example/Basic/auto_instance.cpp b/example/Basic/auto_instance.cpp index ed11d32d..ce52b8cd 100644 --- a/example/Basic/auto_instance.cpp +++ b/example/Basic/auto_instance.cpp @@ -47,7 +47,7 @@ private: bool InitMaterial() { { - mtl::Material2DCreateConfig cfg(GetDeviceAttribute(),"VertexColor2D",PrimitiveType::Triangles); + mtl::Material2DCreateConfig cfg(GetDevAttr(),"VertexColor2D",PrimitiveType::Triangles); cfg.coordinate_system=CoordinateSystem2D::NDC; cfg.local_to_world=true; diff --git a/example/Basic/auto_merge_material_instance.cpp b/example/Basic/auto_merge_material_instance.cpp index f94391b3..16fdf78c 100644 --- a/example/Basic/auto_merge_material_instance.cpp +++ b/example/Basic/auto_merge_material_instance.cpp @@ -48,7 +48,7 @@ private: bool InitMaterial() { { - mtl::Material2DCreateConfig cfg(GetDeviceAttribute(),"PureColor2D",PrimitiveType::Triangles); + mtl::Material2DCreateConfig cfg(GetDevAttr(),"PureColor2D",PrimitiveType::Triangles); cfg.coordinate_system=CoordinateSystem2D::NDC; cfg.local_to_world=true; diff --git a/example/Basic/draw_triangle_in_NDC.cpp b/example/Basic/draw_triangle_in_NDC.cpp index 0840ab61..9758641c 100644 --- a/example/Basic/draw_triangle_in_NDC.cpp +++ b/example/Basic/draw_triangle_in_NDC.cpp @@ -87,7 +87,7 @@ private: bool InitAutoMaterial() { - mtl::Material2DCreateConfig cfg(GetDeviceAttribute(),"VertexColor2d",PrimitiveType::Triangles); + mtl::Material2DCreateConfig cfg(GetDevAttr(),"VertexColor2d",PrimitiveType::Triangles); cfg.coordinate_system=CoordinateSystem2D::NDC; cfg.local_to_world=false; diff --git a/example/Basic/draw_triangle_use_UBO.cpp b/example/Basic/draw_triangle_use_UBO.cpp index 3817239f..0c5c5414 100644 --- a/example/Basic/draw_triangle_use_UBO.cpp +++ b/example/Basic/draw_triangle_use_UBO.cpp @@ -46,7 +46,7 @@ private: bool InitMaterial() { - mtl::Material2DCreateConfig cfg(GetDeviceAttribute(),"VertexColor2D",PrimitiveType::Triangles); + mtl::Material2DCreateConfig cfg(GetDevAttr(),"VertexColor2D",PrimitiveType::Triangles); VILConfig vil_config; diff --git a/example/Gizmo/GizmoResource.cpp b/example/Gizmo/GizmoResource.cpp index d2751249..9c692515 100644 --- a/example/Gizmo/GizmoResource.cpp +++ b/example/Gizmo/GizmoResource.cpp @@ -80,7 +80,7 @@ namespace return(true); } - bool InitGizmoResource2D(GPUDevice *device) + bool InitGizmoResource2D(VulkanDevice *device) { if(!gizmo_rr) return(false); @@ -88,7 +88,7 @@ namespace RenderPass *render_pass=device->GetRenderPass(); { - mtl::Material3DCreateConfig cfg(device->GetDeviceAttribute(),"VertexLuminance3D",PrimitiveType::Lines); + mtl::Material3DCreateConfig cfg(device->GetDevAttr(),"VertexLuminance3D",PrimitiveType::Lines); cfg.mtl_name="VertexLuminance3D"; //注意必须用不同名字，未来改名材质文件名+cfg hash名 cfg.local_to_world=true; @@ -134,7 +134,7 @@ namespace return(true); } - bool InitGizmoResource3D(GPUDevice *device) + bool InitGizmoResource3D(VulkanDevice *device) { if(!gizmo_rr) return(false); @@ -142,7 +142,7 @@ namespace RenderPass *render_pass=device->GetRenderPass(); { - mtl::Material3DCreateConfig cfg(device->GetDeviceAttribute(),"Gizmo3D",PrimitiveType::Triangles); + mtl::Material3DCreateConfig cfg(device->GetDevAttr(),"Gizmo3D",PrimitiveType::Triangles); cfg.local_to_world=true; cfg.material_instance=true; @@ -272,7 +272,7 @@ bool InitGizmoResource(RenderResource *rr) gizmo_rr=rr; - GPUDevice *device=gizmo_rr->GetDevice(); + VulkanDevice *device=gizmo_rr->GetDevice(); if(!InitGizmoResource3D(device)) return(false); diff --git a/example/Gizmo/MetricCellsGrid.cpp b/example/Gizmo/MetricCellsGrid.cpp index 92e80d2e..ae1cd77a 100644 --- a/example/Gizmo/MetricCellsGrid.cpp +++ b/example/Gizmo/MetricCellsGrid.cpp @@ -49,7 +49,7 @@ private: bool InitMDP() { - mtl::Material3DCreateConfig cfg(device->GetDeviceAttribute(),"MetricCellsGrid",PrimitiveType::Fan); + mtl::Material3DCreateConfig cfg(device->GetDevAttr(),"MetricCellsGrid",PrimitiveType::Fan); cfg.local_to_world=true; diff --git a/example/Gizmo/PlaneGrid3D.cpp b/example/Gizmo/PlaneGrid3D.cpp index 5a9b88fa..d4409d90 100644 --- a/example/Gizmo/PlaneGrid3D.cpp +++ b/example/Gizmo/PlaneGrid3D.cpp @@ -26,7 +26,7 @@ private: bool InitMDP() { - mtl::Material3DCreateConfig cfg(device->GetDeviceAttribute(),"VertexLuminance3D",PrimitiveType::Lines); + mtl::Material3DCreateConfig cfg(device->GetDevAttr(),"VertexLuminance3D",PrimitiveType::Lines); cfg.local_to_world=true; cfg.position_format=VAT_VEC2; diff --git a/example/Gizmo/RayPicking.cpp b/example/Gizmo/RayPicking.cpp index 1a57dbd4..bd5ccdf6 100644 --- a/example/Gizmo/RayPicking.cpp +++ b/example/Gizmo/RayPicking.cpp @@ -51,7 +51,7 @@ private: bool InitMaterialAndPipeline() { - mtl::Material3DCreateConfig cfg(device->GetDeviceAttribute(),"VertexLuminance2D",PrimitiveType::Lines); + mtl::Material3DCreateConfig cfg(device->GetDevAttr(),"VertexLuminance2D",PrimitiveType::Lines); cfg.local_to_world=true; diff --git a/example/LightBasic/BlinnPhongDirectionLight.cpp b/example/LightBasic/BlinnPhongDirectionLight.cpp index 25eb52cd..e8ad4f68 100644 --- a/example/LightBasic/BlinnPhongDirectionLight.cpp +++ b/example/LightBasic/BlinnPhongDirectionLight.cpp @@ -104,7 +104,7 @@ private: bool InitVertexLumMP() { - mtl::Material3DCreateConfig cfg(device->GetDeviceAttribute(),"VertexLuminance3D",PrimitiveType::Lines); + mtl::Material3DCreateConfig cfg(device->GetDevAttr(),"VertexLuminance3D",PrimitiveType::Lines); cfg.local_to_world=true; @@ -132,7 +132,7 @@ private: bool InitBlinnPhongSunLightMP() { - mtl::Material3DCreateConfig cfg(device->GetDeviceAttribute(),"BlinnPhong3D",PrimitiveType::Triangles); + mtl::Material3DCreateConfig cfg(device->GetDevAttr(),"BlinnPhong3D",PrimitiveType::Triangles); cfg.local_to_world=true; cfg.material_instance=true; diff --git a/example/Texture/texture_format_list.cpp b/example/Texture/texture_format_list.cpp index de2e2c9b..a7eb9ac7 100644 --- a/example/Texture/texture_format_list.cpp +++ b/example/Texture/texture_format_list.cpp @@ -38,8 +38,8 @@ int main(int,char **) { Window * win =nullptr; VulkanInstance * inst =nullptr; - GPUDevice * device =nullptr; - const GPUPhysicalDevice * physical_device =nullptr; + VulkanDevice * device =nullptr; + const VulkanPhyDevice * physical_device =nullptr; inst=InitVulkanInstance(); @@ -100,4 +100,4 @@ int main(int,char **) delete inst; return 0; -} \ No newline at end of file +} diff --git a/example/Texture/texture_quad.cpp b/example/Texture/texture_quad.cpp index d018e16c..6ffd1fde 100644 --- a/example/Texture/texture_quad.cpp +++ b/example/Texture/texture_quad.cpp @@ -12,7 +12,7 @@ using namespace hgl; using namespace hgl::graph; VK_NAMESPACE_BEGIN -Texture2D *CreateTexture2DFromFile(GPUDevice *device,const OSString &filename); +Texture2D *CreateTexture2DFromFile(VulkanDevice *device,const OSString &filename); VK_NAMESPACE_END constexpr uint32_t SCREEN_WIDTH=256; @@ -51,7 +51,7 @@ private: bool InitMaterial() { - mtl::Material2DCreateConfig cfg(device->GetDeviceAttribute(),"PureTexture2D",PrimitiveType::Fan); + mtl::Material2DCreateConfig cfg(device->GetDevAttr(),"PureTexture2D",PrimitiveType::Fan); cfg.coordinate_system=CoordinateSystem2D::NDC; cfg.local_to_world=false; diff --git a/example/Texture/texture_rect.cpp b/example/Texture/texture_rect.cpp index ffadcb49..c447525b 100644 --- a/example/Texture/texture_rect.cpp +++ b/example/Texture/texture_rect.cpp @@ -12,7 +12,7 @@ using namespace hgl; using namespace hgl::graph; VK_NAMESPACE_BEGIN -Texture2D *CreateTexture2DFromFile(GPUDevice *device,const OSString &filename); +Texture2D *CreateTexture2DFromFile(VulkanDevice *device,const OSString &filename); VK_NAMESPACE_END constexpr uint32_t SCREEN_WIDTH=256; @@ -47,7 +47,7 @@ private: bool InitMaterial() { - mtl::Material2DCreateConfig cfg(device->GetDeviceAttribute(),"RectTexture2D",PrimitiveType::SolidRectangles); + mtl::Material2DCreateConfig cfg(device->GetDevAttr(),"RectTexture2D",PrimitiveType::SolidRectangles); cfg.coordinate_system=CoordinateSystem2D::ZeroToOne; cfg.local_to_world=false; diff --git a/example/Texture/texture_rect_array.cpp b/example/Texture/texture_rect_array.cpp index 413e14f0..51caa519 100644 --- a/example/Texture/texture_rect_array.cpp +++ b/example/Texture/texture_rect_array.cpp @@ -13,7 +13,7 @@ using namespace hgl; using namespace hgl::graph; VK_NAMESPACE_BEGIN -//Texture2D *CreateTexture2DFromFile(GPUDevice *device,const OSString &filename); +//Texture2D *CreateTexture2DFromFile(VulkanDevice *device,const OSString &filename); VK_NAMESPACE_END constexpr uint32_t SCREEN_WIDTH=256; @@ -91,7 +91,7 @@ private: bool InitMaterial() { - mtl::Material2DCreateConfig cfg(device->GetDeviceAttribute(),"RectTexture2DArray",PrimitiveType::SolidRectangles); + mtl::Material2DCreateConfig cfg(device->GetDevAttr(),"RectTexture2DArray",PrimitiveType::SolidRectangles); cfg.coordinate_system=CoordinateSystem2D::ZeroToOne; cfg.local_to_world=true; diff --git a/example/Vulkan/Deferred.cpp b/example/Vulkan/Deferred.cpp index 53f35467..740876aa 100644 --- a/example/Vulkan/Deferred.cpp +++ b/example/Vulkan/Deferred.cpp @@ -103,7 +103,7 @@ private: const VkFormat GetCandidateFormat(const VkFormat *fmt_list, const uint count) { - auto pd = device->GetPhysicalDevice(); + auto pd = device->GetPhyDevice(); for (uint i = 0; i < count; i++) if (pd->IsColorAttachmentOptimal(fmt_list[i])) @@ -118,7 +118,7 @@ private: const VkFormat GetDepthCandidateFormat() { - auto pd = device->GetPhysicalDevice(); + auto pd = device->GetPhyDevice(); for (VkFormat fmt : depth_candidate_format) if (pd->IsDepthAttachmentOptimal(fmt)) diff --git a/example/Vulkan/DeferredRender.cpp b/example/Vulkan/DeferredRender.cpp index 0f8226b4..a7bdf501 100644 --- a/example/Vulkan/DeferredRender.cpp +++ b/example/Vulkan/DeferredRender.cpp @@ -16,7 +16,7 @@ using namespace hgl; using namespace hgl::graph; VK_NAMESPACE_BEGIN -Texture2D *CreateTexture2DFromFile(GPUDevice *device,const OSString &filename); +Texture2D *CreateTexture2DFromFile(VulkanDevice *device,const OSString &filename); VK_NAMESPACE_END constexpr uint32_t SCREEN_WIDTH=1280; @@ -139,7 +139,7 @@ private: #ifdef _DEBUG { - auto da=device->GetDeviceAttribute(); + auto da=device->GetDevAttr(); if(da->debug_maker) { @@ -172,7 +172,7 @@ private: #ifdef _DEBUG { - auto da=device->GetDeviceAttribute(); + auto da=device->GetDevAttr(); VkQueue q=*(gbuffer.rt->GetQueue()); VkFramebuffer fbo= gbuffer.rt->GetFramebuffer()->GetFramebuffer(); @@ -229,7 +229,7 @@ private: #ifdef _DEBUG { - auto da=device->GetDeviceAttribute(); + auto da=device->GetDevAttr(); if(da->debug_maker) { diff --git a/example/Vulkan/InlineGeometryScene.cpp b/example/Vulkan/InlineGeometryScene.cpp index c8eb8ddf..4190c3cc 100644 --- a/example/Vulkan/InlineGeometryScene.cpp +++ b/example/Vulkan/InlineGeometryScene.cpp @@ -109,7 +109,7 @@ private: VK_SAMPLER_ADDRESS_MODE_REPEAT, 0.0f, VK_TRUE, - device->GetPhysicalDevice()->GetMaxSamplerAnisotropy(), + device->GetPhyDevice()->GetMaxSamplerAnisotropy(), false, VK_COMPARE_OP_NEVER, 0.0f, diff --git a/example/common/VulkanAppFramework.h b/example/common/VulkanAppFramework.h index ada23ed3..de028542 100644 --- a/example/common/VulkanAppFramework.h +++ b/example/common/VulkanAppFramework.h @@ -53,7 +53,7 @@ protected: protected: - GPUDevice * device =nullptr; + VulkanDevice * device =nullptr; RenderPass * device_render_pass =nullptr; SwapchainRenderTarget * sc_render_target =nullptr; @@ -216,7 +216,7 @@ public: cmd_buf=hgl_zero_new(swap_chain_count); for(int32_t i=0;iCreateRenderCommandBuffer(device->GetPhysicalDevice()->GetDeviceName()+AnsiString(":RenderCmdBuffer_")+AnsiString::numberOf(i)); + cmd_buf[i]=device->CreateRenderCommandBuffer(device->GetPhyDevice()->GetDeviceName()+AnsiString(":RenderCmdBuffer_")+AnsiString::numberOf(i)); } } diff --git a/inc/hgl/WorkObject.h b/inc/hgl/WorkObject.h index 7f6a283d..3ad97c8e 100644 --- a/inc/hgl/WorkObject.h +++ b/inc/hgl/WorkObject.h @@ -36,8 +36,8 @@ namespace hgl public: graph::RenderFramework * GetRenderFramework (){return render_framework;} - graph::GPUDevice * GetDevice (){return render_framework->GetDevice();} - graph::VkDevAttr * GetDeviceAttribute (){return render_framework->GetDeviceAttribute();} + graph::VulkanDevice * GetDevice (){return render_framework->GetDevice();} + graph::VulkanDevAttr * GetDevAttr (){return render_framework->GetDevAttr();} const VkExtent2D & GetExtent2D (){return cur_render_target->GetExtent();} @@ -82,7 +82,7 @@ namespace hgl graph::MaterialInstance *CreateMaterialInstance(const AnsiString &mtl_name,graph::mtl::MaterialCreateConfig *mtl_cfg,const graph::VILConfig *vil_cfg=nullptr) { AutoDelete mci=graph::mtl::CreateMaterialCreateInfo( - GetDeviceAttribute(), + GetDevAttr(), "VertexColor2D",mtl_cfg); //这个是使用名称创建 return db->CreateMaterialInstance(mci,vil_cfg); diff --git a/inc/hgl/graph/MaterialRenderList.h b/inc/hgl/graph/MaterialRenderList.h index 7784b3c6..b55b9790 100644 --- a/inc/hgl/graph/MaterialRenderList.h +++ b/inc/hgl/graph/MaterialRenderList.h @@ -46,7 +46,7 @@ public: */ class MaterialRenderList { - GPUDevice *device; + VulkanDevice *device; RenderCmdBuffer *cmd_buf; RenderPipelineIndex rp_index; @@ -106,7 +106,7 @@ protected: public: - MaterialRenderList(GPUDevice *d,bool l2w,const RenderPipelineIndex &rpi); + MaterialRenderList(VulkanDevice *d,bool l2w,const RenderPipelineIndex &rpi); ~MaterialRenderList(); void Add(SceneNode *); diff --git a/inc/hgl/graph/PrimitiveCreater.h b/inc/hgl/graph/PrimitiveCreater.h index 732019a4..c1486fbc 100644 --- a/inc/hgl/graph/PrimitiveCreater.h +++ b/inc/hgl/graph/PrimitiveCreater.h @@ -13,7 +13,7 @@ class PrimitiveCreater { protected: - GPUDevice * device; + VulkanDevice * device; VertexDataManager * vdm; const VIL * vil; @@ -36,7 +36,7 @@ protected: public: - PrimitiveCreater(GPUDevice *,const VIL *); + PrimitiveCreater(VulkanDevice *,const VIL *); PrimitiveCreater(VertexDataManager *); virtual ~PrimitiveCreater(); diff --git a/inc/hgl/graph/RenderFramework.h b/inc/hgl/graph/RenderFramework.h index a8890d5a..fbec2c8e 100644 --- a/inc/hgl/graph/RenderFramework.h +++ b/inc/hgl/graph/RenderFramework.h @@ -27,7 +27,7 @@ class RenderFramework:public io::WindowEvent Window * win =nullptr; VulkanInstance * inst =nullptr; - GPUDevice * device =nullptr; + VulkanDevice * device =nullptr; RenderResource * render_resource =nullptr; @@ -50,10 +50,10 @@ protected: public: Window * GetWindow ()const{return win;} - GPUDevice * GetDevice ()const{return device;} + VulkanDevice * GetDevice ()const{return device;} VkDevice GetVkDevice ()const{return device->GetDevice();} - const GPUPhysicalDevice * GetPhysicalDevice ()const{return device->GetPhysicalDevice();} - VkDevAttr * GetDeviceAttribute ()const{return device->GetDeviceAttribute();} + const VulkanPhyDevice * GetPhyDevice ()const{return device->GetPhyDevice();} + VulkanDevAttr * GetDevAttr ()const{return device->GetDevAttr();} RenderResource * GetRenderResource ()const{return render_resource;} diff --git a/inc/hgl/graph/RenderList.h b/inc/hgl/graph/RenderList.h index 94ec4111..0ac4af45 100644 --- a/inc/hgl/graph/RenderList.h +++ b/inc/hgl/graph/RenderList.h @@ -18,7 +18,7 @@ namespace hgl { protected: - GPUDevice * device; + VulkanDevice * device; CameraInfo * camera_info; ///<相机信息 @@ -31,7 +31,7 @@ namespace hgl public: - RenderList(GPUDevice *); + RenderList(VulkanDevice *); virtual ~RenderList()=default; virtual void SetCamera(CameraInfo *ci){camera_info=ci;} ///<设置相机信息 diff --git a/inc/hgl/graph/VK.h b/inc/hgl/graph/VK.h index d2cd8261..c5747b98 100644 --- a/inc/hgl/graph/VK.h +++ b/inc/hgl/graph/VK.h @@ -41,9 +41,9 @@ class GraphModule; class RenderFramework; class VulkanInstance; -class GPUPhysicalDevice; -class GPUDevice; -struct VkDevAttr; +class VulkanPhyDevice; +class VulkanDevice; +struct VulkanDevAttr; class DeviceQueue; class ImageView; class Framebuffer; @@ -84,7 +84,7 @@ class IndexBuffer; class VABMap; class IBMap; -class GPUCmdBuffer; +class VulkanCmdBuffer; class RenderCmdBuffer; class TextureCmdBuffer; diff --git a/inc/hgl/graph/VKArrayBuffer.h b/inc/hgl/graph/VKArrayBuffer.h index 74277d7c..f2744c59 100644 --- a/inc/hgl/graph/VKArrayBuffer.h +++ b/inc/hgl/graph/VKArrayBuffer.h @@ -1,5 +1,4 @@ -#ifndef HGL_GRAPH_VULKAN_ARRAY_BUFFER_INCLUDE -#define HGL_GRAPH_VULKAN_ARRAY_BUFFER_INCLUDE +#pragma once #include #include @@ -15,7 +14,7 @@ namespace hgl * GPU数据阵列缓冲区
* 它用于储存多份相同格式的数据，常用于多物件渲染，instance等 */ - class GPUArrayBuffer + class VulkanArrayBuffer { protected: @@ -33,13 +32,13 @@ namespace hgl private: - GPUArrayBuffer(VKMemoryAllocator *,const uint,const uint); + VulkanArrayBuffer(VKMemoryAllocator *,const uint,const uint); - friend class GPUDevice; + friend class VulkanDevice; public: - virtual ~GPUArrayBuffer(); + virtual ~VulkanArrayBuffer(); const uint32_t GetAlignSize()const{return align_size;} ///<数据对齐字节数 const uint32_t GetRangeSize()const{return range_size;} ///<单次渲染访问最大字节数 @@ -71,7 +70,6 @@ namespace hgl dba->Restart(); } - };//class GPUArrayBuffer + };//class VulkanArrayBuffer }//namespace graph }//namespace hgl -#endif//HGL_GRAPH_VULKAN_ARRAY_BUFFER_INCLUDE diff --git a/inc/hgl/graph/VKBuffer.h b/inc/hgl/graph/VKBuffer.h index 9b02275d..5f05fe65 100644 --- a/inc/hgl/graph/VKBuffer.h +++ b/inc/hgl/graph/VKBuffer.h @@ -20,7 +20,7 @@ protected: private: - friend class GPUDevice; + friend class VulkanDevice; friend class VertexAttribBuffer; friend class IndexBuffer; template friend class IndirectCommandBuffer; diff --git a/inc/hgl/graph/VKCommandBuffer.h b/inc/hgl/graph/VKCommandBuffer.h index c143f82a..76d32ffa 100644 --- a/inc/hgl/graph/VKCommandBuffer.h +++ b/inc/hgl/graph/VKCommandBuffer.h @@ -1,5 +1,4 @@ -#ifndef HGL_GRAPH_VULKAN_COMMAND_BUFFER_INCLUDE -#define HGL_GRAPH_VULKAN_COMMAND_BUFFER_INCLUDE +#pragma once #include #include @@ -8,11 +7,11 @@ #include #include VK_NAMESPACE_BEGIN -class GPUCmdBuffer +class VulkanCmdBuffer { protected: - const VkDevAttr *dev_attr; + const VulkanDevAttr *dev_attr; VkCommandBuffer cmd_buf; @@ -20,8 +19,8 @@ protected: public: - GPUCmdBuffer(const VkDevAttr *attr,VkCommandBuffer cb); - virtual ~GPUCmdBuffer(); + VulkanCmdBuffer(const VulkanDevAttr *attr,VkCommandBuffer cb); + virtual ~VulkanCmdBuffer(); operator VkCommandBuffer(){return cmd_buf;} operator const VkCommandBuffer()const{return cmd_buf;} @@ -48,11 +47,11 @@ public: void BeginRegion(const AnsiString &,const Color4f &){} void EndRegion(){} #endif//_DEBUG -};//class GPUCmdBuffer +};//class VulkanCmdBuffer class DescriptorBinding; -class RenderCmdBuffer:public GPUCmdBuffer +class RenderCmdBuffer:public VulkanCmdBuffer { uint32_t cv_count; VkClearValue *clear_values; @@ -70,7 +69,7 @@ private: public: - RenderCmdBuffer(const VkDevAttr *attr,VkCommandBuffer cb); + RenderCmdBuffer(const VulkanDevAttr *attr,VkCommandBuffer cb); ~RenderCmdBuffer(); void SetDescriptorBinding(DescriptorBinding *db) { desc_binding=db; } @@ -79,7 +78,7 @@ public: { desc_binding=nullptr; - return GPUCmdBuffer::End(); + return VulkanCmdBuffer::End(); } void SetRenderArea(const VkRect2D &ra){render_area=ra;} @@ -256,15 +255,15 @@ public: Draw(ri->GetDataBuffer(),ri->GetRenderData()); } -};//class RenderCmdBuffer:public GPUCmdBuffer +};//class RenderCmdBuffer:public VulkanCmdBuffer -class TextureCmdBuffer:public GPUCmdBuffer +class TextureCmdBuffer:public VulkanCmdBuffer { VkImageMemoryBarrier imageMemoryBarrier; public: - TextureCmdBuffer(const VkDevAttr *attr,VkCommandBuffer cb):GPUCmdBuffer(attr,cb) + TextureCmdBuffer(const VulkanDevAttr *attr,VkCommandBuffer cb):VulkanCmdBuffer(attr,cb) { imageMemoryBarrier.sType=VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; imageMemoryBarrier.pNext=nullptr; @@ -301,6 +300,5 @@ public: 0, nullptr, 1, &imageMemoryBarrier); } -};//class TextureCmdBuffer:public GPUCmdBuffer +};//class TextureCmdBuffer:public VulkanCmdBuffer VK_NAMESPACE_END -#endif//HGL_GRAPH_VULKAN_COMMAND_BUFFER_INCLUDE diff --git a/inc/hgl/graph/VKDevice.h b/inc/hgl/graph/VKDevice.h index 2986a69a..88b2ad82 100644 --- a/inc/hgl/graph/VKDevice.h +++ b/inc/hgl/graph/VKDevice.h @@ -20,16 +20,16 @@ VK_NAMESPACE_BEGIN class TileData; class TileFont; class FontSource; -class GPUArrayBuffer; +class VulkanArrayBuffer; class IndirectDrawBuffer; class IndirectDrawIndexedBuffer; class IndirectDispatchBuffer; struct CopyBufferToImageInfo; -class GPUDevice +class VulkanDevice { - VkDevAttr *attr; + VulkanDevAttr *attr; private: @@ -39,18 +39,18 @@ private: friend class VulkanDeviceCreater; - GPUDevice(VkDevAttr *da); + VulkanDevice(VulkanDevAttr *da); public: - virtual ~GPUDevice(); + virtual ~VulkanDevice(); operator VkDevice () {return attr->device;} - VkDevAttr *GetDeviceAttribute () {return attr;} + VulkanDevAttr * GetDevAttr () {return attr;} VkSurfaceKHR GetSurface () {return attr->surface;} VkDevice GetDevice ()const {return attr->device;} - const GPUPhysicalDevice * GetPhysicalDevice ()const {return attr->physical_device;} + const VulkanPhyDevice * GetPhyDevice ()const {return attr->physical_device;} VkDescriptorPool GetDescriptorPool () {return attr->desc_pool;} VkPipelineCache GetPipelineCache () {return attr->pipeline_cache;} @@ -131,8 +131,8 @@ public: //Buffer相关 #undef CREATE_BUFFER_OBJECT - GPUArrayBuffer *CreateArrayInUBO(const VkDeviceSize &uint_size); - GPUArrayBuffer *CreateArrayInSSBO(const VkDeviceSize &uint_size); + VulkanArrayBuffer *CreateArrayInUBO(const VkDeviceSize &uint_size); + VulkanArrayBuffer *CreateArrayInSSBO(const VkDeviceSize &uint_size); public: //间接绘制 @@ -172,5 +172,5 @@ public: TileData *CreateTileData(const VkFormat video_format,const uint width,const uint height,const uint count); ///<创建一个Tile数据集 TileFont *CreateTileFont(FontSource *fs,int limit_count=-1); ///<创建一个Tile字体 -};//class GPUDevice +};//class VulkanDevice VK_NAMESPACE_END diff --git a/inc/hgl/graph/VKDeviceAttribute.h b/inc/hgl/graph/VKDeviceAttribute.h index 6cbdfd5e..e92d833e 100644 --- a/inc/hgl/graph/VKDeviceAttribute.h +++ b/inc/hgl/graph/VKDeviceAttribute.h @@ -11,10 +11,10 @@ VK_NAMESPACE_BEGIN constexpr uint32_t ERROR_FAMILY_INDEX=UINT32_MAX; -struct VkDevAttr +struct VulkanDevAttr { VulkanInstance * instance =nullptr; - const GPUPhysicalDevice * physical_device =nullptr; + const VulkanPhyDevice * physical_device =nullptr; VkPhysicalDeviceDriverPropertiesKHR driver_properties; @@ -55,8 +55,8 @@ struct VkDevAttr public: - VkDevAttr(VulkanInstance *inst,const GPUPhysicalDevice *pd,VkSurfaceKHR s); - ~VkDevAttr(); + VulkanDevAttr(VulkanInstance *inst,const VulkanPhyDevice *pd,VkSurfaceKHR s); + ~VulkanDevAttr(); int GetMemoryType(uint32_t typeBits,VkMemoryPropertyFlags properties) const; @@ -75,5 +75,5 @@ public: { return instance->GetDeviceProc(device,name); } -};//class VkDevAttr +};//class VulkanDevAttr VK_NAMESPACE_END diff --git a/inc/hgl/graph/VKDeviceCreater.h b/inc/hgl/graph/VKDeviceCreater.h index 07ed0511..357e0979 100644 --- a/inc/hgl/graph/VKDeviceCreater.h +++ b/inc/hgl/graph/VKDeviceCreater.h @@ -238,7 +238,7 @@ protected: VulkanInstance *instance; Window *window; - const GPUPhysicalDevice *physical_device; + const VulkanPhyDevice *physical_device; VulkanHardwareRequirement require; @@ -274,14 +274,14 @@ public: virtual void ChooseSurfaceFormat(); - virtual GPUDevice *CreateRenderDevice(); + virtual VulkanDevice *CreateRenderDevice(); public: - virtual GPUDevice *Create(); + virtual VulkanDevice *Create(); };//class VulkanDeviceCreater -inline GPUDevice *CreateRenderDevice( VulkanInstance *vi, +inline VulkanDevice *CreateRenderDevice( VulkanInstance *vi, Window *win, const VulkanHardwareRequirement *req=nullptr, const PreferFormats * spf_color =&PreferSDR, @@ -293,35 +293,35 @@ inline GPUDevice *CreateRenderDevice( VulkanInstance *vi, return vdc.Create(); } -inline GPUDevice *CreateRenderDeviceLDR(VulkanInstance *vi, +inline VulkanDevice *CreateRenderDeviceLDR(VulkanInstance *vi, Window *win, const VulkanHardwareRequirement *req=nullptr) { return CreateRenderDevice(vi,win,req,&PreferLDR,&PreferNonlinear,&PreferDepth); } -inline GPUDevice *CreateRenderDeviceSDR(VulkanInstance *vi, +inline VulkanDevice *CreateRenderDeviceSDR(VulkanInstance *vi, Window *win, const VulkanHardwareRequirement *req=nullptr) { return CreateRenderDevice(vi,win,req,&PreferSDR,&PreferNonlinear,&PreferDepth); } -inline GPUDevice *CreateRenderDeviceHDR16( VulkanInstance *vi, +inline VulkanDevice *CreateRenderDeviceHDR16( VulkanInstance *vi, Window *win, const VulkanHardwareRequirement *req=nullptr) { return CreateRenderDevice(vi,win,req,&PreferHDR16,&PreferLinear,&PreferDepth); } -inline GPUDevice *CreateRenderDeviceHDR32( VulkanInstance *vi, +inline VulkanDevice *CreateRenderDeviceHDR32( VulkanInstance *vi, Window *win, const VulkanHardwareRequirement *req=nullptr) { return CreateRenderDevice(vi,win,req,&PreferHDR32,&PreferLinear,&PreferDepth); } -inline GPUDevice *CreateRenderDeviceHDR(VulkanInstance *vi, +inline VulkanDevice *CreateRenderDeviceHDR(VulkanInstance *vi, Window *win, const VulkanHardwareRequirement *req=nullptr) { diff --git a/inc/hgl/graph/VKDynamicBufferAccess.h b/inc/hgl/graph/VKDynamicBufferAccess.h index 44a4e22c..b7e25344 100644 --- a/inc/hgl/graph/VKDynamicBufferAccess.h +++ b/inc/hgl/graph/VKDynamicBufferAccess.h @@ -37,7 +37,7 @@ private: index=0; } - friend class GPUArrayBuffer; + friend class VulkanArrayBuffer; public: diff --git a/inc/hgl/graph/VKFence.h b/inc/hgl/graph/VKFence.h index d9d9e923..d287f4bb 100644 --- a/inc/hgl/graph/VKFence.h +++ b/inc/hgl/graph/VKFence.h @@ -10,7 +10,7 @@ class Fence private: - friend class GPUDevice; + friend class VulkanDevice; Fence(VkDevice d,VkFence f) { diff --git a/inc/hgl/graph/VKIndexBuffer.h b/inc/hgl/graph/VKIndexBuffer.h index b82d1976..aabb2998 100644 --- a/inc/hgl/graph/VKIndexBuffer.h +++ b/inc/hgl/graph/VKIndexBuffer.h @@ -12,7 +12,7 @@ class IndexBuffer:public DeviceBuffer private: - friend class GPUDevice; + friend class VulkanDevice; IndexBuffer(VkDevice d,const DeviceBufferData &vb,IndexType it,uint32_t _count):DeviceBuffer(d,vb) { diff --git a/inc/hgl/graph/VKIndirectCommandBuffer.h b/inc/hgl/graph/VKIndirectCommandBuffer.h index 6d5f107d..4c3e78b0 100644 --- a/inc/hgl/graph/VKIndirectCommandBuffer.h +++ b/inc/hgl/graph/VKIndirectCommandBuffer.h @@ -19,7 +19,7 @@ public: private: - friend class GPUDevice; + friend class VulkanDevice; IndirectCommandBuffer(VkDevice d,const DeviceBufferData &vb,const uint32_t mc):DeviceBuffer(d,vb) { @@ -46,7 +46,7 @@ public: class IndirectDrawBuffer:public IndirectCommandBuffer { - friend class GPUDevice; + friend class VulkanDevice; public: @@ -64,7 +64,7 @@ public: class IndirectDrawIndexedBuffer:public IndirectCommandBuffer { - friend class GPUDevice; + friend class VulkanDevice; public: @@ -82,7 +82,7 @@ public: class IndirectDispatchBuffer:public IndirectCommandBuffer { - friend class GPUDevice; + friend class VulkanDevice; public: diff --git a/inc/hgl/graph/VKInstance.h b/inc/hgl/graph/VKInstance.h index 2507324a..828b92f4 100644 --- a/inc/hgl/graph/VKInstance.h +++ b/inc/hgl/graph/VKInstance.h @@ -62,7 +62,7 @@ VK_NAMESPACE_BEGIN VKDebugOut *debug_out; - ObjectList physical_devices; + ObjectList physical_devices; private: @@ -80,8 +80,8 @@ VK_NAMESPACE_BEGIN operator VkInstance (){return inst;} - const ObjectList &GetDeviceList ()const {return physical_devices;} - const GPUPhysicalDevice * GetDevice (VkPhysicalDeviceType)const; + const ObjectList &GetDeviceList ()const {return physical_devices;} + const VulkanPhyDevice * GetDevice (VkPhysicalDeviceType)const; template T *GetInstanceProc(const char *name) diff --git a/inc/hgl/graph/VKMemory.h b/inc/hgl/graph/VKMemory.h index c2259951..31a24b7a 100644 --- a/inc/hgl/graph/VKMemory.h +++ b/inc/hgl/graph/VKMemory.h @@ -16,7 +16,7 @@ class DeviceMemory private: - friend class GPUDevice; + friend class VulkanDevice; DeviceMemory(VkDevice dev,VkDeviceMemory dm,const VkMemoryRequirements &mr,const uint32 i,const uint32_t p,const VkDeviceSize cas); diff --git a/inc/hgl/graph/VKMemoryAllocator.h b/inc/hgl/graph/VKMemoryAllocator.h index cb768015..a501b833 100644 --- a/inc/hgl/graph/VKMemoryAllocator.h +++ b/inc/hgl/graph/VKMemoryAllocator.h @@ -7,7 +7,7 @@ VK_NAMESPACE_BEGIN class VKMemoryAllocator:public AbstractMemoryAllocator { - GPUDevice *device; + VulkanDevice *device; uint32_t buffer_usage_flag_bits; @@ -29,7 +29,7 @@ public: public: - VKMemoryAllocator(GPUDevice *,const uint32_t flags,const VkDeviceSize r); + VKMemoryAllocator(VulkanDevice *,const uint32_t flags,const VkDeviceSize r); ~VKMemoryAllocator(); void Free() override {/* DON'T RUN ANY OPERATION.*/} diff --git a/inc/hgl/graph/VKPhysicalDevice.h b/inc/hgl/graph/VKPhysicalDevice.h index 54c51d7d..f3244ca6 100644 --- a/inc/hgl/graph/VKPhysicalDevice.h +++ b/inc/hgl/graph/VKPhysicalDevice.h @@ -5,7 +5,7 @@ #include VK_NAMESPACE_BEGIN -class GPUPhysicalDevice +class VulkanPhyDevice { VkInstance instance=nullptr; VkPhysicalDevice physical_device=nullptr; @@ -23,9 +23,9 @@ class GPUPhysicalDevice VkPhysicalDeviceVulkan14Properties properties14; VkPhysicalDeviceMemoryProperties memory_properties; - ArrayList layer_properties; - ArrayList extension_properties; - ArrayList queue_family_properties; + ArrayList layer_properties; + ArrayList extension_properties; + ArrayList queue_family_properties; private: @@ -46,8 +46,8 @@ public: public: - GPUPhysicalDevice(VkInstance,VkPhysicalDevice); - ~GPUPhysicalDevice()=default; + VulkanPhyDevice(VkInstance,VkPhysicalDevice); + ~VulkanPhyDevice()=default; operator VkPhysicalDevice() {return physical_device;} operator const VkPhysicalDevice()const {return physical_device;} @@ -207,5 +207,5 @@ public: } const bool SupportDynamicState() const {return dynamic_state;} -};//class GPUPhysicalDevice +};//class VulkanPhyDevice VK_NAMESPACE_END diff --git a/inc/hgl/graph/VKQueue.h b/inc/hgl/graph/VKQueue.h index d32ef5d6..52732c04 100644 --- a/inc/hgl/graph/VKQueue.h +++ b/inc/hgl/graph/VKQueue.h @@ -19,7 +19,7 @@ protected: private: - friend class GPUDevice; + friend class VulkanDevice; DeviceQueue(VkDevice dev,VkQueue q,Fence **,const uint32_t fc); @@ -42,7 +42,7 @@ public: bool WaitFence(const bool wait_all=true,const uint64_t time_out=HGL_NANO_SEC_PER_SEC); bool Submit(const VkCommandBuffer *cmd_buf,const uint32_t count,Semaphore *wait_sem,Semaphore *complete_sem); - bool Submit(GPUCmdBuffer *cmd_buf,Semaphore *wait_sem,Semaphore *complete_sem); + bool Submit(VulkanCmdBuffer *cmd_buf,Semaphore *wait_sem,Semaphore *complete_sem); };//class DeviceQueue VK_NAMESPACE_END #endif//HGL_GRAPH_VULKAN_SUBMIT_QUEUE_INCLUDE diff --git a/inc/hgl/graph/VKRenderContext.h b/inc/hgl/graph/VKRenderContext.h index d417d9f7..c19f00cd 100644 --- a/inc/hgl/graph/VKRenderContext.h +++ b/inc/hgl/graph/VKRenderContext.h @@ -11,13 +11,13 @@ class RenderContext { protected: - GPUDevice *device; + VulkanDevice *device; VkExtent2D extent; public: - RenderContext(GPUDevice *,const VkExtent2D &); + RenderContext(VulkanDevice *,const VkExtent2D &); virtual ~RenderContext(); void Prepare( diff --git a/inc/hgl/graph/VKRenderResource.h b/inc/hgl/graph/VKRenderResource.h index 17294479..5863b7cc 100644 --- a/inc/hgl/graph/VKRenderResource.h +++ b/inc/hgl/graph/VKRenderResource.h @@ -43,7 +43,7 @@ constexpr const size_t VK_SHADER_STAGE_TYPE_COUNT=20;//GetBitOffset((uint32_t)VK */ class RenderResource { - GPUDevice *device; + VulkanDevice *device; ShaderModuleMapByName shader_module_by_name[VK_SHADER_STAGE_TYPE_COUNT]; Map material_by_name; @@ -75,7 +75,7 @@ private: public: - GPUDevice *GetDevice(){return device;} + VulkanDevice *GetDevice(){return device;} //注：并非一定要走这里，这里只是提供一个注册和自动绑定的机制 DescriptorBinding static_descriptor; ///<静态属性描述符绑定管理 @@ -83,7 +83,7 @@ public: public: - RenderResource(GPUDevice *dev):device(dev), + RenderResource(VulkanDevice *dev):device(dev), static_descriptor(DescriptorSetType::Static), global_descriptor(DescriptorSetType::Global) {} diff --git a/inc/hgl/graph/VKRenderTarget.h b/inc/hgl/graph/VKRenderTarget.h index 01d0560b..7c3fc6d9 100644 --- a/inc/hgl/graph/VKRenderTarget.h +++ b/inc/hgl/graph/VKRenderTarget.h @@ -29,7 +29,7 @@ class IRenderTarget public: RenderFramework * GetRenderFramework ()const{return render_framework;} - GPUDevice * GetDevice ()const; + VulkanDevice * GetDevice ()const; VkDevice GetVkDevice ()const; DescriptorBinding * GetDescriptorBinding(){return &desc_binding;} diff --git a/inc/hgl/graph/VKSampler.h b/inc/hgl/graph/VKSampler.h index c7175175..b5f53edb 100644 --- a/inc/hgl/graph/VKSampler.h +++ b/inc/hgl/graph/VKSampler.h @@ -12,7 +12,7 @@ class Sampler protected: - friend class GPUDevice; + friend class VulkanDevice; Sampler(VkDevice dev,VkSampler s) { diff --git a/inc/hgl/graph/VKSemaphore.h b/inc/hgl/graph/VKSemaphore.h index ea6f9d91..6f35b9a3 100644 --- a/inc/hgl/graph/VKSemaphore.h +++ b/inc/hgl/graph/VKSemaphore.h @@ -10,7 +10,7 @@ class Semaphore private: - friend class GPUDevice; + friend class VulkanDevice; Semaphore(VkDevice d,VkSemaphore s) { diff --git a/inc/hgl/graph/VKTextureLoader.h b/inc/hgl/graph/VKTextureLoader.h index 6bf40b8a..72bbd7aa 100644 --- a/inc/hgl/graph/VKTextureLoader.h +++ b/inc/hgl/graph/VKTextureLoader.h @@ -9,7 +9,7 @@ class VkTextureLoader:public L { protected: - GPUDevice *device; + VulkanDevice *device; GPUBuffer *buf; T *tex; @@ -18,7 +18,7 @@ protected: public: - VkTextureLoader(GPUDevice *dev,const bool am) + VkTextureLoader(VulkanDevice *dev,const bool am) { device =dev; buf =nullptr; diff --git a/inc/hgl/graph/VKVertexAttribBuffer.h b/inc/hgl/graph/VKVertexAttribBuffer.h index bfc470ae..fa0120c1 100644 --- a/inc/hgl/graph/VKVertexAttribBuffer.h +++ b/inc/hgl/graph/VKVertexAttribBuffer.h @@ -12,7 +12,7 @@ class VertexAttribBuffer:public DeviceBuffer private: - friend class GPUDevice; + friend class VulkanDevice; VertexAttribBuffer(VkDevice d,const DeviceBufferData &vb,VkFormat fmt,uint32_t _stride,uint32_t _count):DeviceBuffer(d,vb) { diff --git a/inc/hgl/graph/VertexDataManager.h b/inc/hgl/graph/VertexDataManager.h index 3fa335d3..6fa6f7ad 100644 --- a/inc/hgl/graph/VertexDataManager.h +++ b/inc/hgl/graph/VertexDataManager.h @@ -8,7 +8,7 @@ VK_NAMESPACE_BEGIN class VertexDataManager { - GPUDevice *device; + VulkanDevice *device; protected: @@ -30,10 +30,10 @@ protected: public: - VertexDataManager(GPUDevice *dev,const VIL *_vil); + VertexDataManager(VulkanDevice *dev,const VIL *_vil); ~VertexDataManager(); - GPUDevice * GetDevice ()const{return device;} ///<取得GPU设备 + VulkanDevice * GetDevice ()const{return device;} ///<取得GPU设备 const VIL * GetVIL ()const{return vil;} ///<取得顶点输入格式列表 diff --git a/inc/hgl/graph/font/TextPrimitive.h b/inc/hgl/graph/font/TextPrimitive.h index 38faceec..b694dd48 100644 --- a/inc/hgl/graph/font/TextPrimitive.h +++ b/inc/hgl/graph/font/TextPrimitive.h @@ -11,7 +11,7 @@ namespace hgl */ class TextPrimitive:public Primitive { - GPUDevice * device; + VulkanDevice * device; Material * mtl; uint max_count; ///<缓冲区最大容量 @@ -36,7 +36,7 @@ namespace hgl public: - TextPrimitive(GPUDevice *,Material *,uint mc=1024); + TextPrimitive(VulkanDevice *,Material *,uint mc=1024); public: diff --git a/inc/hgl/graph/font/TextRender.h b/inc/hgl/graph/font/TextRender.h index 6322f7ba..0677474e 100644 --- a/inc/hgl/graph/font/TextRender.h +++ b/inc/hgl/graph/font/TextRender.h @@ -15,7 +15,7 @@ namespace hgl class TextRender { - GPUDevice * device; + VulkanDevice * device; RenderResource * db; Material * material; @@ -37,8 +37,8 @@ namespace hgl private: - friend TextRender *CreateTextRender(GPUDevice *,FontSource *,RenderPass *,DeviceBuffer *,int limit=-1); - TextRender(GPUDevice *dev,FontSource *); + friend TextRender *CreateTextRender(VulkanDevice *,FontSource *,RenderPass *,DeviceBuffer *,int limit=-1); + TextRender(VulkanDevice *dev,FontSource *); bool InitTileFont(int limit); bool InitTextLayoutEngine(); @@ -82,7 +82,7 @@ namespace hgl * 创建一个文本渲染器 * @param limit 节数限制(-1表示自动) */ - TextRender *CreateTextRender(GPUDevice *,FontSource *,RenderPass *,DeviceBuffer *,int limit); + TextRender *CreateTextRender(VulkanDevice *,FontSource *,RenderPass *,DeviceBuffer *,int limit); }//namespace graph }//namespace hgl #endif//HGL_GRAPH_TEXT_RENDER_INCLUDE diff --git a/inc/hgl/graph/module/GraphModule.h b/inc/hgl/graph/module/GraphModule.h index 701c4be4..e0ef0c66 100644 --- a/inc/hgl/graph/module/GraphModule.h +++ b/inc/hgl/graph/module/GraphModule.h @@ -16,10 +16,10 @@ class GraphModule public: RenderFramework * GetRenderFramework ()const{return render_framework;} ///<取得渲染框架 - GPUDevice * GetDevice (); ///<取得GPU设备 + VulkanDevice * GetDevice (); ///<取得GPU设备 VkDevice GetVkDevice ()const; ///<取得VkDevice - const GPUPhysicalDevice * GetPhysicalDevice ()const; ///<取得物理设备 - VkDevAttr *GetDeviceAttribute ()const; ///<取得设备属性 + const VulkanPhyDevice * GetPhyDevice ()const; ///<取得物理设备 + VulkanDevAttr *GetDevAttr ()const; ///<取得设备属性 VkPipelineCache GetPipelineCache ()const; ///<取得PipelineCache public: diff --git a/inc/hgl/graph/module/GraphModuleManager.h b/inc/hgl/graph/module/GraphModuleManager.h index 1a54bd9d..be5fba6e 100644 --- a/inc/hgl/graph/module/GraphModuleManager.h +++ b/inc/hgl/graph/module/GraphModuleManager.h @@ -23,7 +23,7 @@ public: public: RenderFramework * GetRenderFramework ()const{return render_framework;} ///<取得渲染框架 - GPUDevice * GetDevice ()const; ///<取得GPU设备 + VulkanDevice * GetDevice ()const; ///<取得GPU设备 public: diff --git a/inc/hgl/graph/module/RenderModule.h b/inc/hgl/graph/module/RenderModule.h index 8b32e53a..fb6a1dc3 100644 --- a/inc/hgl/graph/module/RenderModule.h +++ b/inc/hgl/graph/module/RenderModule.h @@ -22,6 +22,6 @@ public: #define RENDER_MODULE_CLASS(class_name) class class_name:public GraphModuleInherit -#define RENDER_MODULE_CONSTRUCT(class_name) class_name::class_name(GPUDevice *dev):GraphModuleInherit(dev,#class_name) +#define RENDER_MODULE_CONSTRUCT(class_name) class_name::class_name(VulkanDevice *dev):GraphModuleInherit(dev,#class_name) VK_NAMESPACE_END diff --git a/inc/hgl/graph/mtl/Material2DCreateConfig.h b/inc/hgl/graph/mtl/Material2DCreateConfig.h index 50c777ff..7b6d3221 100644 --- a/inc/hgl/graph/mtl/Material2DCreateConfig.h +++ b/inc/hgl/graph/mtl/Material2DCreateConfig.h @@ -52,13 +52,13 @@ public: DEFINE_MATERIAL_FACTORY_CLASS(VertexColor2D,CreateVertexColor2D,const Material2DCreateConfig) -MaterialCreateInfo *CreatePureColor2D(const VkDevAttr *dev_attr,const Material2DCreateConfig *); +MaterialCreateInfo *CreatePureColor2D(const VulkanDevAttr *dev_attr,const Material2DCreateConfig *); -MaterialCreateInfo *CreateLerpLine2D(const VkDevAttr *dev_attr,const Material2DCreateConfig *); +MaterialCreateInfo *CreateLerpLine2D(const VulkanDevAttr *dev_attr,const Material2DCreateConfig *); -MaterialCreateInfo *CreatePureTexture2D(const VkDevAttr *dev_attr,const Material2DCreateConfig *); -MaterialCreateInfo *CreateRectTexture2D(const VkDevAttr *dev_attr,Material2DCreateConfig *); -MaterialCreateInfo *CreateRectTexture2DArray(const VkDevAttr *dev_attr,Material2DCreateConfig *); +MaterialCreateInfo *CreatePureTexture2D(const VulkanDevAttr *dev_attr,const Material2DCreateConfig *); +MaterialCreateInfo *CreateRectTexture2D(const VulkanDevAttr *dev_attr,Material2DCreateConfig *); +MaterialCreateInfo *CreateRectTexture2DArray(const VulkanDevAttr *dev_attr,Material2DCreateConfig *); // 为什么有了LoadMaterialFromFile，还需要保留以上Create系列函数？ @@ -72,6 +72,6 @@ MaterialCreateInfo *CreateRectTexture2DArray(const VkDevAttr *dev_attr,Material2 * @param cfg 材质创建参数 * @return 材质创建信息 */ -MaterialCreateInfo *LoadMaterialFromFile(const VkDevAttr *dev_attr,const AnsiString &mtl_name,Material2DCreateConfig *cfg); ///<从文件加载材质 +MaterialCreateInfo *LoadMaterialFromFile(const VulkanDevAttr *dev_attr,const AnsiString &mtl_name,Material2DCreateConfig *cfg); ///<从文件加载材质 STD_MTL_NAMESPACE_END diff --git a/inc/hgl/graph/mtl/Material3DCreateConfig.h b/inc/hgl/graph/mtl/Material3DCreateConfig.h index 33458591..5c406997 100644 --- a/inc/hgl/graph/mtl/Material3DCreateConfig.h +++ b/inc/hgl/graph/mtl/Material3DCreateConfig.h @@ -50,10 +50,10 @@ public: } };//struct Material3DCreateConfig:public MaterialCreateConfig -MaterialCreateInfo *CreateVertexColor3D(const VkDevAttr *dev_attr,const Material3DCreateConfig *); -MaterialCreateInfo *CreateVertexLuminance3D(const VkDevAttr *dev_attr,const Material3DCreateConfig *); +MaterialCreateInfo *CreateVertexColor3D(const VulkanDevAttr *dev_attr,const Material3DCreateConfig *); +MaterialCreateInfo *CreateVertexLuminance3D(const VulkanDevAttr *dev_attr,const Material3DCreateConfig *); -MaterialCreateInfo *CreateMaterialGizmo3D(const VkDevAttr *dev_attr,const Material3DCreateConfig *cfg); +MaterialCreateInfo *CreateMaterialGizmo3D(const VulkanDevAttr *dev_attr,const Material3DCreateConfig *cfg); struct BillboardMaterialCreateConfig:public Material3DCreateConfig { @@ -66,7 +66,7 @@ public: using Material3DCreateConfig::Material3DCreateConfig; }; -MaterialCreateInfo *CreateBillboard2D(const VkDevAttr *dev_attr,mtl::BillboardMaterialCreateConfig *); +MaterialCreateInfo *CreateBillboard2D(const VulkanDevAttr *dev_attr,mtl::BillboardMaterialCreateConfig *); /** * 从文件加载材质 @@ -74,5 +74,5 @@ MaterialCreateInfo *CreateBillboard2D(const VkDevAttr *dev_attr,mtl::BillboardMa * @param cfg 材质创建参数 * @return 材质创建信息 */ -MaterialCreateInfo *LoadMaterialFromFile(const VkDevAttr *dev_attr,const AnsiString &name,Material3DCreateConfig *cfg); +MaterialCreateInfo *LoadMaterialFromFile(const VulkanDevAttr *dev_attr,const AnsiString &name,Material3DCreateConfig *cfg); STD_MTL_NAMESPACE_END diff --git a/inc/hgl/graph/mtl/MaterialLibrary.h b/inc/hgl/graph/mtl/MaterialLibrary.h index b69161d6..04654fc3 100644 --- a/inc/hgl/graph/mtl/MaterialLibrary.h +++ b/inc/hgl/graph/mtl/MaterialLibrary.h @@ -27,7 +27,7 @@ public: //virtual const CoordinateSystem2D get2DCoordinateSystem()const=0; - virtual MaterialCreateInfo *Create(const VkDevAttr *dev_attr,MaterialCreateConfig *)=0; + virtual MaterialCreateInfo *Create(const VulkanDevAttr *dev_attr,MaterialCreateConfig *)=0; };//class MaterialFactory @@ -45,7 +45,7 @@ public: };//class RegistryMaterialFactoryClass #define DEFINE_MATERIAL_FACTORY_CLASS(name,create_func,cfg_type) \ -MaterialCreateInfo *Create##name(const VkDevAttr *dev_attr,cfg_type *); \ +MaterialCreateInfo *Create##name(const VulkanDevAttr *dev_attr,cfg_type *); \ \ namespace \ { \ @@ -59,7 +59,7 @@ namespace \ return mtl_name; \ } \ \ - MaterialCreateInfo *Create(const VkDevAttr *dev_attr,MaterialCreateConfig *cfg) override \ + MaterialCreateInfo *Create(const VulkanDevAttr *dev_attr,MaterialCreateConfig *cfg) override \ { \ return create_func(dev_attr,(cfg_type *)cfg); \ } \ @@ -68,16 +68,16 @@ namespace \ static RegistryMaterialFactoryClass MaterialFactoryInstance_##name; \ } -MaterialCreateInfo *CreateMaterialCreateInfo(const VkDevAttr *dev_attr,const MaterialName &,MaterialCreateConfig *cfg); +MaterialCreateInfo *CreateMaterialCreateInfo(const VulkanDevAttr *dev_attr,const MaterialName &,MaterialCreateConfig *cfg); -inline MaterialCreateInfo *CreateMaterialCreateInfo(const VkDevAttr *dev_attr,const char *mtl_name,MaterialCreateConfig *cfg) +inline MaterialCreateInfo *CreateMaterialCreateInfo(const VulkanDevAttr *dev_attr,const char *mtl_name,MaterialCreateConfig *cfg) { MaterialName mtl_id_name(mtl_name); return CreateMaterialCreateInfo(dev_attr,mtl_id_name,cfg); } -inline MaterialCreateInfo *CreateMaterialCreateInfo(const VkDevAttr *dev_attr,const AnsiString &mtl_name,MaterialCreateConfig *cfg) +inline MaterialCreateInfo *CreateMaterialCreateInfo(const VulkanDevAttr *dev_attr,const AnsiString &mtl_name,MaterialCreateConfig *cfg) { MaterialName mtl_id_name(mtl_name); diff --git a/inc/hgl/graph/mtl/StdMaterial.h b/inc/hgl/graph/mtl/StdMaterial.h index b3514454..9e25f979 100644 --- a/inc/hgl/graph/mtl/StdMaterial.h +++ b/inc/hgl/graph/mtl/StdMaterial.h @@ -19,7 +19,7 @@ namespace hgl::graph class ShaderCreateInfoVertex; class ShaderCreateInfoGeometry; class ShaderCreateInfoFragment; - struct VkDevAttr; + struct VulkanDevAttr; namespace mtl { @@ -51,7 +51,7 @@ namespace hgl::graph StdMaterial(const MaterialCreateConfig *); virtual ~StdMaterial()=default; - virtual MaterialCreateInfo *Create(const VkDevAttr *dev_attr); + virtual MaterialCreateInfo *Create(const VulkanDevAttr *dev_attr); };//class StdMaterial }//namespace mtl }//namespace hgl::graph diff --git a/inc/hgl/gui/ThemeEngine.h b/inc/hgl/gui/ThemeEngine.h index 4a7c92f6..a3c2da1b 100644 --- a/inc/hgl/gui/ThemeEngine.h +++ b/inc/hgl/gui/ThemeEngine.h @@ -10,7 +10,7 @@ namespace hgl { namespace vulkan { - class GPUDevice; + class VulkanDevice; }//namespace vulkan constexpr VkFormat DefaultRenderTargetFormat=UPF_ABGR8; ///<缺省窗体绘图表面格式 @@ -19,7 +19,7 @@ namespace hgl { protected: - GPUDevice *device; + VulkanDevice *device; ObjectMap
form_list; @@ -33,7 +33,7 @@ namespace hgl public: - ThemeEngine(GPUDevice *dev){device=dev;} + ThemeEngine(VulkanDevice *dev){device=dev;} virtual ~ThemeEngine()=default; virtual bool Init()=0; @@ -49,4 +49,4 @@ namespace hgl ThemeEngine *GetDefaultThemeEngine(); ///<获取缺省主题引擎 }//namespace gui }//namespace hgl -#endif//HGL_GUI_THEME_ENGINE_INCLUDE \ No newline at end of file +#endif//HGL_GUI_THEME_ENGINE_INCLUDE diff --git a/inc/hgl/shadergen/MaterialCreateInfo.h b/inc/hgl/shadergen/MaterialCreateInfo.h index 0b883d26..e8cb50fb 100644 --- a/inc/hgl/shadergen/MaterialCreateInfo.h +++ b/inc/hgl/shadergen/MaterialCreateInfo.h @@ -12,7 +12,7 @@ namespace hgl::graph { - struct VkDevAttr; + struct VulkanDevAttr; struct UBODescriptor; namespace mtl @@ -89,7 +89,7 @@ namespace hgl::graph bool AddSampler(const VkShaderStageFlagBits flag_bits,const DescriptorSetType set_type,const SamplerType &st,const AnsiString &name); - bool CreateShader(const VkDevAttr *dev_attr); + bool CreateShader(const VulkanDevAttr *dev_attr); };//class MaterialCreateInfo }//namespace mtl }//namespace hgl::graph diff --git a/src/GUI/DefaultThemeEngine.cpp b/src/GUI/DefaultThemeEngine.cpp index defe85e4..2083aa9f 100644 --- a/src/GUI/DefaultThemeEngine.cpp +++ b/src/GUI/DefaultThemeEngine.cpp @@ -4,7 +4,7 @@ namespace hgl { namespace gui { - ThemeEngine *CreateDefaultThemeEngine(GPUDevice *dev) + ThemeEngine *CreateDefaultThemeEngine(VulkanDevice *dev) { return(new DefaultThemeEngine(dev)); } diff --git a/src/GUI/ThemeEngine.cpp b/src/GUI/ThemeEngine.cpp index 4a8918cd..cfeecb34 100644 --- a/src/GUI/ThemeEngine.cpp +++ b/src/GUI/ThemeEngine.cpp @@ -12,9 +12,9 @@ namespace hgl ThemeEngine *default_theme_engine=nullptr; }//namespace - ThemeEngine *CreateDefaultThemeEngine(GPUDevice *dev); + ThemeEngine *CreateDefaultThemeEngine(VulkanDevice *dev); - ThemeEngine *GetDefaultThemeEngine(GPUDevice *dev) + ThemeEngine *GetDefaultThemeEngine(VulkanDevice *dev) { if(!default_theme_engine) default_theme_engine=CreateDefaultThemeEngine(dev); @@ -22,7 +22,7 @@ namespace hgl return default_theme_engine; } - ThemeEngine *CreateThemeEngine(GPUDevice *dev) + ThemeEngine *CreateThemeEngine(VulkanDevice *dev) { return GetDefaultThemeEngine(); } @@ -131,4 +131,4 @@ namespace hgl return Render(tf); } }//namespace gui -}//namespace hgl \ No newline at end of file +}//namespace hgl diff --git a/src/SceneGraph/PrimitiveCreater.cpp b/src/SceneGraph/PrimitiveCreater.cpp index 75d3347f..f739994e 100644 --- a/src/SceneGraph/PrimitiveCreater.cpp +++ b/src/SceneGraph/PrimitiveCreater.cpp @@ -7,7 +7,7 @@ #include"vulkan/VKPrimitiveData.h" VK_NAMESPACE_BEGIN -PrimitiveCreater::PrimitiveCreater(GPUDevice *dev,const VIL *v) +PrimitiveCreater::PrimitiveCreater(VulkanDevice *dev,const VIL *v) { device =dev; vdm =nullptr; diff --git a/src/SceneGraph/VertexDataManager.cpp b/src/SceneGraph/VertexDataManager.cpp index 523a8d0f..470561a9 100644 --- a/src/SceneGraph/VertexDataManager.cpp +++ b/src/SceneGraph/VertexDataManager.cpp @@ -8,7 +8,7 @@ namespace hgl { namespace graph { - VertexDataManager::VertexDataManager(GPUDevice *dev,const VIL *_vil) + VertexDataManager::VertexDataManager(VulkanDevice *dev,const VIL *_vil) { device=dev; diff --git a/src/SceneGraph/Vulkan/Debug/VKPhysicalDeviceCapsOutput.cpp b/src/SceneGraph/Vulkan/Debug/VKPhysicalDeviceCapsOutput.cpp index 1482de00..f6c85d6e 100644 --- a/src/SceneGraph/Vulkan/Debug/VKPhysicalDeviceCapsOutput.cpp +++ b/src/SceneGraph/Vulkan/Debug/VKPhysicalDeviceCapsOutput.cpp @@ -399,7 +399,7 @@ namespace } }//namespace -void OutputPhysicalDeviceCaps(const GPUPhysicalDevice *pd) +void OutputPhysicalDeviceCaps(const VulkanPhyDevice *pd) { const VkPhysicalDeviceProperties &pdp=pd->GetProperties(); diff --git a/src/SceneGraph/Vulkan/Texture/VKDeviceTexture2DArray.cpp b/src/SceneGraph/Vulkan/Texture/VKDeviceTexture2DArray.cpp index 895ca0eb..27a15709 100644 --- a/src/SceneGraph/Vulkan/Texture/VKDeviceTexture2DArray.cpp +++ b/src/SceneGraph/Vulkan/Texture/VKDeviceTexture2DArray.cpp @@ -114,7 +114,7 @@ Texture2DArray *TextureManager::CreateTexture2DArray(const uint32_t w,const uint } // -//bool GPUDevice::CommitTexture2DArray(Texture2DArray *tex,DeviceBuffer *buf,VkPipelineStageFlags destinationStage) +//bool VulkanDevice::CommitTexture2DArray(Texture2DArray *tex,DeviceBuffer *buf,VkPipelineStageFlags destinationStage) //{ // if(!tex||!buf)return(false); // @@ -123,7 +123,7 @@ Texture2DArray *TextureManager::CreateTexture2DArray(const uint32_t w,const uint // return CopyBufferToImageArray(tex,buf,&buffer_image_copy,destinationStage); //} // -//bool GPUDevice::CommitTexture2DArrayMipmaps(Texture2DArray *tex,DeviceBuffer *buf,const VkExtent3D &extent,uint32_t total_bytes) +//bool VulkanDevice::CommitTexture2DArrayMipmaps(Texture2DArray *tex,DeviceBuffer *buf,const VkExtent3D &extent,uint32_t total_bytes) //{ // if(!tex||!buf // ||extent.width*extent.height<=0) @@ -169,7 +169,7 @@ Texture2DArray *TextureManager::CreateTexture2DArray(const uint32_t w,const uint // return CopyBufferToImageArray(tex,buf,buffer_image_copy,miplevel,VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); //} // -//bool GPUDevice::ChangeTexture2DArray(Texture2DArray *tex,DeviceBuffer *buf,const ArrayList &ir_list,const uint32_t base_layer,const uint32_t layer_count,VkPipelineStageFlags destinationStage) +//bool VulkanDevice::ChangeTexture2DArray(Texture2DArray *tex,DeviceBuffer *buf,const ArrayList &ir_list,const uint32_t base_layer,const uint32_t layer_count,VkPipelineStageFlags destinationStage) //{ // if(!tex||!buf||ir_list.GetCount()<=0) // return(false); @@ -248,4 +248,4 @@ bool TextureManager::ChangeTexture2DArray(Texture2DArray *tex,const void *data,c delete buf; return(result); } -VK_NAMESPACE_END \ No newline at end of file +VK_NAMESPACE_END diff --git a/src/SceneGraph/Vulkan/Texture/VKDeviceTextureCube.cpp b/src/SceneGraph/Vulkan/Texture/VKDeviceTextureCube.cpp index 1fe7e112..c0d4d660 100644 --- a/src/SceneGraph/Vulkan/Texture/VKDeviceTextureCube.cpp +++ b/src/SceneGraph/Vulkan/Texture/VKDeviceTextureCube.cpp @@ -148,7 +148,7 @@ bool TextureManager::CommitTextureCubeMipmaps(TextureCube *tex,DeviceBuffer *buf return CopyBufferToImageCube(tex,buf,buffer_image_copy,miplevel,VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); } -//bool GPUDevice::ChangeTexture2D(Texture2D *tex,DeviceBuffer *buf,const ArrayList &ir_list,VkPipelineStageFlags destinationStage) +//bool VulkanDevice::ChangeTexture2D(Texture2D *tex,DeviceBuffer *buf,const ArrayList &ir_list,VkPipelineStageFlags destinationStage) //{ // if(!tex||!buf||ir_list.GetCount()<=0) // return(false); @@ -188,7 +188,7 @@ bool TextureManager::CommitTextureCubeMipmaps(TextureCube *tex,DeviceBuffer *buf // return result; //} // -//bool GPUDevice::ChangeTexture2D(Texture2D *tex,DeviceBuffer *buf,uint32_t left,uint32_t top,uint32_t width,uint32_t height,VkPipelineStageFlags destinationStage) +//bool VulkanDevice::ChangeTexture2D(Texture2D *tex,DeviceBuffer *buf,uint32_t left,uint32_t top,uint32_t width,uint32_t height,VkPipelineStageFlags destinationStage) //{ // if(!tex||!buf // ||left<0||left+width>tex->GetWidth() @@ -205,7 +205,7 @@ bool TextureManager::CommitTextureCubeMipmaps(TextureCube *tex,DeviceBuffer *buf // return result; //} // -//bool GPUDevice::ChangeTexture2D(Texture2D *tex,void *data,uint32_t left,uint32_t top,uint32_t width,uint32_t height,uint32_t size,VkPipelineStageFlags destinationStage) +//bool VulkanDevice::ChangeTexture2D(Texture2D *tex,void *data,uint32_t left,uint32_t top,uint32_t width,uint32_t height,uint32_t size,VkPipelineStageFlags destinationStage) //{ // if(!tex||!data // ||left<0||left+width>tex->GetWidth() @@ -221,4 +221,4 @@ bool TextureManager::CommitTextureCubeMipmaps(TextureCube *tex,DeviceBuffer *buf // delete buf; // return(result); //} -VK_NAMESPACE_END \ No newline at end of file +VK_NAMESPACE_END diff --git a/src/SceneGraph/Vulkan/VKArrayBuffer.cpp b/src/SceneGraph/Vulkan/VKArrayBuffer.cpp index e78d72c7..2a89b1f5 100644 --- a/src/SceneGraph/Vulkan/VKArrayBuffer.cpp +++ b/src/SceneGraph/Vulkan/VKArrayBuffer.cpp @@ -8,28 +8,28 @@ namespace hgl { namespace graph { - GPUArrayBuffer *GPUDevice::CreateArrayInUBO(const VkDeviceSize &item_length) + VulkanArrayBuffer *VulkanDevice::CreateArrayInUBO(const VkDeviceSize &item_length) { const uint align_size=hgl_align(item_length,GetUBOAlign()); auto vk_ma=new VKMemoryAllocator(this,VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,align_size); - return(new GPUArrayBuffer(vk_ma,align_size,GetUBORange())); + return(new VulkanArrayBuffer(vk_ma,align_size,GetUBORange())); } - GPUArrayBuffer *GPUDevice::CreateArrayInSSBO(const VkDeviceSize &item_length) + VulkanArrayBuffer *VulkanDevice::CreateArrayInSSBO(const VkDeviceSize &item_length) { const uint align_size=hgl_align(item_length,GetSSBOAlign()); auto vk_ma=new VKMemoryAllocator(this,VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,align_size); - return(new GPUArrayBuffer(vk_ma,align_size,GetSSBORange())); + return(new VulkanArrayBuffer(vk_ma,align_size,GetSSBORange())); } }//namespace graph namespace graph { - GPUArrayBuffer::GPUArrayBuffer(VKMemoryAllocator *va,const uint as,const uint rs) + VulkanArrayBuffer::VulkanArrayBuffer(VKMemoryAllocator *va,const uint as,const uint rs) { vk_ma=va; align_size=as; @@ -40,17 +40,17 @@ namespace hgl coll=new Collection(align_size,mb); } - GPUArrayBuffer::~GPUArrayBuffer() + VulkanArrayBuffer::~VulkanArrayBuffer() { delete coll; } - DeviceBuffer *GPUArrayBuffer::GetBuffer() + DeviceBuffer *VulkanArrayBuffer::GetBuffer() { return vk_ma->GetBuffer(); } - uint32 GPUArrayBuffer::Alloc(const uint32 max_count) ///<预分配空间 + uint32 VulkanArrayBuffer::Alloc(const uint32 max_count) ///<预分配空间 { if(!coll->Alloc(max_count)) return(0); @@ -58,17 +58,17 @@ namespace hgl return coll->GetAllocCount(); } - void GPUArrayBuffer::Clear() + void VulkanArrayBuffer::Clear() { coll->Clear(); } - void *GPUArrayBuffer::Map(const uint32 start,const uint32 count) + void *VulkanArrayBuffer::Map(const uint32 start,const uint32 count) { return coll->Map(start,count); } - void GPUArrayBuffer::Flush(const uint32 count) + void VulkanArrayBuffer::Flush(const uint32 count) { vk_ma->Flush(count*align_size); } diff --git a/src/SceneGraph/Vulkan/VKCommandBuffer.cpp b/src/SceneGraph/Vulkan/VKCommandBuffer.cpp index 57605d0b..fc28b189 100644 --- a/src/SceneGraph/Vulkan/VKCommandBuffer.cpp +++ b/src/SceneGraph/Vulkan/VKCommandBuffer.cpp @@ -2,7 +2,7 @@ #include VK_NAMESPACE_BEGIN -GPUCmdBuffer::GPUCmdBuffer(const VkDevAttr *attr,VkCommandBuffer cb) +VulkanCmdBuffer::VulkanCmdBuffer(const VulkanDevAttr *attr,VkCommandBuffer cb) { dev_attr=attr; cmd_buf=cb; @@ -10,12 +10,12 @@ GPUCmdBuffer::GPUCmdBuffer(const VkDevAttr *attr,VkCommandBuffer cb) cmd_begin=false; } -GPUCmdBuffer::~GPUCmdBuffer() +VulkanCmdBuffer::~VulkanCmdBuffer() { vkFreeCommandBuffers(dev_attr->device,dev_attr->cmd_pool,1,&cmd_buf); } -bool GPUCmdBuffer::Begin() +bool VulkanCmdBuffer::Begin() { CommandBufferBeginInfo cmd_buf_info; @@ -29,19 +29,19 @@ bool GPUCmdBuffer::Begin() } #ifdef _DEBUG -void GPUCmdBuffer::SetDebugName(const AnsiString &object_name) +void VulkanCmdBuffer::SetDebugName(const AnsiString &object_name) { if(dev_attr->debug_utils) dev_attr->debug_utils->SetCommandBuffer(cmd_buf,object_name); } -void GPUCmdBuffer::BeginRegion(const AnsiString ®ion_name,const Color4f &color) +void VulkanCmdBuffer::BeginRegion(const AnsiString ®ion_name,const Color4f &color) { if(dev_attr->debug_utils) dev_attr->debug_utils->CmdBegin(cmd_buf,region_name,color); } -void GPUCmdBuffer::EndRegion() +void VulkanCmdBuffer::EndRegion() { if(dev_attr->debug_utils) dev_attr->debug_utils->CmdEnd(cmd_buf); diff --git a/src/SceneGraph/Vulkan/VKCommandBufferRender.cpp b/src/SceneGraph/Vulkan/VKCommandBufferRender.cpp index dc838bef..c811e982 100644 --- a/src/SceneGraph/Vulkan/VKCommandBufferRender.cpp +++ b/src/SceneGraph/Vulkan/VKCommandBufferRender.cpp @@ -8,7 +8,7 @@ #include VK_NAMESPACE_BEGIN -RenderCmdBuffer::RenderCmdBuffer(const VkDevAttr *attr,VkCommandBuffer cb):GPUCmdBuffer(attr,cb) +RenderCmdBuffer::RenderCmdBuffer(const VulkanDevAttr *attr,VkCommandBuffer cb):VulkanCmdBuffer(attr,cb) { cv_count=0; clear_values=nullptr; diff --git a/src/SceneGraph/Vulkan/VKDevice.cpp b/src/SceneGraph/Vulkan/VKDevice.cpp index 1d442336..446813b0 100644 --- a/src/SceneGraph/Vulkan/VKDevice.cpp +++ b/src/SceneGraph/Vulkan/VKDevice.cpp @@ -3,17 +3,17 @@ #include VK_NAMESPACE_BEGIN -GPUDevice::GPUDevice(VkDevAttr *da) +VulkanDevice::VulkanDevice(VulkanDevAttr *da) { attr=da; } -GPUDevice::~GPUDevice() +VulkanDevice::~VulkanDevice() { delete attr; } -VkCommandBuffer GPUDevice::CreateCommandBuffer(const AnsiString &name) +VkCommandBuffer VulkanDevice::CreateCommandBuffer(const AnsiString &name) { if(!attr->cmd_pool) return(VK_NULL_HANDLE); @@ -39,7 +39,7 @@ VkCommandBuffer GPUDevice::CreateCommandBuffer(const AnsiString &name) return cmd_buf; } -RenderCmdBuffer *GPUDevice::CreateRenderCommandBuffer(const AnsiString &name) +RenderCmdBuffer *VulkanDevice::CreateRenderCommandBuffer(const AnsiString &name) { VkCommandBuffer cb=CreateCommandBuffer(name); @@ -48,7 +48,7 @@ RenderCmdBuffer *GPUDevice::CreateRenderCommandBuffer(const AnsiString &name) return(new RenderCmdBuffer(attr,cb)); } -TextureCmdBuffer *GPUDevice::CreateTextureCommandBuffer(const AnsiString &name) +TextureCmdBuffer *VulkanDevice::CreateTextureCommandBuffer(const AnsiString &name) { VkCommandBuffer cb=CreateCommandBuffer(name); @@ -61,7 +61,7 @@ TextureCmdBuffer *GPUDevice::CreateTextureCommandBuffer(const AnsiString &name) * 创建栅栏 * @param create_signaled 是否创建初始信号 */ -Fence *GPUDevice::CreateFence(bool create_signaled) +Fence *VulkanDevice::CreateFence(bool create_signaled) { FenceCreateInfo fenceInfo(create_signaled?VK_FENCE_CREATE_SIGNALED_BIT:0); @@ -73,7 +73,7 @@ Fence *GPUDevice::CreateFence(bool create_signaled) return(new Fence(attr->device,fence)); } -Semaphore *GPUDevice::CreateGPUSemaphore() +Semaphore *VulkanDevice::CreateGPUSemaphore() { SemaphoreCreateInfo SemaphoreCreateInfo; @@ -85,7 +85,7 @@ Semaphore *GPUDevice::CreateGPUSemaphore() return(new Semaphore(attr->device,sem)); } -DeviceQueue *GPUDevice::CreateQueue(const uint32_t fence_count,const bool create_signaled) +DeviceQueue *VulkanDevice::CreateQueue(const uint32_t fence_count,const bool create_signaled) { if(fence_count<=0)return(nullptr); diff --git a/src/SceneGraph/Vulkan/VKDeviceAttribute.cpp b/src/SceneGraph/Vulkan/VKDeviceAttribute.cpp index 305091b5..91c38d7d 100644 --- a/src/SceneGraph/Vulkan/VKDeviceAttribute.cpp +++ b/src/SceneGraph/Vulkan/VKDeviceAttribute.cpp @@ -7,7 +7,7 @@ VK_NAMESPACE_BEGIN void SavePipelineCacheData(VkDevice device,VkPipelineCache cache,const VkPhysicalDeviceProperties &pdp); -VkDevAttr::VkDevAttr(VulkanInstance *inst,const GPUPhysicalDevice *pd,VkSurfaceKHR s) +VulkanDevAttr::VulkanDevAttr(VulkanInstance *inst,const VulkanPhyDevice *pd,VkSurfaceKHR s) { instance=inst; physical_device=pd; @@ -18,7 +18,7 @@ VkDevAttr::VkDevAttr(VulkanInstance *inst,const GPUPhysicalDevice *pd,VkSurfaceK GetQueueFamily(); } -VkDevAttr::~VkDevAttr() +VulkanDevAttr::~VulkanDevAttr() { #ifdef _DEBUG if(debug_utils) @@ -44,12 +44,12 @@ VkDevAttr::~VkDevAttr() instance->DestroySurface(surface); } -int VkDevAttr::GetMemoryType(uint32_t typeBits,VkMemoryPropertyFlags properties) const +int VulkanDevAttr::GetMemoryType(uint32_t typeBits,VkMemoryPropertyFlags properties) const { return physical_device->GetMemoryType(typeBits,properties); } -void VkDevAttr::RefreshSurfaceCaps() +void VulkanDevAttr::RefreshSurfaceCaps() { VkPhysicalDevice pdevice = *physical_device; @@ -80,7 +80,7 @@ void VkDevAttr::RefreshSurfaceCaps() } } -void VkDevAttr::GetSurfacePresentMode() +void VulkanDevAttr::GetSurfacePresentMode() { uint32_t mode_count; @@ -95,7 +95,7 @@ void VkDevAttr::GetSurfacePresentMode() present_modes.Clear(); } -void VkDevAttr::GetQueueFamily() +void VulkanDevAttr::GetQueueFamily() { VkPhysicalDevice pdevice = *physical_device; diff --git a/src/SceneGraph/Vulkan/VKDeviceBuffer.cpp b/src/SceneGraph/Vulkan/VKDeviceBuffer.cpp index 88f1cbfe..5b5cfade 100644 --- a/src/SceneGraph/Vulkan/VKDeviceBuffer.cpp +++ b/src/SceneGraph/Vulkan/VKDeviceBuffer.cpp @@ -5,12 +5,12 @@ #include VK_NAMESPACE_BEGIN -const VkDeviceSize GPUDevice::GetUBOAlign (){return attr->physical_device->GetUBOAlign();} -const VkDeviceSize GPUDevice::GetSSBOAlign (){return attr->physical_device->GetSSBOAlign();} -const VkDeviceSize GPUDevice::GetUBORange (){return attr->physical_device->GetUBORange();} -const VkDeviceSize GPUDevice::GetSSBORange (){return attr->physical_device->GetSSBORange();} +const VkDeviceSize VulkanDevice::GetUBOAlign (){return attr->physical_device->GetUBOAlign();} +const VkDeviceSize VulkanDevice::GetSSBOAlign (){return attr->physical_device->GetSSBOAlign();} +const VkDeviceSize VulkanDevice::GetUBORange (){return attr->physical_device->GetUBORange();} +const VkDeviceSize VulkanDevice::GetSSBORange (){return attr->physical_device->GetSSBORange();} -bool GPUDevice::CreateBuffer(DeviceBufferData *buf,VkBufferUsageFlags buf_usage,VkDeviceSize range,VkDeviceSize size,const void *data,SharingMode sharing_mode) +bool VulkanDevice::CreateBuffer(DeviceBufferData *buf,VkBufferUsageFlags buf_usage,VkDeviceSize range,VkDeviceSize size,const void *data,SharingMode sharing_mode) { if(size<=0)return(false); @@ -55,7 +55,7 @@ bool GPUDevice::CreateBuffer(DeviceBufferData *buf,VkBufferUsageFlags buf_usage, return(false); } -VAB *GPUDevice::CreateVAB(VkFormat format,uint32_t count,const void *data,SharingMode sharing_mode) +VAB *VulkanDevice::CreateVAB(VkFormat format,uint32_t count,const void *data,SharingMode sharing_mode) { if(count==0)return(nullptr); @@ -63,7 +63,7 @@ VAB *GPUDevice::CreateVAB(VkFormat format,uint32_t count,const void *data,Sharin if(stride==0) { - std::cerr<<"format["<device,buf,format,stride,count)); } -const IndexType GPUDevice::ChooseIndexType(const VkDeviceSize &vertex_count)const +const IndexType VulkanDevice::ChooseIndexType(const VkDeviceSize &vertex_count)const { if(vertex_count<=0)return(IndexType::ERR); @@ -88,7 +88,7 @@ const IndexType GPUDevice::ChooseIndexType(const VkDeviceSize &vertex_count)cons return IndexType::ERR; } -const bool GPUDevice::CheckIndexType(const IndexType it,const VkDeviceSize &vertex_count)const +const bool VulkanDevice::CheckIndexType(const IndexType it,const VkDeviceSize &vertex_count)const { if(vertex_count<=0)return(false); @@ -101,7 +101,7 @@ const bool GPUDevice::CheckIndexType(const IndexType it,const VkDeviceSize &vert return(false); } -IndexBuffer *GPUDevice::CreateIBO(IndexType index_type,uint32_t count,const void *data,SharingMode sharing_mode) +IndexBuffer *VulkanDevice::CreateIBO(IndexType index_type,uint32_t count,const void *data,SharingMode sharing_mode) { if(count==0)return(nullptr); @@ -122,7 +122,7 @@ IndexBuffer *GPUDevice::CreateIBO(IndexType index_type,uint32_t count,const void return(new IndexBuffer(attr->device,buf,index_type,count)); } -DeviceBuffer *GPUDevice::CreateBuffer(VkBufferUsageFlags buf_usage,VkDeviceSize range,VkDeviceSize size,const void *data,SharingMode sharing_mode) +DeviceBuffer *VulkanDevice::CreateBuffer(VkBufferUsageFlags buf_usage,VkDeviceSize range,VkDeviceSize size,const void *data,SharingMode sharing_mode) { if(size<=0)return(nullptr); diff --git a/src/SceneGraph/Vulkan/VKDeviceCreater.cpp b/src/SceneGraph/Vulkan/VKDeviceCreater.cpp index 8f82b4ad..66671ffa 100644 --- a/src/SceneGraph/Vulkan/VKDeviceCreater.cpp +++ b/src/SceneGraph/Vulkan/VKDeviceCreater.cpp @@ -14,7 +14,7 @@ VK_NAMESPACE_BEGIN VkPipelineCache CreatePipelineCache(VkDevice device,const VkPhysicalDeviceProperties &); -void SetShaderCompilerVersion(const GPUPhysicalDevice *); +void SetShaderCompilerVersion(const VulkanPhyDevice *); #ifdef _DEBUG DebugUtils *CreateDebugUtils(VkDevice); @@ -47,7 +47,7 @@ void LogSurfaceFormat(const VkSurfaceFormatKHR *surface_format_list,const uint32 namespace { - void SetDeviceExtension(CharPointerList *ext_list,const GPUPhysicalDevice *physical_device,const VulkanHardwareRequirement &require) + void SetDeviceExtension(CharPointerList *ext_list,const VulkanPhyDevice *physical_device,const VulkanHardwareRequirement &require) { ext_list->Add(VK_KHR_SWAPCHAIN_EXTENSION_NAME); @@ -117,7 +117,7 @@ namespace #undef FEATURE_COPY } - void GetDeviceQueue(VkDevAttr *attr) + void GetDeviceQueue(VulkanDevAttr *attr) { vkGetDeviceQueue(attr->device,attr->graphics_family,0,&attr->graphics_queue); @@ -201,7 +201,7 @@ constexpr size_t VK_DRIVER_ID_RANGE_SIZE=VK_DRIVER_ID_END_RANGE-VK_DRIVER_ID_BEG #endif//VK_DRIVER_ID_RANGE_SIZE #ifdef _DEBUG -void OutputPhysicalDeviceCaps(const GPUPhysicalDevice *); +void OutputPhysicalDeviceCaps(const VulkanPhyDevice *); #endif//_DEBUG VkDevice VulkanDeviceCreater::CreateDevice(const uint32_t graphics_family) @@ -293,11 +293,11 @@ void VulkanDeviceCreater::ChooseSurfaceFormat() surface_format.colorSpace=VK_COLOR_SPACE_SRGB_NONLINEAR_KHR; } -GPUDevice *VulkanDeviceCreater::CreateRenderDevice() +VulkanDevice *VulkanDeviceCreater::CreateRenderDevice() { - VkDevAttr *device_attr=new VkDevAttr(instance,physical_device,surface); + VulkanDevAttr *device_attr=new VulkanDevAttr(instance,physical_device,surface); - AutoDelete auto_delete(device_attr); + AutoDelete auto_delete(device_attr); if(device_attr->graphics_family==ERROR_FAMILY_INDEX) return(nullptr); @@ -359,7 +359,7 @@ GPUDevice *VulkanDeviceCreater::CreateRenderDevice() } #endif//_DEBUG - return(new GPUDevice(device_attr)); + return(new VulkanDevice(device_attr)); } VulkanDeviceCreater::VulkanDeviceCreater( VulkanInstance *vi, @@ -469,7 +469,7 @@ bool VulkanDeviceCreater::RequirementCheck() return(true); } -GPUDevice *VulkanDeviceCreater::Create() +VulkanDevice *VulkanDeviceCreater::Create() { if(!instance||!window) return(nullptr); @@ -494,7 +494,7 @@ GPUDevice *VulkanDeviceCreater::Create() extent.width =window->GetWidth(); extent.height =window->GetHeight(); - GPUDevice *device=CreateRenderDevice(); + VulkanDevice *device=CreateRenderDevice(); if(!device) { diff --git a/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp b/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp index bbd4ba72..905539cc 100644 --- a/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp +++ b/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp @@ -38,7 +38,7 @@ namespace } }//namespace -MaterialParameters *GPUDevice::CreateMP(const MaterialDescriptorManager *desc_manager,const PipelineLayoutData *pld,const DescriptorSetType &desc_set_type) +MaterialParameters *VulkanDevice::CreateMP(const MaterialDescriptorManager *desc_manager,const PipelineLayoutData *pld,const DescriptorSetType &desc_set_type) { if(!desc_manager||!pld)return(nullptr); RANGE_CHECK_RETURN_NULLPTR(desc_set_type) diff --git a/src/SceneGraph/Vulkan/VKDeviceMemory.cpp b/src/SceneGraph/Vulkan/VKDeviceMemory.cpp index 0c47fd80..4bd54ec6 100644 --- a/src/SceneGraph/Vulkan/VKDeviceMemory.cpp +++ b/src/SceneGraph/Vulkan/VKDeviceMemory.cpp @@ -1,7 +1,7 @@ #include VK_NAMESPACE_BEGIN -DeviceMemory *GPUDevice::CreateMemory(VkImage image,const uint32_t flag) +DeviceMemory *VulkanDevice::CreateMemory(VkImage image,const uint32_t flag) { VkMemoryRequirements memReqs; diff --git a/src/SceneGraph/Vulkan/VKDeviceSampler.cpp b/src/SceneGraph/Vulkan/VKDeviceSampler.cpp index e305ddf1..aea8c27d 100644 --- a/src/SceneGraph/Vulkan/VKDeviceSampler.cpp +++ b/src/SceneGraph/Vulkan/VKDeviceSampler.cpp @@ -1,7 +1,7 @@ #include #include VK_NAMESPACE_BEGIN -Sampler *GPUDevice::CreateSampler(VkSamplerCreateInfo *sci) +Sampler *VulkanDevice::CreateSampler(VkSamplerCreateInfo *sci) { static VkSamplerCreateInfo default_sampler_create_info= { @@ -38,7 +38,7 @@ Sampler *GPUDevice::CreateSampler(VkSamplerCreateInfo *sci) return(new Sampler(attr->device,sampler)); } -Sampler *GPUDevice::CreateSampler(Texture *tex) +Sampler *VulkanDevice::CreateSampler(Texture *tex) { VkSamplerCreateInfo sci= { diff --git a/src/SceneGraph/Vulkan/VKIndirectCommandBuffer.cpp b/src/SceneGraph/Vulkan/VKIndirectCommandBuffer.cpp index 368a318b..dbbd8699 100644 --- a/src/SceneGraph/Vulkan/VKIndirectCommandBuffer.cpp +++ b/src/SceneGraph/Vulkan/VKIndirectCommandBuffer.cpp @@ -3,7 +3,7 @@ VK_NAMESPACE_BEGIN -bool GPUDevice::CreateIndirectCommandBuffer(DeviceBufferData *buf,const uint32_t cmd_count,const uint32_t cmd_size,SharingMode sharing_mode) +bool VulkanDevice::CreateIndirectCommandBuffer(DeviceBufferData *buf,const uint32_t cmd_count,const uint32_t cmd_size,SharingMode sharing_mode) { const uint32_t size=cmd_count*cmd_size; @@ -12,7 +12,7 @@ bool GPUDevice::CreateIndirectCommandBuffer(DeviceBufferData *buf,const uint32_t return CreateBuffer(buf,VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT,size,size,nullptr,sharing_mode); } -IndirectDrawBuffer *GPUDevice::CreateIndirectDrawBuffer(const uint32_t cmd_count,SharingMode sm) +IndirectDrawBuffer *VulkanDevice::CreateIndirectDrawBuffer(const uint32_t cmd_count,SharingMode sm) { DeviceBufferData buf; @@ -22,7 +22,7 @@ IndirectDrawBuffer *GPUDevice::CreateIndirectDrawBuffer(const uint32_t cmd_count return(new IndirectDrawBuffer(attr->device,buf,cmd_count)); } -IndirectDrawIndexedBuffer *GPUDevice::CreateIndirectDrawIndexedBuffer(const uint32_t cmd_count,SharingMode sm) +IndirectDrawIndexedBuffer *VulkanDevice::CreateIndirectDrawIndexedBuffer(const uint32_t cmd_count,SharingMode sm) { DeviceBufferData buf; @@ -32,7 +32,7 @@ IndirectDrawIndexedBuffer *GPUDevice::CreateIndirectDrawIndexedBuffer(const uint return(new IndirectDrawIndexedBuffer(attr->device,buf,cmd_count)); } -IndirectDispatchBuffer *GPUDevice::CreateIndirectDispatchBuffer(const uint32_t cmd_count,SharingMode sm) +IndirectDispatchBuffer *VulkanDevice::CreateIndirectDispatchBuffer(const uint32_t cmd_count,SharingMode sm) { DeviceBufferData buf; diff --git a/src/SceneGraph/Vulkan/VKInstance.cpp b/src/SceneGraph/Vulkan/VKInstance.cpp index ba9de746..860f2968 100644 --- a/src/SceneGraph/Vulkan/VKInstance.cpp +++ b/src/SceneGraph/Vulkan/VKInstance.cpp @@ -5,7 +5,7 @@ #include VK_NAMESPACE_BEGIN -GPUDevice *CreateRenderDevice(VkInstance,const GPUPhysicalDevice *,Window *); +VulkanDevice *CreateRenderDevice(VkInstance,const VulkanPhyDevice *,Window *); void CheckInstanceLayer(CharPointerList &layer_list,CreateInstanceLayerInfo *layer_info); @@ -80,7 +80,7 @@ VulkanInstance::VulkanInstance(VkInstance i,VKDebugOut *out) vkEnumeratePhysicalDevices(inst, &gpu_count,pd_list); for(uint32_t i=0;iGetDeviceType()==type) return(pd); diff --git a/src/SceneGraph/Vulkan/VKMemory.cpp b/src/SceneGraph/Vulkan/VKMemory.cpp index 02360462..e2a23b5e 100644 --- a/src/SceneGraph/Vulkan/VKMemory.cpp +++ b/src/SceneGraph/Vulkan/VKMemory.cpp @@ -2,7 +2,7 @@ #include #include VK_NAMESPACE_BEGIN -DeviceMemory *GPUDevice::CreateMemory(const VkMemoryRequirements &req,uint32_t properties) +DeviceMemory *VulkanDevice::CreateMemory(const VkMemoryRequirements &req,uint32_t properties) { const int index=attr->physical_device->GetMemoryType(req.memoryTypeBits,properties); diff --git a/src/SceneGraph/Vulkan/VKMemoryAllocator.cpp b/src/SceneGraph/Vulkan/VKMemoryAllocator.cpp index c7174914..aaea305a 100644 --- a/src/SceneGraph/Vulkan/VKMemoryAllocator.cpp +++ b/src/SceneGraph/Vulkan/VKMemoryAllocator.cpp @@ -4,7 +4,7 @@ #include VK_NAMESPACE_BEGIN -VKMemoryAllocator::VKMemoryAllocator(GPUDevice *d,const uint32_t flags,const VkDeviceSize r) +VKMemoryAllocator::VKMemoryAllocator(VulkanDevice *d,const uint32_t flags,const VkDeviceSize r) { device=d; buffer_usage_flag_bits=flags; diff --git a/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp b/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp index eaeffbbd..0d3c6daf 100644 --- a/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp +++ b/src/SceneGraph/Vulkan/VKPhysicalDevice.cpp @@ -55,7 +55,7 @@ namespace } } -GPUPhysicalDevice::GPUPhysicalDevice(VkInstance inst,VkPhysicalDevice pd) +VulkanPhyDevice::VulkanPhyDevice(VkInstance inst,VkPhysicalDevice pd) { instance=inst; physical_device=pd; @@ -179,7 +179,7 @@ GPUPhysicalDevice::GPUPhysicalDevice(VkInstance inst,VkPhysicalDevice pd) dynamic_state=CheckExtensionSupport(VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME); } -const bool GPUPhysicalDevice::GetLayerVersion(const AnsiString &name,uint32_t &spec,uint32_t &impl)const +const bool VulkanPhyDevice::GetLayerVersion(const AnsiString &name,uint32_t &spec,uint32_t &impl)const { for(const VkLayerProperties &lp:layer_properties) { @@ -195,7 +195,7 @@ const bool GPUPhysicalDevice::GetLayerVersion(const AnsiString &name,uint32_t &s return(false); } -const uint32_t GPUPhysicalDevice::GetExtensionVersion(const AnsiString &name)const +const uint32_t VulkanPhyDevice::GetExtensionVersion(const AnsiString &name)const { for(const VkExtensionProperties &ep:extension_properties) { @@ -206,7 +206,7 @@ const uint32_t GPUPhysicalDevice::GetExtensionVersion(const AnsiString &name)con return 0; } -const bool GPUPhysicalDevice::CheckExtensionSupport(const AnsiString &name)const +const bool VulkanPhyDevice::CheckExtensionSupport(const AnsiString &name)const { for(const VkExtensionProperties &ep:extension_properties) { @@ -217,7 +217,7 @@ const bool GPUPhysicalDevice::CheckExtensionSupport(const AnsiString &name)const return(false); } -const int GPUPhysicalDevice::GetMemoryType(uint32_t typeBits,VkMemoryPropertyFlags properties)const +const int VulkanPhyDevice::GetMemoryType(uint32_t typeBits,VkMemoryPropertyFlags properties)const { // Search memtypes to find first index with those properties for(uint32_t i=0; i VK_NAMESPACE_BEGIN -PipelineLayoutData *GPUDevice::CreatePipelineLayoutData(const MaterialDescriptorManager *desc_manager) +PipelineLayoutData *VulkanDevice::CreatePipelineLayoutData(const MaterialDescriptorManager *desc_manager) { PipelineLayoutData *pld=hgl_zero_new(); diff --git a/src/SceneGraph/Vulkan/VKPrimitiveData.cpp b/src/SceneGraph/Vulkan/VKPrimitiveData.cpp index 4d2d009c..951a34c1 100644 --- a/src/SceneGraph/Vulkan/VKPrimitiveData.cpp +++ b/src/SceneGraph/Vulkan/VKPrimitiveData.cpp @@ -114,11 +114,11 @@ void PrimitiveData::UnmapAll() namespace { /** - * 直接使用GPUDevice创建VAB/IBO,并在释构时释放 + * 直接使用VulkanDevice创建VAB/IBO,并在释构时释放 */ class PrimitiveDataPrivateBuffer:public PrimitiveData { - GPUDevice *device; + VulkanDevice *device; public: @@ -129,7 +129,7 @@ namespace public: - PrimitiveDataPrivateBuffer(GPUDevice *dev,const VIL *_vil,const uint32_t vc):PrimitiveData(_vil,vc) + PrimitiveDataPrivateBuffer(VulkanDevice *dev,const VIL *_vil,const uint32_t vc):PrimitiveData(_vil,vc) { device=dev; } @@ -230,7 +230,7 @@ namespace };//class PrimitiveDataVDM:public PrimitiveData }//namespace -PrimitiveData *CreatePrimitiveData(GPUDevice *dev,const VIL *_vil,const uint32_t vc) +PrimitiveData *CreatePrimitiveData(VulkanDevice *dev,const VIL *_vil,const uint32_t vc) { if(!dev)return(nullptr); if(!_vil)return(nullptr); diff --git a/src/SceneGraph/Vulkan/VKPrimitiveData.h b/src/SceneGraph/Vulkan/VKPrimitiveData.h index 378c9904..e95ec637 100644 --- a/src/SceneGraph/Vulkan/VKPrimitiveData.h +++ b/src/SceneGraph/Vulkan/VKPrimitiveData.h @@ -68,6 +68,6 @@ public: };//class PrimitiveData -PrimitiveData *CreatePrimitiveData(GPUDevice *dev,const VIL *_vil,const uint32_t vc); +PrimitiveData *CreatePrimitiveData(VulkanDevice *dev,const VIL *_vil,const uint32_t vc); PrimitiveData *CreatePrimitiveData(VertexDataManager *vdm,const uint32_t vc); VK_NAMESPACE_END diff --git a/src/SceneGraph/Vulkan/VKQueue.cpp b/src/SceneGraph/Vulkan/VKQueue.cpp index 6846133d..aab9f1ff 100644 --- a/src/SceneGraph/Vulkan/VKQueue.cpp +++ b/src/SceneGraph/Vulkan/VKQueue.cpp @@ -96,7 +96,7 @@ bool DeviceQueue::Submit(const VkCommandBuffer *cmd_buf,const uint32_t cb_count, return(result==VK_SUCCESS); } -bool DeviceQueue::Submit(GPUCmdBuffer *cmd_buf,Semaphore *wait_sem,Semaphore *complete_sem) +bool DeviceQueue::Submit(VulkanCmdBuffer *cmd_buf,Semaphore *wait_sem,Semaphore *complete_sem) { if(cmd_buf->IsBegin()) cmd_buf->End(); diff --git a/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp b/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp index 687d4454..222ca2d9 100644 --- a/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp +++ b/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp @@ -183,20 +183,20 @@ Material *RenderResource::CreateMaterial(const mtl::MaterialCreateInfo *mci) namespace mtl { - MaterialCreateInfo *LoadMaterialFromFile(const VkDevAttr *dev_attr,const AnsiString &, Material2DCreateConfig *); - MaterialCreateInfo *LoadMaterialFromFile(const VkDevAttr *dev_attr,const AnsiString &, Material3DCreateConfig *); + MaterialCreateInfo *LoadMaterialFromFile(const VulkanDevAttr *dev_attr,const AnsiString &, Material2DCreateConfig *); + MaterialCreateInfo *LoadMaterialFromFile(const VulkanDevAttr *dev_attr,const AnsiString &, Material3DCreateConfig *); } Material *RenderResource::LoadMaterial(const AnsiString &mtl_name,mtl::Material2DCreateConfig *cfg) { - AutoDelete mci=mtl::LoadMaterialFromFile(device->GetDeviceAttribute(),mtl_name,cfg); + AutoDelete mci=mtl::LoadMaterialFromFile(device->GetDevAttr(),mtl_name,cfg); return this->CreateMaterial(mci); } Material *RenderResource::LoadMaterial(const AnsiString &mtl_name,mtl::Material3DCreateConfig *cfg) { - AutoDelete mci=mtl::LoadMaterialFromFile(device->GetDeviceAttribute(),mtl_name,cfg); + AutoDelete mci=mtl::LoadMaterialFromFile(device->GetDevAttr(),mtl_name,cfg); return this->CreateMaterial(mci); } diff --git a/src/SceneGraph/Vulkan/VKRenderTarget.cpp b/src/SceneGraph/Vulkan/VKRenderTarget.cpp index c5331329..d32a1850 100644 --- a/src/SceneGraph/Vulkan/VKRenderTarget.cpp +++ b/src/SceneGraph/Vulkan/VKRenderTarget.cpp @@ -6,7 +6,7 @@ VK_NAMESPACE_BEGIN -GPUDevice *IRenderTarget::GetDevice ()const{return render_framework->GetDevice();} +VulkanDevice *IRenderTarget::GetDevice ()const{return render_framework->GetDevice();} VkDevice IRenderTarget::GetVkDevice()const{return render_framework->GetDevice()->GetDevice();} IRenderTarget::IRenderTarget(RenderFramework *rf,const VkExtent2D &ext):desc_binding(DescriptorSetType::RenderTarget) diff --git a/src/SceneGraph/Vulkan/VKShaderModule.cpp b/src/SceneGraph/Vulkan/VKShaderModule.cpp index 8a5d1a3f..23d73402 100644 --- a/src/SceneGraph/Vulkan/VKShaderModule.cpp +++ b/src/SceneGraph/Vulkan/VKShaderModule.cpp @@ -14,7 +14,7 @@ public: } };//struct ShaderModuleCreateInfo -ShaderModule *GPUDevice::CreateShaderModule(VkShaderStageFlagBits shader_stage_flag_bit,const uint32_t *spv_data,const size_t spv_size) +ShaderModule *VulkanDevice::CreateShaderModule(VkShaderStageFlagBits shader_stage_flag_bit,const uint32_t *spv_data,const size_t spv_size) { if(!spv_data||spv_size<4)return(nullptr); diff --git a/src/SceneGraph/Vulkan/VKTileData.cpp b/src/SceneGraph/Vulkan/VKTileData.cpp index 8fd3ded1..c1b5d190 100644 --- a/src/SceneGraph/Vulkan/VKTileData.cpp +++ b/src/SceneGraph/Vulkan/VKTileData.cpp @@ -69,7 +69,7 @@ TileData *TextureManager::CreateTileData(const VkFormat format,const uint width, if(width<=0||height<=0||count<=0) return(nullptr); - const uint32_t max_2d_texture=GetPhysicalDevice()->GetMaxImage2D(); + const uint32_t max_2d_texture=GetPhyDevice()->GetMaxImage2D(); uint tex_width,tex_height; diff --git a/src/SceneGraph/font/TextPrimitive.cpp b/src/SceneGraph/font/TextPrimitive.cpp index 2b509081..d4a2c5f3 100644 --- a/src/SceneGraph/font/TextPrimitive.cpp +++ b/src/SceneGraph/font/TextPrimitive.cpp @@ -7,7 +7,7 @@ namespace hgl { namespace graph { - TextPrimitive::TextPrimitive(GPUDevice *dev,Material *m,uint mc):Primitive(mc) + TextPrimitive::TextPrimitive(VulkanDevice *dev,Material *m,uint mc):Primitive(mc) { device=dev; mtl=m; diff --git a/src/SceneGraph/font/TextRender.cpp b/src/SceneGraph/font/TextRender.cpp index 3d80e8f5..bea48ef9 100644 --- a/src/SceneGraph/font/TextRender.cpp +++ b/src/SceneGraph/font/TextRender.cpp @@ -10,7 +10,7 @@ namespace hgl { namespace graph { - TextRender::TextRender(GPUDevice *dev,FontSource *fs) + TextRender::TextRender(VulkanDevice *dev,FontSource *fs) { device=dev; db=new RenderResource(device); @@ -209,7 +209,7 @@ namespace hgl return AcquireFontSource(fnt); } - TextRender *CreateTextRender(GPUDevice *dev,FontSource *fs,RenderPass *rp,DeviceBuffer *ubo_camera_info,int limit) + TextRender *CreateTextRender(VulkanDevice *dev,FontSource *fs,RenderPass *rp,DeviceBuffer *ubo_camera_info,int limit) { if(!dev||!rp||!ubo_camera_info) return(nullptr); diff --git a/src/SceneGraph/module/GraphModule.cpp b/src/SceneGraph/module/GraphModule.cpp index f8786e97..c325dbc3 100644 --- a/src/SceneGraph/module/GraphModule.cpp +++ b/src/SceneGraph/module/GraphModule.cpp @@ -4,11 +4,11 @@ VK_NAMESPACE_BEGIN - GPUDevice * GraphModule::GetDevice () {return render_framework->GetDevice();} + VulkanDevice * GraphModule::GetDevice () {return render_framework->GetDevice();} VkDevice GraphModule::GetVkDevice ()const {return render_framework->GetVkDevice();} -const GPUPhysicalDevice * GraphModule::GetPhysicalDevice ()const {return render_framework->GetPhysicalDevice();} - VkDevAttr *GraphModule::GetDeviceAttribute ()const {return render_framework->GetDeviceAttribute();} +const VulkanPhyDevice * GraphModule::GetPhyDevice ()const {return render_framework->GetPhyDevice();} + VulkanDevAttr *GraphModule::GetDevAttr ()const {return render_framework->GetDevAttr();} - VkPipelineCache GraphModule::GetPipelineCache ()const {return render_framework->GetDeviceAttribute()->pipeline_cache;} + VkPipelineCache GraphModule::GetPipelineCache ()const {return render_framework->GetDevAttr()->pipeline_cache;} VK_NAMESPACE_END diff --git a/src/SceneGraph/module/GraphModuleManager.cpp b/src/SceneGraph/module/GraphModuleManager.cpp index d6377f1a..a35cdb72 100644 --- a/src/SceneGraph/module/GraphModuleManager.cpp +++ b/src/SceneGraph/module/GraphModuleManager.cpp @@ -4,7 +4,7 @@ VK_NAMESPACE_BEGIN -GPUDevice *GraphModuleManager::GetDevice()const +VulkanDevice *GraphModuleManager::GetDevice()const { return render_framework->GetDevice(); } diff --git a/src/SceneGraph/module/RenderPassManager.cpp b/src/SceneGraph/module/RenderPassManager.cpp index e5d3cec1..49523fd4 100644 --- a/src/SceneGraph/module/RenderPassManager.cpp +++ b/src/SceneGraph/module/RenderPassManager.cpp @@ -292,7 +292,7 @@ RenderPass *RenderPassManager::CreateRenderPass(const ArrayListGetColorFormatList()) if(!phy_dev->IsColorAttachmentOptimal(fmt)) diff --git a/src/SceneGraph/module/RenderTargetManager.cpp b/src/SceneGraph/module/RenderTargetManager.cpp index 36fd4855..353dfc68 100644 --- a/src/SceneGraph/module/RenderTargetManager.cpp +++ b/src/SceneGraph/module/RenderTargetManager.cpp @@ -46,7 +46,7 @@ RenderTarget *RenderTargetManager::CreateRT(const FramebufferInfo *fbi,RenderPas { RenderTargetData *rtd=new RenderTargetData{}; - GPUDevice *dev=GetDevice(); + VulkanDevice *dev=GetDevice(); rtd->fbo =fb; rtd->queue =dev->CreateQueue(fence_count,false); diff --git a/src/SceneGraph/module/SwapchainModule.cpp b/src/SceneGraph/module/SwapchainModule.cpp index 0d28ffbf..5a8da61d 100644 --- a/src/SceneGraph/module/SwapchainModule.cpp +++ b/src/SceneGraph/module/SwapchainModule.cpp @@ -22,7 +22,7 @@ namespace // return swapchain_extent; //} - VkSwapchainKHR CreateVulkanSwapChain(const VkDevAttr *dev_attr) + VkSwapchainKHR CreateVulkanSwapChain(const VulkanDevAttr *dev_attr) { VkSwapchainCreateInfoKHR swapchain_ci; @@ -111,8 +111,8 @@ bool SwapchainModule::CreateSwapchainFBO(Swapchain *swapchain) swapchain->sc_image=hgl_zero_new(swapchain->image_count); AnsiString num_string; - GPUDevice *device=GetDevice(); - auto *dev_attr=GetDeviceAttribute(); + VulkanDevice *device=GetDevice(); + auto *dev_attr=GetDevAttr(); for(uint32_t i=0;iimage_count;i++) { @@ -150,7 +150,7 @@ bool SwapchainModule::CreateSwapchainFBO(Swapchain *swapchain) Swapchain *SwapchainModule::CreateSwapchain() { - auto *dev_attr=GetDeviceAttribute(); + auto *dev_attr=GetDevAttr(); if(!dev_attr) return(nullptr); @@ -197,7 +197,7 @@ bool SwapchainModule::CreateSwapchainRenderTarget() if(!swapchain) return(false); - GPUDevice *device=GetDevice(); + VulkanDevice *device=GetDevice(); SwapchainRenderTargetData *rtd_list=new SwapchainRenderTargetData[swapchain->image_count]; SwapchainRenderTargetData *rtd=rtd_list; @@ -241,7 +241,7 @@ SwapchainModule::SwapchainModule(RenderFramework *rf,TextureManager *tm,RenderTa rt_manager=rtm; rp_manager=rpm; - auto *dev_attr=GetDeviceAttribute(); + auto *dev_attr=GetDevAttr(); SwapchainRenderbufferInfo rbi(dev_attr->surface_format.format,dev_attr->physical_device->GetDepthFormat()); @@ -262,7 +262,7 @@ void SwapchainModule::OnResize(const VkExtent2D &extent) { SAFE_CLEAR(sc_render_target) - VkDevAttr *dev_attr=GetDeviceAttribute(); + VulkanDevAttr *dev_attr=GetDevAttr(); dev_attr->RefreshSurfaceCaps(); diff --git a/src/SceneGraph/module/TextureManager.cpp b/src/SceneGraph/module/TextureManager.cpp index 0c980312..8dcb64f0 100644 --- a/src/SceneGraph/module/TextureManager.cpp +++ b/src/SceneGraph/module/TextureManager.cpp @@ -6,13 +6,13 @@ VK_NAMESPACE_BEGIN const VkFormatProperties TextureManager::GetFormatProperties(const VkFormat format) const { - return GetPhysicalDevice()->GetFormatProperties(format); + return GetPhyDevice()->GetFormatProperties(format); } GRAPH_MODULE_CONSTRUCT(TextureManager) { auto dev=GetDevice(); - auto phy_device=GetPhysicalDevice(); + auto phy_device=GetPhyDevice(); texture_cmd_buf=dev->CreateTextureCommandBuffer(phy_device->GetDeviceName()+AnsiString(":TexCmdBuffer")); diff --git a/src/SceneGraph/render/MaterialRenderList.cpp b/src/SceneGraph/render/MaterialRenderList.cpp index 78dc0990..e8fdbb24 100644 --- a/src/SceneGraph/render/MaterialRenderList.cpp +++ b/src/SceneGraph/render/MaterialRenderList.cpp @@ -72,7 +72,7 @@ const int RenderNode::compare(const RenderNode &other)const return -1; } -MaterialRenderList::MaterialRenderList(GPUDevice *d,bool l2w,const RenderPipelineIndex &rpi) +MaterialRenderList::MaterialRenderList(VulkanDevice *d,bool l2w,const RenderPipelineIndex &rpi) { device=d; cmd_buf=nullptr; diff --git a/src/SceneGraph/render/RenderAssignBuffer.cpp b/src/SceneGraph/render/RenderAssignBuffer.cpp index c257833c..55eb839e 100644 --- a/src/SceneGraph/render/RenderAssignBuffer.cpp +++ b/src/SceneGraph/render/RenderAssignBuffer.cpp @@ -9,7 +9,7 @@ #include VK_NAMESPACE_BEGIN -RenderAssignBuffer::RenderAssignBuffer(GPUDevice *dev,Material *mtl) +RenderAssignBuffer::RenderAssignBuffer(VulkanDevice *dev,Material *mtl) { hgl_zero(*this); diff --git a/src/SceneGraph/render/RenderAssignBuffer.h b/src/SceneGraph/render/RenderAssignBuffer.h index d387e5d9..e21a119b 100644 --- a/src/SceneGraph/render/RenderAssignBuffer.h +++ b/src/SceneGraph/render/RenderAssignBuffer.h @@ -41,7 +41,7 @@ class RenderAssignBuffer private: - GPUDevice *device; + VulkanDevice *device; Material *material; @@ -80,7 +80,7 @@ public: public: - RenderAssignBuffer(GPUDevice *dev,Material *); + RenderAssignBuffer(VulkanDevice *dev,Material *); ~RenderAssignBuffer(){Clear();} //下一代，将MaterialInstanceSets使用提前化，这样不用每一次绘制都重新写入MI DATA，可以提升效率。 diff --git a/src/SceneGraph/render/RenderList.cpp b/src/SceneGraph/render/RenderList.cpp index 360a3206..7ad974b2 100644 --- a/src/SceneGraph/render/RenderList.cpp +++ b/src/SceneGraph/render/RenderList.cpp @@ -10,7 +10,7 @@ namespace hgl { namespace graph { - RenderList::RenderList(GPUDevice *dev) + RenderList::RenderList(VulkanDevice *dev) { device =dev; renderable_count=0; diff --git a/src/ShaderGen/2d/M_PureColor2D.cpp b/src/ShaderGen/2d/M_PureColor2D.cpp index bd31f48f..0efd478a 100644 --- a/src/ShaderGen/2d/M_PureColor2D.cpp +++ b/src/ShaderGen/2d/M_PureColor2D.cpp @@ -63,7 +63,7 @@ void main() };//class MaterialPureColor2D:public Std2DMaterial }//namespace -MaterialCreateInfo *CreatePureColor2D(const VkDevAttr *dev_attr,const Material2DCreateConfig *cfg) +MaterialCreateInfo *CreatePureColor2D(const VulkanDevAttr *dev_attr,const Material2DCreateConfig *cfg) { MaterialPureColor2D mpc2d(cfg); diff --git a/src/ShaderGen/2d/M_PureTexture2D.cpp b/src/ShaderGen/2d/M_PureTexture2D.cpp index f77efbc2..f59cbf2d 100644 --- a/src/ShaderGen/2d/M_PureTexture2D.cpp +++ b/src/ShaderGen/2d/M_PureTexture2D.cpp @@ -55,7 +55,7 @@ void main() };//class MaterialPureTexture2D:public Std2DMaterial }//namespace -MaterialCreateInfo *CreatePureTexture2D(const VkDevAttr *dev_attr,const mtl::Material2DCreateConfig *cfg) +MaterialCreateInfo *CreatePureTexture2D(const VulkanDevAttr *dev_attr,const mtl::Material2DCreateConfig *cfg) { MaterialPureTexture2D mvc2d(cfg); diff --git a/src/ShaderGen/2d/M_RectTexture2D.cpp b/src/ShaderGen/2d/M_RectTexture2D.cpp index 3e2e7e2b..762e5289 100644 --- a/src/ShaderGen/2d/M_RectTexture2D.cpp +++ b/src/ShaderGen/2d/M_RectTexture2D.cpp @@ -82,7 +82,7 @@ void main() };//class MaterialRectTexture2D:public Std2DMaterial }//namespace -MaterialCreateInfo *CreateRectTexture2D(const VkDevAttr *dev_attr,mtl::Material2DCreateConfig *cfg) +MaterialCreateInfo *CreateRectTexture2D(const VulkanDevAttr *dev_attr,mtl::Material2DCreateConfig *cfg) { if(!cfg) return(nullptr); diff --git a/src/ShaderGen/2d/M_RectTexture2DArray.cpp b/src/ShaderGen/2d/M_RectTexture2DArray.cpp index 9d6db82e..521723ee 100644 --- a/src/ShaderGen/2d/M_RectTexture2DArray.cpp +++ b/src/ShaderGen/2d/M_RectTexture2DArray.cpp @@ -98,7 +98,7 @@ void main() };//class MaterialRectTexture2D:public Std2DMaterial }//namespace -MaterialCreateInfo *CreateRectTexture2DArray(const VkDevAttr *dev_attr,mtl::Material2DCreateConfig *cfg) +MaterialCreateInfo *CreateRectTexture2DArray(const VulkanDevAttr *dev_attr,mtl::Material2DCreateConfig *cfg) { if(!cfg) return(nullptr); diff --git a/src/ShaderGen/2d/M_VertexColor2D.cpp b/src/ShaderGen/2d/M_VertexColor2D.cpp index 55659d7c..35a3121c 100644 --- a/src/ShaderGen/2d/M_VertexColor2D.cpp +++ b/src/ShaderGen/2d/M_VertexColor2D.cpp @@ -54,7 +54,7 @@ void main() };//class MaterialVertexColor2D:public Std2DMaterial }//namespace -MaterialCreateInfo *CreateVertexColor2D(const VkDevAttr *dev_attr,const Material2DCreateConfig *cfg) +MaterialCreateInfo *CreateVertexColor2D(const VulkanDevAttr *dev_attr,const Material2DCreateConfig *cfg) { MaterialVertexColor2D mvc2d(cfg); diff --git a/src/ShaderGen/2d/Std2DMaterialLoader.cpp b/src/ShaderGen/2d/Std2DMaterialLoader.cpp index 26ca935c..d4afb786 100644 --- a/src/ShaderGen/2d/Std2DMaterialLoader.cpp +++ b/src/ShaderGen/2d/Std2DMaterialLoader.cpp @@ -102,7 +102,7 @@ namespace material_file::MaterialFileData *LoadMaterialDataFromFile(const AnsiString &mtl_filename); -MaterialCreateInfo *LoadMaterialFromFile(const VkDevAttr *dev_attr,const AnsiString &name,Material2DCreateConfig *cfg) +MaterialCreateInfo *LoadMaterialFromFile(const VulkanDevAttr *dev_attr,const AnsiString &name,Material2DCreateConfig *cfg) { if(name.IsEmpty()||!cfg) return(nullptr); diff --git a/src/ShaderGen/3d/M_BillboardDynamicSize.cpp b/src/ShaderGen/3d/M_BillboardDynamicSize.cpp index 069e9aaa..12c8f484 100644 --- a/src/ShaderGen/3d/M_BillboardDynamicSize.cpp +++ b/src/ShaderGen/3d/M_BillboardDynamicSize.cpp @@ -86,7 +86,7 @@ void main() };//class MaterialBillboard2DDynamicSize:public Std3DMaterial }//namespace -MaterialCreateInfo *CreateBillboard2DDynamic(const VkDevAttr *dev_attr,mtl::BillboardMaterialCreateConfig *cfg) +MaterialCreateInfo *CreateBillboard2DDynamic(const VulkanDevAttr *dev_attr,mtl::BillboardMaterialCreateConfig *cfg) { if(!cfg) return(nullptr); diff --git a/src/ShaderGen/3d/M_BillboardFixedSize.cpp b/src/ShaderGen/3d/M_BillboardFixedSize.cpp index c661d6bf..0d012674 100644 --- a/src/ShaderGen/3d/M_BillboardFixedSize.cpp +++ b/src/ShaderGen/3d/M_BillboardFixedSize.cpp @@ -96,7 +96,7 @@ void main() };//class MaterialBillboard2DFixedSize:public Std3DMaterial }//namespace -MaterialCreateInfo *CreateBillboard2DFixedSize(const VkDevAttr *dev_attr,mtl::BillboardMaterialCreateConfig *cfg) +MaterialCreateInfo *CreateBillboard2DFixedSize(const VulkanDevAttr *dev_attr,mtl::BillboardMaterialCreateConfig *cfg) { if(!cfg) return(nullptr); diff --git a/src/ShaderGen/3d/M_Gizmo3D.cpp b/src/ShaderGen/3d/M_Gizmo3D.cpp index 00996c74..7983e2f7 100644 --- a/src/ShaderGen/3d/M_Gizmo3D.cpp +++ b/src/ShaderGen/3d/M_Gizmo3D.cpp @@ -93,7 +93,7 @@ void main() };//class MaterialGizmo3D:public Std3DMaterial }//namespace -MaterialCreateInfo *CreateMaterialGizmo3D(const VkDevAttr *dev_attr,const Material3DCreateConfig *cfg) +MaterialCreateInfo *CreateMaterialGizmo3D(const VulkanDevAttr *dev_attr,const Material3DCreateConfig *cfg) { MaterialGizmo3D mg3d(cfg); diff --git a/src/ShaderGen/3d/M_VertexColor3D.cpp b/src/ShaderGen/3d/M_VertexColor3D.cpp index fe73d5f8..62bb1a42 100644 --- a/src/ShaderGen/3d/M_VertexColor3D.cpp +++ b/src/ShaderGen/3d/M_VertexColor3D.cpp @@ -54,7 +54,7 @@ void main() };//class MaterialVertexColor3D:public Std3DMaterial }//namespace -MaterialCreateInfo *CreateVertexColor3D(const VkDevAttr *dev_attr,const Material3DCreateConfig *cfg) +MaterialCreateInfo *CreateVertexColor3D(const VulkanDevAttr *dev_attr,const Material3DCreateConfig *cfg) { MaterialVertexColor3D mvc3d(cfg); diff --git a/src/ShaderGen/3d/M_VertexLum3D.cpp b/src/ShaderGen/3d/M_VertexLum3D.cpp index dd2dfcfe..b7828456 100644 --- a/src/ShaderGen/3d/M_VertexLum3D.cpp +++ b/src/ShaderGen/3d/M_VertexLum3D.cpp @@ -68,7 +68,7 @@ void main() };//class MaterialVertexLuminance3D:public Std3DMaterial }//namespace -MaterialCreateInfo *CreateVertexLuminance3D(const VkDevAttr *dev_attr,const Material3DCreateConfig *cfg) +MaterialCreateInfo *CreateVertexLuminance3D(const VulkanDevAttr *dev_attr,const Material3DCreateConfig *cfg) { MaterialVertexLuminance3D mvc3d(cfg); diff --git a/src/ShaderGen/3d/Std3DMaterialLoader.cpp b/src/ShaderGen/3d/Std3DMaterialLoader.cpp index b6732cb6..8a62a86a 100644 --- a/src/ShaderGen/3d/Std3DMaterialLoader.cpp +++ b/src/ShaderGen/3d/Std3DMaterialLoader.cpp @@ -103,7 +103,7 @@ namespace material_file::MaterialFileData *LoadMaterialDataFromFile(const AnsiString &mtl_filename); -MaterialCreateInfo *LoadMaterialFromFile(const VkDevAttr *dev_attr,const AnsiString &name,Material3DCreateConfig *cfg) +MaterialCreateInfo *LoadMaterialFromFile(const VulkanDevAttr *dev_attr,const AnsiString &name,Material3DCreateConfig *cfg) { if(name.IsEmpty()||!cfg) return (nullptr); diff --git a/src/ShaderGen/GLSLCompiler.cpp b/src/ShaderGen/GLSLCompiler.cpp index 72ecd0fe..68729122 100644 --- a/src/ShaderGen/GLSLCompiler.cpp +++ b/src/ShaderGen/GLSLCompiler.cpp @@ -43,7 +43,7 @@ namespace hgl static CompileInfo compile_info; - void SetShaderCompilerVersion(const GPUPhysicalDevice *pd) + void SetShaderCompilerVersion(const VulkanPhyDevice *pd) { const auto &pdp=pd->GetProperties(); diff --git a/src/ShaderGen/MaterialCreateInfo.cpp b/src/ShaderGen/MaterialCreateInfo.cpp index 7b1d719e..10706ce5 100644 --- a/src/ShaderGen/MaterialCreateInfo.cpp +++ b/src/ShaderGen/MaterialCreateInfo.cpp @@ -225,7 +225,7 @@ bool MaterialCreateInfo::SetLocalToWorld(const uint32_t shader_stage_flag_bits) return(true); } -bool MaterialCreateInfo::CreateShader(const VkDevAttr *dev_attr) +bool MaterialCreateInfo::CreateShader(const VulkanDevAttr *dev_attr) { if(shader_map.IsEmpty()) return(false); diff --git a/src/ShaderGen/MaterialLibrary.cpp b/src/ShaderGen/MaterialLibrary.cpp index 01cf0aee..bfd022d9 100644 --- a/src/ShaderGen/MaterialLibrary.cpp +++ b/src/ShaderGen/MaterialLibrary.cpp @@ -46,7 +46,7 @@ void ClearMaterialFactory() SAFE_CLEAR(material_factory_map); } -MaterialCreateInfo *CreateMaterialCreateInfo(const VkDevAttr *dev_attr,const MaterialName &name,MaterialCreateConfig *cfg) +MaterialCreateInfo *CreateMaterialCreateInfo(const VulkanDevAttr *dev_attr,const MaterialName &name,MaterialCreateConfig *cfg) { if(!cfg) return(nullptr); diff --git a/src/ShaderGen/StandardMaterial.cpp b/src/ShaderGen/StandardMaterial.cpp index ec1c7a7c..ca2aba70 100644 --- a/src/ShaderGen/StandardMaterial.cpp +++ b/src/ShaderGen/StandardMaterial.cpp @@ -8,7 +8,7 @@ StdMaterial::StdMaterial(const MaterialCreateConfig *mcc) mci=new MaterialCreateInfo(mcc); } -MaterialCreateInfo *StdMaterial::Create(const VkDevAttr *dev_attr) +MaterialCreateInfo *StdMaterial::Create(const VulkanDevAttr *dev_attr) { if(!BeginCustomShader()) return(nullptr); diff --git a/src/Work/WorkManager.cpp b/src/Work/WorkManager.cpp index 6773b8f9..30fcc3d8 100644 --- a/src/Work/WorkManager.cpp +++ b/src/Work/WorkManager.cpp @@ -66,7 +66,7 @@ namespace hgl wo->OnRenderTargetSwitch(render_framework,render_framework->GetSwapchainRenderTarget()); Window *win=render_framework->GetWindow(); - graph::GPUDevice *dev=render_framework->GetDevice(); + graph::VulkanDevice *dev=render_framework->GetDevice(); while(!cur_work_object->IsDestroy()) {