diff --git a/CMSceneGraph b/CMSceneGraph index 1e711048..809fa8d4 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 1e71104806a845a3a81414d2f2a05ea2e29c5d2b +Subproject commit 809fa8d4c73a810233e3ba6dd8c42a421a3ca9e9 diff --git a/inc/hgl/graph/VKMaterialParameters.h b/inc/hgl/graph/VKMaterialParameters.h index e1a0d4bb..24d9074f 100644 --- a/inc/hgl/graph/VKMaterialParameters.h +++ b/inc/hgl/graph/VKMaterialParameters.h @@ -35,7 +35,7 @@ public: MP_TYPE_IS(Skeleton) MP_TYPE_IS(Instance) MP_TYPE_IS(PerObject) - MP_TYPE_IS(PerMaterialInstance) + MP_TYPE_IS(PerMaterial) MP_TYPE_IS(PerFrame) MP_TYPE_IS(Global) #undef MP_TYPE_IS diff --git a/src/SceneGraph/Vulkan/VKMaterialInstance.cpp b/src/SceneGraph/Vulkan/VKMaterialInstance.cpp index 40205258..5fdcf473 100644 --- a/src/SceneGraph/Vulkan/VKMaterialInstance.cpp +++ b/src/SceneGraph/Vulkan/VKMaterialInstance.cpp @@ -23,7 +23,7 @@ MaterialInstance::MaterialInstance(Material *mtl,VIL *v) vil=v; - mp_per_mi=mtl->GetMP(DescriptorSetType::PerMaterialInstance); + mp_per_mi=mtl->GetMP(DescriptorSetType::PerMaterial); } bool MaterialInstance::BindUBO(const DescriptorSetType &type,const AnsiString &name,DeviceBuffer *ubo,bool dynamic) diff --git a/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp b/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp index 897e7adb..e573742f 100644 --- a/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp +++ b/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp @@ -56,7 +56,7 @@ void LoadShaderDescriptor(io::ConstBufferReader &cbr,ShaderDescriptor *sd_list,c if(ver==2) //以下是旧的,未来不用了,现仅保证能运行 { if(sd->name[0]=='g')sd->set_type=DescriptorSetType::Global;else - if(sd->name[0]=='m')sd->set_type=DescriptorSetType::PerMaterialInstance;else + if(sd->name[0]=='m')sd->set_type=DescriptorSetType::PerMaterial;else if(sd->name[0]=='r')sd->set_type=DescriptorSetType::PerObject;else sd->set_type=DescriptorSetType::PerFrame; } diff --git a/src/SceneGraph/font/TextRender.cpp b/src/SceneGraph/font/TextRender.cpp index 2f411068..4dd9d9a1 100644 --- a/src/SceneGraph/font/TextRender.cpp +++ b/src/SceneGraph/font/TextRender.cpp @@ -109,7 +109,7 @@ namespace hgl } { - MaterialParameters *mp=material_instance->GetMP(DescriptorSetType::PerMaterialInstance); + MaterialParameters *mp=material_instance->GetMP(DescriptorSetType::PerMaterial); if(!mp) return(false); diff --git a/src/ShaderGen/MaterialCreater.cpp b/src/ShaderGen/MaterialCreater.cpp index b2d7debd..425ff599 100644 --- a/src/ShaderGen/MaterialCreater.cpp +++ b/src/ShaderGen/MaterialCreater.cpp @@ -252,7 +252,6 @@ public: };//class MaterialCreater #ifdef _DEBUG - bool PureColorMaterial() { MaterialCreater mc(1); //一个新材质,1个RT输出,默认使用Vertex/Fragment shader @@ -282,7 +281,7 @@ bool PureColorMaterial() layout(set=SET_PerMI,binding=?) uniform ColorMaterial mtl; */ mc.AddUBO( VK_SHADER_STAGE_FRAGMENT_BIT, //这个UBO出现在fragment shader - DescriptorSetType::PerMaterialInstance, //它属于材质实例合集 + DescriptorSetType::PerMaterial, //它属于材质合集 "ColorMaterial", //UBO名称为ColorMaterial "mtl"); //UBO变量名称为mtl