diff --git a/inc/hgl/graph/shader/ShaderResource.h b/inc/hgl/graph/shader/ShaderResource.h index 265fd9ab..29871d28 100644 --- a/inc/hgl/graph/shader/ShaderResource.h +++ b/inc/hgl/graph/shader/ShaderResource.h @@ -2,7 +2,7 @@ #include #include #include -#include +#include VK_NAMESPACE_BEGIN struct ShaderStage @@ -10,7 +10,7 @@ VK_NAMESPACE_BEGIN AnsiString name; uint location; - uint base_type; ///<基本类型(如vec4中的vec) + BaseType base_type; ///<基本类型(如vec4中的vec) uint component; ///<成份数量(如vec4中的4) VkFormat format; ///<对应的Vulkan格式(如vec4对应的FMT_RGBA32F) diff --git a/src/SceneGraph/shader/ShaderResource.cpp b/src/SceneGraph/shader/ShaderResource.cpp index 5b2c3c53..a5bb7ae9 100644 --- a/src/SceneGraph/shader/ShaderResource.cpp +++ b/src/SceneGraph/shader/ShaderResource.cpp @@ -36,7 +36,7 @@ VK_NAMESPACE_BEGIN ss=new ShaderStage; ss->location=*data++; - ss->base_type=*data++; + ss->base_type=(VK_NAMESPACE::BaseType)*data++; ss->component=*data++; VK_NAMESPACE::GetVulkanFormatStride(ss->format,ss->stride,ss->base_type,ss->component);