renamed to SortedSet instead of SortedSets
This commit is contained in:
parent
6c6e1c1a8d
commit
1543ed8952
2
CMCore
2
CMCore
@ -1 +1 @@
|
|||||||
Subproject commit 6316f3cd59aa749ca31226f82fc764dd77ac40ff
|
Subproject commit 43bc9af0200846ce3f31fe97d963009e6b199f38
|
@ -1 +1 @@
|
|||||||
Subproject commit 9ff596c42437ada641f62b4d0d2bfae535638666
|
Subproject commit c958a6cb2ac4a52716eabc1c45eba184f4c7e46c
|
@ -2,7 +2,7 @@
|
|||||||
#define HGL_GRAPH_RENDER_NODE_INCLUDE
|
#define HGL_GRAPH_RENDER_NODE_INCLUDE
|
||||||
|
|
||||||
#include<hgl/graph/VK.h>
|
#include<hgl/graph/VK.h>
|
||||||
#include<hgl/type/SortedSets.h>
|
#include<hgl/type/SortedSet.h>
|
||||||
namespace hgl
|
namespace hgl
|
||||||
{
|
{
|
||||||
namespace graph
|
namespace graph
|
||||||
@ -27,7 +27,7 @@ namespace hgl
|
|||||||
using RenderNodeList=List<RenderNode>;
|
using RenderNodeList=List<RenderNode>;
|
||||||
using RenderNodePointerList=List<RenderNode *>;
|
using RenderNodePointerList=List<RenderNode *>;
|
||||||
|
|
||||||
using MaterialInstanceSets=SortedSets<MaterialInstance *>; ///<材质实例集合
|
using MaterialInstanceSets=SortedSet<MaterialInstance *>; ///<材质实例集合
|
||||||
}//namespace graph
|
}//namespace graph
|
||||||
}//namespace hgl
|
}//namespace hgl
|
||||||
#endif//HGL_GRAPH_RENDER_NODE_INCLUDE
|
#endif//HGL_GRAPH_RENDER_NODE_INCLUDE
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
#include<hgl/graph/BlendMode.h>
|
#include<hgl/graph/BlendMode.h>
|
||||||
#include<hgl/graph/RenderBufferName.h>
|
#include<hgl/graph/RenderBufferName.h>
|
||||||
#include<hgl/type/SortedSets.h>
|
#include<hgl/type/SortedSet.h>
|
||||||
|
|
||||||
VK_NAMESPACE_BEGIN
|
VK_NAMESPACE_BEGIN
|
||||||
|
|
||||||
@ -24,7 +24,7 @@ struct RenderWorkConfig
|
|||||||
BlendMode blend_mode;
|
BlendMode blend_mode;
|
||||||
RenderOrder render_order;
|
RenderOrder render_order;
|
||||||
|
|
||||||
SortedSets<RENDER_BUFFER_NAME> output_buffer;
|
SortedSet<RENDER_BUFFER_NAME> output_buffer;
|
||||||
};//struct RenderWorkConfig;
|
};//struct RenderWorkConfig;
|
||||||
|
|
||||||
VK_NAMESPACE_END
|
VK_NAMESPACE_END
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
#include<hgl/graph/VK.h>
|
#include<hgl/graph/VK.h>
|
||||||
#include<hgl/type/Map.h>
|
#include<hgl/type/Map.h>
|
||||||
#include<hgl/type/ObjectList.h>
|
#include<hgl/type/ObjectList.h>
|
||||||
#include<hgl/type/SortedSets.h>
|
#include<hgl/type/SortedSet.h>
|
||||||
VK_NAMESPACE_BEGIN
|
VK_NAMESPACE_BEGIN
|
||||||
class DeviceBuffer;
|
class DeviceBuffer;
|
||||||
|
|
||||||
@ -20,7 +20,7 @@ class DescriptorSet
|
|||||||
ObjectList<VkDescriptorImageInfo> image_list;
|
ObjectList<VkDescriptorImageInfo> image_list;
|
||||||
List<VkWriteDescriptorSet> wds_list;
|
List<VkWriteDescriptorSet> wds_list;
|
||||||
|
|
||||||
SortedSets<uint32_t> binded_sets;
|
SortedSet<uint32_t> binded_sets;
|
||||||
|
|
||||||
bool is_dirty;
|
bool is_dirty;
|
||||||
|
|
||||||
|
@ -95,6 +95,6 @@ public:
|
|||||||
MaterialInstance *CreateMI(const VILConfig *vil_cfg=nullptr);
|
MaterialInstance *CreateMI(const VILConfig *vil_cfg=nullptr);
|
||||||
};//class Material
|
};//class Material
|
||||||
|
|
||||||
using MaterialSets=SortedSets<Material *>;
|
using MaterialSets=SortedSet<Material *>;
|
||||||
VK_NAMESPACE_END
|
VK_NAMESPACE_END
|
||||||
#endif//HGL_GRAPH_VULKAN_MATERIAL_INCLUDE
|
#endif//HGL_GRAPH_VULKAN_MATERIAL_INCLUDE
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
#include<hgl/graph/VK.h>
|
#include<hgl/graph/VK.h>
|
||||||
#include<hgl/type/String.h>
|
#include<hgl/type/String.h>
|
||||||
#include<hgl/type/SortedSets.h>
|
#include<hgl/type/SortedSet.h>
|
||||||
|
|
||||||
VK_NAMESPACE_BEGIN
|
VK_NAMESPACE_BEGIN
|
||||||
class GPUPhysicalDevice
|
class GPUPhysicalDevice
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
#include<hgl/graph/VK.h>
|
#include<hgl/graph/VK.h>
|
||||||
#include<hgl/graph/VKVertexInputLayout.h>
|
#include<hgl/graph/VKVertexInputLayout.h>
|
||||||
#include<hgl/type/SortedSets.h>
|
#include<hgl/type/SortedSet.h>
|
||||||
|
|
||||||
VK_NAMESPACE_BEGIN
|
VK_NAMESPACE_BEGIN
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
#define HGL_GUI_LAYOUT_INCLUDE
|
#define HGL_GUI_LAYOUT_INCLUDE
|
||||||
|
|
||||||
#include<hgl/gui/Widget.h>
|
#include<hgl/gui/Widget.h>
|
||||||
#include<hgl/type/SortedSets.h>
|
#include<hgl/type/SortedSet.h>
|
||||||
namespace hgl
|
namespace hgl
|
||||||
{
|
{
|
||||||
namespace gui
|
namespace gui
|
||||||
@ -14,7 +14,7 @@ namespace hgl
|
|||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
SortedSets<Widget *> widgets_set;
|
SortedSet<Widget *> widgets_set;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#include<hgl/graph/VK.h>
|
#include<hgl/graph/VK.h>
|
||||||
#include<hgl/graph/VKDescriptorSetType.h>
|
#include<hgl/graph/VKDescriptorSetType.h>
|
||||||
#include<hgl/type/Map.h>
|
#include<hgl/type/Map.h>
|
||||||
#include<hgl/type/SortedSets.h>
|
#include<hgl/type/SortedSet.h>
|
||||||
VK_NAMESPACE_BEGIN
|
VK_NAMESPACE_BEGIN
|
||||||
struct PipelineLayoutData
|
struct PipelineLayoutData
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user