From d456c2bf924ca0dd3e42dec6cb8f0ba55b25a2e4 Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Fri, 22 Sep 2023 01:31:04 +0800
Subject: [PATCH] used DescriptorSetType::MaterialInstance

---
 CMSceneGraph                          | 2 +-
 inc/hgl/graph/VKMaterialParameters.h  | 1 +
 src/SceneGraph/RenderAssignBuffer.cpp | 2 +-
 src/ShaderGen/2d/M_RectTexture2D.cpp  | 2 +-
 src/ShaderGen/MaterialCreateInfo.cpp  | 2 +-
 src/ShaderGen/ShaderCreateInfo.cpp    | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CMSceneGraph b/CMSceneGraph
index bde86e80..e37055e3 160000
--- a/CMSceneGraph
+++ b/CMSceneGraph
@@ -1 +1 @@
-Subproject commit bde86e8016713480cd102693708894ab3b6bfabb
+Subproject commit e37055e34e72ab5723a350037ec216ca7ee12cfb
diff --git a/inc/hgl/graph/VKMaterialParameters.h b/inc/hgl/graph/VKMaterialParameters.h
index f943b28e..2de75d44 100644
--- a/inc/hgl/graph/VKMaterialParameters.h
+++ b/inc/hgl/graph/VKMaterialParameters.h
@@ -34,6 +34,7 @@ public:
 
     #define MP_TYPE_IS(name)    const   bool is##name()const{return set_type==DescriptorSetType::name;}
         MP_TYPE_IS(Instance)
+        MP_TYPE_IS(MaterialInstance)
         MP_TYPE_IS(PerMaterial)
         MP_TYPE_IS(PerFrame)
         MP_TYPE_IS(Global)
diff --git a/src/SceneGraph/RenderAssignBuffer.cpp b/src/SceneGraph/RenderAssignBuffer.cpp
index 51605c23..dfb9c2b2 100644
--- a/src/SceneGraph/RenderAssignBuffer.cpp
+++ b/src/SceneGraph/RenderAssignBuffer.cpp
@@ -34,7 +34,7 @@ void RenderAssignBuffer::Bind(MaterialInstance *mi)const
     if(assign_binding_count<=0)return;
 
     mi->BindUBO(DescriptorSetType::PerFrame,mtl::SBS_LocalToWorld.name,ubo_l2w);
-    mi->BindUBO(DescriptorSetType::PerMaterial,mtl::SBS_MaterialInstance.name,ubo_mi);
+    mi->BindUBO(DescriptorSetType::MaterialInstance,mtl::SBS_MaterialInstance.name,ubo_mi);
 }
 
 void RenderAssignBuffer::Clear()
diff --git a/src/ShaderGen/2d/M_RectTexture2D.cpp b/src/ShaderGen/2d/M_RectTexture2D.cpp
index b6cb7d12..29b385b2 100644
--- a/src/ShaderGen/2d/M_RectTexture2D.cpp
+++ b/src/ShaderGen/2d/M_RectTexture2D.cpp
@@ -48,7 +48,7 @@ void main()
         ~MaterialRectTexture2D()=default;
 
         bool CustomVertexShader(ShaderCreateInfoVertex *vsc) override
-        {            
+        {
             {
                 RANGE_CHECK_RETURN_FALSE(cfg->coordinate_system)
 
diff --git a/src/ShaderGen/MaterialCreateInfo.cpp b/src/ShaderGen/MaterialCreateInfo.cpp
index c83d9ec0..09cb80ae 100644
--- a/src/ShaderGen/MaterialCreateInfo.cpp
+++ b/src/ShaderGen/MaterialCreateInfo.cpp
@@ -166,7 +166,7 @@ bool MaterialCreateInfo::SetMaterialInstance(const AnsiString &glsl_codes,const
     hgl::strcpy(mi_ubo->name,DESCRIPTOR_NAME_MAX_LENGTH,SBS_MaterialInstance.name);
     mi_ubo->stage_flag=shader_stage_flag_bits;
 
-    mdi.AddUBO(shader_stage_flag_bits,DescriptorSetType::PerMaterial,mi_ubo);
+    mdi.AddUBO(shader_stage_flag_bits,DescriptorSetType::MaterialInstance,mi_ubo);
 
     const AnsiString MI_MAX_COUNT=AnsiString::numberOf(mi_max_count);
 
diff --git a/src/ShaderGen/ShaderCreateInfo.cpp b/src/ShaderGen/ShaderCreateInfo.cpp
index d3e948ca..b59f7f2b 100644
--- a/src/ShaderGen/ShaderCreateInfo.cpp
+++ b/src/ShaderGen/ShaderCreateInfo.cpp
@@ -155,7 +155,7 @@ bool ShaderCreateInfo::ProcSubpassInput()
 
 void ShaderCreateInfo::SetMaterialInstance(UBODescriptor *ubo,const AnsiString &mi)
 {
-    sdm->AddUBO(DescriptorSetType::PerMaterial,ubo);
+    sdm->AddUBO(DescriptorSetType::MaterialInstance,ubo);
     sdm->AddStruct(mtl::MaterialInstanceStruct);
 
     if(shader_stage==VK_SHADER_STAGE_VERTEX_BIT)