diff --git a/CMCore b/CMCore index dcaf7f89..081c7fd9 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit dcaf7f89602ecc24a377bc16f22f074718fb5162 +Subproject commit 081c7fd931f5504fc6fa9177e812f7810bdbb93a diff --git a/CMSceneGraph b/CMSceneGraph index 09370010..125f0a6d 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 09370010d0dc1082db31b535b540521272bb4d7e +Subproject commit 125f0a6d1a6b0471feb89dd8706d71ec71041c06 diff --git a/inc/hgl/graph/VertexAttribData.h b/inc/hgl/graph/VertexAttribData.h index 6c741bed..b35d563a 100644 --- a/inc/hgl/graph/VertexAttribData.h +++ b/inc/hgl/graph/VertexAttribData.h @@ -52,7 +52,7 @@ namespace hgl * @param vecsize vec数量 * @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 hgl #endif//HGL_GRAPH_VERTEX_ATTRIB_DATA_INCLUDE diff --git a/src/SceneGraph/VertexAttribData.cpp b/src/SceneGraph/VertexAttribData.cpp index 63716eca..97017154 100644 --- a/src/SceneGraph/VertexAttribData.cpp +++ b/src/SceneGraph/VertexAttribData.cpp @@ -4,12 +4,12 @@ namespace hgl { 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; uint32_t stride; - if(!vulkan::GetVulkanFormatStrideBySPIRType(fmt,stride,base_type,vecsize)) + if(!vulkan::GetVulkanFormatStride(fmt,stride,base_type,vecsize)) return(nullptr); return(new VertexAttribData(vertex_count,vecsize,stride,fmt)); diff --git a/src/SceneGraph/shader/ShaderResource.cpp b/src/SceneGraph/shader/ShaderResource.cpp index d3a46a55..5b2c3c53 100644 --- a/src/SceneGraph/shader/ShaderResource.cpp +++ b/src/SceneGraph/shader/ShaderResource.cpp @@ -39,7 +39,7 @@ VK_NAMESPACE_BEGIN ss->base_type=*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++; ss->name.SetString((char *)data,str_len);