hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use VKDescriptorSet instead of VKDescriptorSets

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2023-02-13 11:50:55 +08:00
parent 251d851f65
commit b8a83a25eb
12 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/common/VulkanAppFramework.h
View File

@ -8,7 +8,7 @@
#include<hgl/graph/VKShaderModule.h> #include<hgl/graph/VKShaderModule.h>
#include<hgl/graph/VKImageView.h> #include<hgl/graph/VKImageView.h>
#include<hgl/graph/VKPrimitive.h> #include<hgl/graph/VKPrimitive.h>
#include<hgl/graph/VKDescriptorSets.h> #include<hgl/graph/VKDescriptorSet.h>
#include<hgl/graph/VKRenderPass.h> #include<hgl/graph/VKRenderPass.h>
#include<hgl/graph/VKPipeline.h> #include<hgl/graph/VKPipeline.h>
#include<hgl/graph/VKCommandBuffer.h> #include<hgl/graph/VKCommandBuffer.h>

2
inc/hgl/graph/VKCommandBuffer.h
View File

@ -3,7 +3,7 @@
#include<hgl/graph/VK.h> #include<hgl/graph/VK.h>
#include<hgl/graph/VKPipeline.h> #include<hgl/graph/VKPipeline.h>
#include<hgl/graph/VKDescriptorSets.h> #include<hgl/graph/VKDescriptorSet.h>
#include<hgl/type/Color4f.h> #include<hgl/type/Color4f.h>
VK_NAMESPACE_BEGIN VK_NAMESPACE_BEGIN
class GPUCmdBuffer class GPUCmdBuffer

0
inc/hgl/graph/VKDescriptorSets.h → inc/hgl/graph/VKDescriptorSet.h
View File

2
inc/hgl/graph/VKMaterialParameters.h
View File

@ -3,7 +3,7 @@
#include<hgl/graph/VK.h> #include<hgl/graph/VK.h>
#include<hgl/type/String.h> #include<hgl/type/String.h>
#include<hgl/graph/VKDescriptorSets.h> #include<hgl/graph/VKDescriptorSet.h>
VK_NAMESPACE_BEGIN VK_NAMESPACE_BEGIN
class MaterialParameters class MaterialParameters
{ {

2
inc/hgl/graph/VKRenderResource.h
View File

@ -3,7 +3,7 @@
#include<hgl/graph/VKMaterial.h> #include<hgl/graph/VKMaterial.h>
#include<hgl/graph/VKPipeline.h> #include<hgl/graph/VKPipeline.h>
#include<hgl/graph/VKDescriptorSets.h> #include<hgl/graph/VKDescriptorSet.h>
#include<hgl/graph/VKPrimitive.h> #include<hgl/graph/VKPrimitive.h>
#include<hgl/graph/VKBuffer.h> #include<hgl/graph/VKBuffer.h>
#include<hgl/graph/VKSampler.h> #include<hgl/graph/VKSampler.h>

2
inc/hgl/graph/VKRenderable.h
View File

@ -3,7 +3,7 @@
#include<hgl/graph/VKPrimitive.h> #include<hgl/graph/VKPrimitive.h>
#include<hgl/graph/VKPipeline.h> #include<hgl/graph/VKPipeline.h>
#include<hgl/graph/VKDescriptorSets.h> #include<hgl/graph/VKDescriptorSet.h>
#include<hgl/graph/VKMaterial.h> #include<hgl/graph/VKMaterial.h>
#include<hgl/graph/VKMaterialParameters.h> #include<hgl/graph/VKMaterialParameters.h>
#include<hgl/graph/VKMaterialInstance.h> #include<hgl/graph/VKMaterialInstance.h>

4
src/SceneGraph/CMakeLists.txt
View File

@ -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" FILES ${VK_DEVICE_TEXTURE_SOURCE})
SOURCE_GROUP("Vulkan\\Device\\Texture\\Loader" FILES ${VK_TEXTURE_LOADER_SOURCE}) SOURCE_GROUP("Vulkan\\Device\\Texture\\Loader" FILES ${VK_TEXTURE_LOADER_SOURCE})
SET(VK_DESCRIPTOR_SETS_SOURCE ${SG_INCLUDE_PATH}/VKDescriptorSets.h SET(VK_DESCRIPTOR_SETS_SOURCE ${SG_INCLUDE_PATH}/VKDescriptorSet.h
Vulkan/VKDescriptorSets.cpp Vulkan/VKDescriptorSet.cpp
Vulkan/VKPipelineLayoutData.h Vulkan/VKPipelineLayoutData.h
Vulkan/VKPipelineLayoutData.cpp) Vulkan/VKPipelineLayoutData.cpp)

2
src/SceneGraph/Vulkan/VKDescriptorSets.cpp → src/SceneGraph/Vulkan/VKDescriptorSet.cpp
View File

@ -1,4 +1,4 @@
#include<hgl/graph/VKDescriptorSets.h> #include<hgl/graph/VKDescriptorSet.h>
#include<hgl/graph/VKDevice.h> #include<hgl/graph/VKDevice.h>
#include<hgl/graph/VKBuffer.h> #include<hgl/graph/VKBuffer.h>
#include<hgl/graph/VKTexture.h> #include<hgl/graph/VKTexture.h>

2
src/SceneGraph/Vulkan/VKDevice.cpp
View File

@ -7,7 +7,7 @@
#include<hgl/graph/VKCommandBuffer.h> #include<hgl/graph/VKCommandBuffer.h>
#include<hgl/graph/VKRenderPass.h> #include<hgl/graph/VKRenderPass.h>
#include<hgl/graph/VKFramebuffer.h> #include<hgl/graph/VKFramebuffer.h>
#include<hgl/graph/VKDescriptorSets.h> #include<hgl/graph/VKDescriptorSet.h>
#include<hgl/graph/VKDeviceRenderPassManage.h> #include<hgl/graph/VKDeviceRenderPassManage.h>
VK_NAMESPACE_BEGIN VK_NAMESPACE_BEGIN

2
src/SceneGraph/Vulkan/VKDeviceMaterial.cpp
View File

@ -2,7 +2,7 @@
#include<hgl/graph/VKMaterial.h> #include<hgl/graph/VKMaterial.h>
#include<hgl/graph/VKMaterialDescriptorSets.h> #include<hgl/graph/VKMaterialDescriptorSets.h>
#include<hgl/graph/VKMaterialParameters.h> #include<hgl/graph/VKMaterialParameters.h>
#include<hgl/graph/VKDescriptorSets.h> #include<hgl/graph/VKDescriptorSet.h>
#include<hgl/graph/VKShaderModuleMap.h> #include<hgl/graph/VKShaderModuleMap.h>
#include<hgl/graph/VKVertexInputLayout.h> #include<hgl/graph/VKVertexInputLayout.h>
#include"VKPipelineLayoutData.h" #include"VKPipelineLayoutData.h"

2
src/SceneGraph/Vulkan/VKMaterialParameters.cpp
View File

@ -1,7 +1,7 @@
#include<hgl/graph/VKMaterialParameters.h> #include<hgl/graph/VKMaterialParameters.h>
#include<hgl/graph/VKMaterialDescriptorSets.h> #include<hgl/graph/VKMaterialDescriptorSets.h>
#include<hgl/graph/VKMaterial.h> #include<hgl/graph/VKMaterial.h>
#include<hgl/graph/VKDescriptorSets.h> #include<hgl/graph/VKDescriptorSet.h>
VK_NAMESPACE_BEGIN VK_NAMESPACE_BEGIN
MaterialParameters::MaterialParameters(const MaterialDescriptorSets *_mds,const DescriptorSetsType &type,DescriptorSet *ds) MaterialParameters::MaterialParameters(const MaterialDescriptorSets *_mds,const DescriptorSetsType &type,DescriptorSet *ds)

2
src/SceneGraph/Vulkan/VKPipelineLayoutData.cpp
View File

@ -1,5 +1,5 @@
#include"VKPipelineLayoutData.h" #include"VKPipelineLayoutData.h"
#include<hgl/graph/VKDescriptorSets.h> #include<hgl/graph/VKDescriptorSet.h>
#include<hgl/graph/VKDevice.h> #include<hgl/graph/VKDevice.h>
#include<hgl/graph/VKMaterialDescriptorSets.h> #include<hgl/graph/VKMaterialDescriptorSets.h>