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

update function name

Browse Source
This commit is contained in:
hyzboy 2020-07-25 15:15:23 +08:00
parent ae03b4ad68
commit 8669ed77d0
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMCore

@ -1 +1 @@
Subproject commit dcaf7f89602ecc24a377bc16f22f074718fb5162 Subproject commit 081c7fd931f5504fc6fa9177e812f7810bdbb93a

2
CMSceneGraph

@ -1 +1 @@
Subproject commit 09370010d0dc1082db31b535b540521272bb4d7e Subproject commit 125f0a6d1a6b0471feb89dd8706d71ec71041c06

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

@ -52,7 +52,7 @@ namespace hgl
* @param vecsize vec数量 * @param vecsize vec数量
* @param vertex_count 顶点数量 * @param vertex_count 顶点数量
*/ */
VertexAttribData *CreateVertexAttribData(const vulkan::SPIRBaseType base_type,const uint32_t vecsize,const uint32_t vertex_count); VertexAttribData *CreateVertexAttribData(const vulkan::BaseType base_type,const uint32_t vecsize,const uint32_t vertex_count);
}//namespace graph }//namespace graph
}//namespace hgl }//namespace hgl
#endif//HGL_GRAPH_VERTEX_ATTRIB_DATA_INCLUDE #endif//HGL_GRAPH_VERTEX_ATTRIB_DATA_INCLUDE

4
src/SceneGraph/VertexAttribData.cpp
View File

@ -4,12 +4,12 @@ namespace hgl
{ {
namespace graph namespace graph
{ {
VertexAttribData *CreateVertexAttribData(const vulkan::SPIRBaseType base_type,const uint32_t vecsize,const uint32_t vertex_count) VertexAttribData *CreateVertexAttribData(const vulkan::BaseType base_type,const uint32_t vecsize,const uint32_t vertex_count)
{ {
VkFormat fmt; VkFormat fmt;
uint32_t stride; uint32_t stride;
if(!vulkan::GetVulkanFormatStrideBySPIRType(fmt,stride,base_type,vecsize)) if(!vulkan::GetVulkanFormatStride(fmt,stride,base_type,vecsize))
return(nullptr); return(nullptr);
return(new VertexAttribData(vertex_count,vecsize,stride,fmt)); return(new VertexAttribData(vertex_count,vecsize,stride,fmt));

2
src/SceneGraph/shader/ShaderResource.cpp
View File

@ -39,7 +39,7 @@ VK_NAMESPACE_BEGIN
ss->base_type=*data++; ss->base_type=*data++;
ss->component=*data++; ss->component=*data++;
VK_NAMESPACE::GetVulkanFormatStrideBySPIRType(ss->format,ss->stride,ss->base_type,ss->component); VK_NAMESPACE::GetVulkanFormatStride(ss->format,ss->stride,ss->base_type,ss->component);
str_len=*data++; str_len=*data++;
ss->name.SetString((char *)data,str_len); ss->name.SetString((char *)data,str_len);