From a19c7dbd96f761074088437500747033dfea978d Mon Sep 17 00:00:00 2001 From: hyzboy Date: Sat, 25 Jul 2020 14:56:40 +0800 Subject: [PATCH] update SPIRBaseType --- CMSceneGraph | 2 +- inc/hgl/graph/VertexAttribData.h | 4 ++-- src/SceneGraph/VertexAttribData.cpp | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CMSceneGraph b/CMSceneGraph index 763c2784..09370010 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 763c27844434485445099281bac163833934c4d3 +Subproject commit 09370010d0dc1082db31b535b540521272bb4d7e diff --git a/inc/hgl/graph/VertexAttribData.h b/inc/hgl/graph/VertexAttribData.h index 9dd86667..6c741bed 100644 --- a/inc/hgl/graph/VertexAttribData.h +++ b/inc/hgl/graph/VertexAttribData.h @@ -48,11 +48,11 @@ namespace hgl /** * 根据格式要求,创建对应的顶点属性数据区(VAD) - * @param base_type 基础格式,参见spirv_cross/spirv_common.hpp中的spirv_cross::SPIRType + * @param base_type 基础格式 * @param vecsize vec数量 * @param vertex_count 顶点数量 */ - VertexAttribData *CreateVertexAttribData(const uint32_t base_type,const uint32_t vecsize,const uint32_t vertex_count); + VertexAttribData *CreateVertexAttribData(const vulkan::SPIRBaseType 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 b90307f6..63716eca 100644 --- a/src/SceneGraph/VertexAttribData.cpp +++ b/src/SceneGraph/VertexAttribData.cpp @@ -1,11 +1,10 @@ #include -#include namespace hgl { namespace graph { - VertexAttribData *CreateVertexAttribData(const uint32_t base_type,const uint32_t vecsize,const uint32_t vertex_count) + VertexAttribData *CreateVertexAttribData(const vulkan::SPIRBaseType base_type,const uint32_t vecsize,const uint32_t vertex_count) { VkFormat fmt; uint32_t stride;