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

add NativeValue define.

Browse Source
This commit is contained in:
hyzboy 2019-12-27 19:31:42 +08:00
parent e2810f7d7d
commit 909dbb0fd9
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMCore

@ -1 +1 @@
Subproject commit 5b4fd62f15a39789626505480d3b0926f8407583 Subproject commit 7152bd677cfc4ea0b33b21b49895e5e049e1b0bd

2
CMPlatform

@ -1 +1 @@
Subproject commit ddf56c70160fcb96b12af58beceed22e1a1a1aea Subproject commit e12b8a9e5c5a65b4662a4c02fb5c7c67558a4490

13
inc/hgl/graph/shader/node/node.h
View File

@ -86,5 +86,18 @@ public: //产生代码相关
virtual bool GenTempValueDefine(UTF8StringList &); ///<产生临时变量定义 virtual bool GenTempValueDefine(UTF8StringList &); ///<产生临时变量定义
virtual bool GenCode(UTF8StringList &); virtual bool GenCode(UTF8StringList &);
};//class Node };//class Node
/**
* GLSL原生变量
*/
template<typename T> class NativeValue:public Node
{
public:
NativeValue(const NodeType &nt,const UTF8String &n):Node(nt,n){}
virtual ~NativeValue()=default;
};//template<typename T> class NativeValue:public Node
END_SHADER_NODE_NAMESPACE END_SHADER_NODE_NAMESPACE
#endif//HGL_GRAPH_SHADER_NODE_INCLUDE #endif//HGL_GRAPH_SHADER_NODE_INCLUDE

2
src/RenderDevice/Vulkan/VKDescriptorSets.cpp
View File

@ -70,7 +70,7 @@ bool DescriptorSets::BindSampler(const int binding,Texture *tex,Sampler *sampler
VkWriteDescriptorSet writeDescriptorSet; VkWriteDescriptorSet writeDescriptorSet;
writeDescriptorSet.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; writeDescriptorSet.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
writeDescriptorSet.pNext = nullptr; writeDescriptorSet.pNext = nullptr;
writeDescriptorSet.dstSet = desc_set; writeDescriptorSet.dstSet = desc_set;
writeDescriptorSet.dstBinding = binding; writeDescriptorSet.dstBinding = binding;