diff --git a/inc/hgl/graph/VKMaterialInstance.h b/inc/hgl/graph/VKMaterialInstance.h index 2d06dc0c..1d6a6d9f 100644 --- a/inc/hgl/graph/VKMaterialInstance.h +++ b/inc/hgl/graph/VKMaterialInstance.h @@ -73,7 +73,7 @@ public: const int GetMIID ()const{return mi_id;} ///<取得材质实例ID void * GetMIData (){return material->GetMIData(mi_id);} ///<取得材质实例数据 - void WriteMIData (const void *data,const int size); ///<写入材质实例数据 + void WriteMIData (const void *data,const uint32 size); ///<写入材质实例数据 template void WriteMIData (const T &data){WriteMIData(&data,sizeof(T));} ///<写入材质实例数据 diff --git a/src/SceneGraph/Vulkan/VKMaterialInstance.cpp b/src/SceneGraph/Vulkan/VKMaterialInstance.cpp index d79f4cef..9182da74 100644 --- a/src/SceneGraph/Vulkan/VKMaterialInstance.cpp +++ b/src/SceneGraph/Vulkan/VKMaterialInstance.cpp @@ -36,9 +36,9 @@ void *Material::GetMIData(int id) return mi_data_manager->GetData(id); } -void MaterialInstance::WriteMIData(const void *data,const int size) +void MaterialInstance::WriteMIData(const void *data,const uint32 size) { - if(!data||size<=0||size>material->GetMIDataBytes())return; + if(!data||!size||size>material->GetMIDataBytes())return; void *tp=GetMIData();