diff --git a/CMCore b/CMCore index 5b4fd62f..7152bd67 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 5b4fd62f15a39789626505480d3b0926f8407583 +Subproject commit 7152bd677cfc4ea0b33b21b49895e5e049e1b0bd diff --git a/CMPlatform b/CMPlatform index ddf56c70..e12b8a9e 160000 --- a/CMPlatform +++ b/CMPlatform @@ -1 +1 @@ -Subproject commit ddf56c70160fcb96b12af58beceed22e1a1a1aea +Subproject commit e12b8a9e5c5a65b4662a4c02fb5c7c67558a4490 diff --git a/inc/hgl/graph/shader/node/node.h b/inc/hgl/graph/shader/node/node.h index 205f01f4..b8373137 100644 --- a/inc/hgl/graph/shader/node/node.h +++ b/inc/hgl/graph/shader/node/node.h @@ -86,5 +86,18 @@ public: //产生代码相关 virtual bool GenTempValueDefine(UTF8StringList &); ///<产生临时变量定义 virtual bool GenCode(UTF8StringList &); };//class Node + +/** + * GLSL原生变量 + */ +template class NativeValue:public Node +{ +public: + + NativeValue(const NodeType &nt,const UTF8String &n):Node(nt,n){} + virtual ~NativeValue()=default; + + +};//template class NativeValue:public Node END_SHADER_NODE_NAMESPACE #endif//HGL_GRAPH_SHADER_NODE_INCLUDE diff --git a/src/RenderDevice/Vulkan/VKDescriptorSets.cpp b/src/RenderDevice/Vulkan/VKDescriptorSets.cpp index 7dd1399d..dbc2baa7 100644 --- a/src/RenderDevice/Vulkan/VKDescriptorSets.cpp +++ b/src/RenderDevice/Vulkan/VKDescriptorSets.cpp @@ -70,7 +70,7 @@ bool DescriptorSets::BindSampler(const int binding,Texture *tex,Sampler *sampler VkWriteDescriptorSet writeDescriptorSet; - writeDescriptorSet.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; + writeDescriptorSet.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; writeDescriptorSet.pNext = nullptr; writeDescriptorSet.dstSet = desc_set; writeDescriptorSet.dstBinding = binding;