From b8a83a25ebeb40cdd784ab66841e340bee8dc780 Mon Sep 17 00:00:00 2001
From: "HuYingzhuo(hugo/hyzboy)" <hyzboy@outlook.com>
Date: Mon, 13 Feb 2023 11:50:55 +0800
Subject: [PATCH] use VKDescriptorSet instead of VKDescriptorSets

---
 example/common/VulkanAppFramework.h                           | 2 +-
 inc/hgl/graph/VKCommandBuffer.h                               | 2 +-
 inc/hgl/graph/{VKDescriptorSets.h => VKDescriptorSet.h}       | 0
 inc/hgl/graph/VKMaterialParameters.h                          | 2 +-
 inc/hgl/graph/VKRenderResource.h                              | 2 +-
 inc/hgl/graph/VKRenderable.h                                  | 2 +-
 src/SceneGraph/CMakeLists.txt                                 | 4 ++--
 .../Vulkan/{VKDescriptorSets.cpp => VKDescriptorSet.cpp}      | 2 +-
 src/SceneGraph/Vulkan/VKDevice.cpp                            | 2 +-
 src/SceneGraph/Vulkan/VKDeviceMaterial.cpp                    | 2 +-
 src/SceneGraph/Vulkan/VKMaterialParameters.cpp                | 2 +-
 src/SceneGraph/Vulkan/VKPipelineLayoutData.cpp                | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)
 rename inc/hgl/graph/{VKDescriptorSets.h => VKDescriptorSet.h} (100%)
 rename src/SceneGraph/Vulkan/{VKDescriptorSets.cpp => VKDescriptorSet.cpp} (99%)

diff --git a/example/common/VulkanAppFramework.h b/example/common/VulkanAppFramework.h
index b25c9b72..5200d104 100644
--- a/example/common/VulkanAppFramework.h
+++ b/example/common/VulkanAppFramework.h
@@ -8,7 +8,7 @@
 #include<hgl/graph/VKShaderModule.h>
 #include<hgl/graph/VKImageView.h>
 #include<hgl/graph/VKPrimitive.h>
-#include<hgl/graph/VKDescriptorSets.h>
+#include<hgl/graph/VKDescriptorSet.h>
 #include<hgl/graph/VKRenderPass.h>
 #include<hgl/graph/VKPipeline.h>
 #include<hgl/graph/VKCommandBuffer.h>
diff --git a/inc/hgl/graph/VKCommandBuffer.h b/inc/hgl/graph/VKCommandBuffer.h
index 5ec6ee0c..23a8bfdb 100644
--- a/inc/hgl/graph/VKCommandBuffer.h
+++ b/inc/hgl/graph/VKCommandBuffer.h
@@ -3,7 +3,7 @@
 
 #include<hgl/graph/VK.h>
 #include<hgl/graph/VKPipeline.h>
-#include<hgl/graph/VKDescriptorSets.h>
+#include<hgl/graph/VKDescriptorSet.h>
 #include<hgl/type/Color4f.h>
 VK_NAMESPACE_BEGIN
 class GPUCmdBuffer
diff --git a/inc/hgl/graph/VKDescriptorSets.h b/inc/hgl/graph/VKDescriptorSet.h
similarity index 100%
rename from inc/hgl/graph/VKDescriptorSets.h
rename to inc/hgl/graph/VKDescriptorSet.h
diff --git a/inc/hgl/graph/VKMaterialParameters.h b/inc/hgl/graph/VKMaterialParameters.h
index 42de23a5..8131fcf8 100644
--- a/inc/hgl/graph/VKMaterialParameters.h
+++ b/inc/hgl/graph/VKMaterialParameters.h
@@ -3,7 +3,7 @@
 
 #include<hgl/graph/VK.h>
 #include<hgl/type/String.h>
-#include<hgl/graph/VKDescriptorSets.h>
+#include<hgl/graph/VKDescriptorSet.h>
 VK_NAMESPACE_BEGIN
 class MaterialParameters
 {
diff --git a/inc/hgl/graph/VKRenderResource.h b/inc/hgl/graph/VKRenderResource.h
index bfed93a8..539fe6c9 100644
--- a/inc/hgl/graph/VKRenderResource.h
+++ b/inc/hgl/graph/VKRenderResource.h
@@ -3,7 +3,7 @@
 
 #include<hgl/graph/VKMaterial.h>
 #include<hgl/graph/VKPipeline.h>
-#include<hgl/graph/VKDescriptorSets.h>
+#include<hgl/graph/VKDescriptorSet.h>
 #include<hgl/graph/VKPrimitive.h>
 #include<hgl/graph/VKBuffer.h>
 #include<hgl/graph/VKSampler.h>
diff --git a/inc/hgl/graph/VKRenderable.h b/inc/hgl/graph/VKRenderable.h
index 7cc88d66..4d880614 100644
--- a/inc/hgl/graph/VKRenderable.h
+++ b/inc/hgl/graph/VKRenderable.h
@@ -3,7 +3,7 @@
 
 #include<hgl/graph/VKPrimitive.h>
 #include<hgl/graph/VKPipeline.h>
-#include<hgl/graph/VKDescriptorSets.h>
+#include<hgl/graph/VKDescriptorSet.h>
 #include<hgl/graph/VKMaterial.h>
 #include<hgl/graph/VKMaterialParameters.h>
 #include<hgl/graph/VKMaterialInstance.h>
diff --git a/src/SceneGraph/CMakeLists.txt b/src/SceneGraph/CMakeLists.txt
index 0ad3f227..8cc0bb09 100644
--- a/src/SceneGraph/CMakeLists.txt
+++ b/src/SceneGraph/CMakeLists.txt
@@ -157,8 +157,8 @@ SOURCE_GROUP("Vulkan\\Device\\Memory"           FILES ${VK_MEMORY_SOURCE})
 SOURCE_GROUP("Vulkan\\Device\\Texture"          FILES ${VK_DEVICE_TEXTURE_SOURCE})
 SOURCE_GROUP("Vulkan\\Device\\Texture\\Loader"  FILES ${VK_TEXTURE_LOADER_SOURCE})
 
-SET(VK_DESCRIPTOR_SETS_SOURCE   ${SG_INCLUDE_PATH}/VKDescriptorSets.h
-                                Vulkan/VKDescriptorSets.cpp
+SET(VK_DESCRIPTOR_SETS_SOURCE   ${SG_INCLUDE_PATH}/VKDescriptorSet.h
+                                Vulkan/VKDescriptorSet.cpp
                                 Vulkan/VKPipelineLayoutData.h                                
                                 Vulkan/VKPipelineLayoutData.cpp)
 
diff --git a/src/SceneGraph/Vulkan/VKDescriptorSets.cpp b/src/SceneGraph/Vulkan/VKDescriptorSet.cpp
similarity index 99%
rename from src/SceneGraph/Vulkan/VKDescriptorSets.cpp
rename to src/SceneGraph/Vulkan/VKDescriptorSet.cpp
index f0e582c5..81ca4ffd 100644
--- a/src/SceneGraph/Vulkan/VKDescriptorSets.cpp
+++ b/src/SceneGraph/Vulkan/VKDescriptorSet.cpp
@@ -1,4 +1,4 @@
-#include<hgl/graph/VKDescriptorSets.h>
+#include<hgl/graph/VKDescriptorSet.h>
 #include<hgl/graph/VKDevice.h>
 #include<hgl/graph/VKBuffer.h>
 #include<hgl/graph/VKTexture.h>
diff --git a/src/SceneGraph/Vulkan/VKDevice.cpp b/src/SceneGraph/Vulkan/VKDevice.cpp
index eaea650d..22043ad1 100644
--- a/src/SceneGraph/Vulkan/VKDevice.cpp
+++ b/src/SceneGraph/Vulkan/VKDevice.cpp
@@ -7,7 +7,7 @@
 #include<hgl/graph/VKCommandBuffer.h>
 #include<hgl/graph/VKRenderPass.h>
 #include<hgl/graph/VKFramebuffer.h>
-#include<hgl/graph/VKDescriptorSets.h>
+#include<hgl/graph/VKDescriptorSet.h>
 #include<hgl/graph/VKDeviceRenderPassManage.h>
 
 VK_NAMESPACE_BEGIN
diff --git a/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp b/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp
index 083c3d76..ea2342a7 100644
--- a/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp
+++ b/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp
@@ -2,7 +2,7 @@
 #include<hgl/graph/VKMaterial.h>
 #include<hgl/graph/VKMaterialDescriptorSets.h>
 #include<hgl/graph/VKMaterialParameters.h>
-#include<hgl/graph/VKDescriptorSets.h>
+#include<hgl/graph/VKDescriptorSet.h>
 #include<hgl/graph/VKShaderModuleMap.h>
 #include<hgl/graph/VKVertexInputLayout.h>
 #include"VKPipelineLayoutData.h"
diff --git a/src/SceneGraph/Vulkan/VKMaterialParameters.cpp b/src/SceneGraph/Vulkan/VKMaterialParameters.cpp
index cba28583..4ad77942 100644
--- a/src/SceneGraph/Vulkan/VKMaterialParameters.cpp
+++ b/src/SceneGraph/Vulkan/VKMaterialParameters.cpp
@@ -1,7 +1,7 @@
 #include<hgl/graph/VKMaterialParameters.h>
 #include<hgl/graph/VKMaterialDescriptorSets.h>
 #include<hgl/graph/VKMaterial.h>
-#include<hgl/graph/VKDescriptorSets.h>
+#include<hgl/graph/VKDescriptorSet.h>
 
 VK_NAMESPACE_BEGIN
 MaterialParameters::MaterialParameters(const MaterialDescriptorSets *_mds,const DescriptorSetsType &type,DescriptorSet *ds)
diff --git a/src/SceneGraph/Vulkan/VKPipelineLayoutData.cpp b/src/SceneGraph/Vulkan/VKPipelineLayoutData.cpp
index 60cecab8..13c55d0b 100644
--- a/src/SceneGraph/Vulkan/VKPipelineLayoutData.cpp
+++ b/src/SceneGraph/Vulkan/VKPipelineLayoutData.cpp
@@ -1,5 +1,5 @@
 #include"VKPipelineLayoutData.h"
-#include<hgl/graph/VKDescriptorSets.h>
+#include<hgl/graph/VKDescriptorSet.h>
 #include<hgl/graph/VKDevice.h>
 #include<hgl/graph/VKMaterialDescriptorSets.h>