diff --git a/CMCore b/CMCore
index b5ef4424..3f5baa99 160000
--- a/CMCore
+++ b/CMCore
@@ -1 +1 @@
-Subproject commit b5ef4424d47569447d374f0e86f50e8e04444148
+Subproject commit 3f5baa99d0c0a76135b48fa67b43b9c4d58a8332
diff --git a/CMSceneGraph b/CMSceneGraph
index 94686e90..2b286a47 160000
--- a/CMSceneGraph
+++ b/CMSceneGraph
@@ -1 +1 @@
-Subproject commit 94686e90e0b8d09319809eda7233b9bc92b65368
+Subproject commit 2b286a47b677b285e849fc5fa5afe132ed33948f
diff --git a/inc/hgl/graph/VKDevice.h b/inc/hgl/graph/VKDevice.h
index 9cc600e2..2cc3f6be 100644
--- a/inc/hgl/graph/VKDevice.h
+++ b/inc/hgl/graph/VKDevice.h
@@ -61,8 +61,10 @@ public:
                 VkQueue             GetGraphicsQueue    ()      {return attr->graphics_queue;}
 
                 void                WaitIdle            ()const {vkDeviceWaitIdle(attr->device);}
-
+                
+#ifdef _DEBUG
                 DebugUtils *        GetDebugUtils       (){return attr->debug_utils;}
+#endif//_DEBUG
 
 public:
 
diff --git a/inc/hgl/graph/mtl/BlinnPhong.h b/inc/hgl/graph/mtl/BlinnPhong.h
index a42d1895..859dacaa 100644
--- a/inc/hgl/graph/mtl/BlinnPhong.h
+++ b/inc/hgl/graph/mtl/BlinnPhong.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include<hgl/graph/mtl/StdMaterial.h>
-#include<hgl/graph/mtl/ShaderBuffer.h>
+#include<hgl/graph/mtl/ShaderBufferSource.h>
 #include<hgl/math/Vector.h>
 STD_MTL_NAMESPACE_BEGIN
 namespace blinnphong
diff --git a/inc/hgl/graph/mtl/ShaderBuffer.h b/inc/hgl/graph/mtl/ShaderBuffer.h
deleted file mode 100644
index bc6226dd..00000000
--- a/inc/hgl/graph/mtl/ShaderBuffer.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef HGL_GRAPH_MTL_SHADER_BUFFER_INCLUDE
-#define HGL_GRAPH_MTL_SHADER_BUFFER_INCLUDE
-
-#include<hgl/type/DataType.h>
-
-namespace hgl
-{
-    namespace graph
-    {
-        struct ShaderBufferSource
-        {
-            const char *struct_name;
-            const char *name;
-            const char *codes;
-        };
-    }//namespace graph
-}//namespace hgl
-#endif//HGL_GRAPH_MTL_SHADER_BUFFER_INCLUDE
diff --git a/inc/hgl/graph/mtl/ShaderBufferSource.h b/inc/hgl/graph/mtl/ShaderBufferSource.h
new file mode 100644
index 00000000..3c633efe
--- /dev/null
+++ b/inc/hgl/graph/mtl/ShaderBufferSource.h
@@ -0,0 +1,11 @@
+#pragma once
+
+namespace hgl::graph
+{
+    struct ShaderBufferSource
+    {
+        const char *struct_name;
+        const char *name;
+        const char *codes;
+    };
+}//namespace hgl::graph
diff --git a/inc/hgl/graph/mtl/StdMaterial.h b/inc/hgl/graph/mtl/StdMaterial.h
index 51d64813..0128e4e3 100644
--- a/inc/hgl/graph/mtl/StdMaterial.h
+++ b/inc/hgl/graph/mtl/StdMaterial.h
@@ -2,58 +2,55 @@
 
 #include<hgl/type/String.h>
 
-#define STD_MTL_NAMESPACE_BEGIN namespace hgl{namespace graph{namespace mtl{
-#define STD_MTL_NAMESPACE_END   }}}
+#define STD_MTL_NAMESPACE_BEGIN namespace hgl::graph::mtl{
+#define STD_MTL_NAMESPACE_END   }
 
 #define STD_MTL_NAMESPACE hgl::graph::mtl
 #define STD_MTL_NAMESPACE_USING using namespace STD_MTL_NAMESPACE;
 
-#define STD_MTL_FUNC_NAMESPACE_BEGIN namespace hgl{namespace graph{namespace mtl{namespace func{
-#define STD_MTL_FUNC_NAMESPACE_END   }}}}
+#define STD_MTL_FUNC_NAMESPACE_BEGIN namespace hgl::graph::mtl::func{
+#define STD_MTL_FUNC_NAMESPACE_END   }
 
 #define STD_MTL_FUNC_NAMESPACE hgl::graph::mtl::func
 #define STD_MTL_FUNC_NAMESPACE_USING using namespace STD_MTL_FUNC_NAMESPACE;
 
-namespace hgl
+namespace hgl::graph
 {
-    namespace graph
+    class ShaderCreateInfoVertex;
+    class ShaderCreateInfoGeometry;
+    class ShaderCreateInfoFragment;
+
+    namespace mtl
     {
-        class ShaderCreateInfoVertex;
-        class ShaderCreateInfoGeometry;
-        class ShaderCreateInfoFragment;
-
-        namespace mtl
+        namespace func
         {
-            namespace func
-            {
-            }//namespace func
+        }//namespace func
 
-            class MaterialCreateInfo;
-            struct MaterialCreateConfig;
+        class MaterialCreateInfo;
+        struct MaterialCreateConfig;
 
-            class StdMaterial
-            {
-            protected:
+        class StdMaterial
+        {
+        protected:
 
-                MaterialCreateInfo *mci;
+            MaterialCreateInfo *mci;
 
-            protected:
+        protected:
 
-                virtual bool BeginCustomShader(){return true;/*some work before create shader*/};
+            virtual bool BeginCustomShader(){return true;/*some work before create shader*/};
 
-                virtual bool CustomVertexShader(ShaderCreateInfoVertex *)=0;
-                virtual bool CustomGeometryShader(ShaderCreateInfoGeometry *){return false;}
-                virtual bool CustomFragmentShader(ShaderCreateInfoFragment *)=0;
+            virtual bool CustomVertexShader(ShaderCreateInfoVertex *)=0;
+            virtual bool CustomGeometryShader(ShaderCreateInfoGeometry *){return false;}
+            virtual bool CustomFragmentShader(ShaderCreateInfoFragment *)=0;
 
-                virtual bool EndCustomShader(){return true;/*some work after create shader*/};
+            virtual bool EndCustomShader(){return true;/*some work after create shader*/};
 
-            public:
+        public:
 
-                StdMaterial(const MaterialCreateConfig *);
-                virtual ~StdMaterial()=default;
+            StdMaterial(const MaterialCreateConfig *);
+            virtual ~StdMaterial()=default;
     
-                virtual MaterialCreateInfo *Create();
-            };//class StdMaterial
-        }//namespace mtl
-    }//namespace graph
-}//namespace hgl
+            virtual MaterialCreateInfo *Create();
+        };//class StdMaterial
+    }//namespace mtl
+}//namespace hgl::graph
diff --git a/inc/hgl/graph/mtl/UBOCommon.h b/inc/hgl/graph/mtl/UBOCommon.h
index 70a63e83..7a9645b5 100644
--- a/inc/hgl/graph/mtl/UBOCommon.h
+++ b/inc/hgl/graph/mtl/UBOCommon.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include<hgl/graph/mtl/StdMaterial.h>
-#include<hgl/graph/mtl/ShaderBuffer.h>
+#include<hgl/graph/mtl/ShaderBufferSource.h>
 
 STD_MTL_NAMESPACE_BEGIN
 constexpr const ShaderBufferSource SBS_ViewportInfo=
diff --git a/inc/hgl/graph/mtl/UniformBuffer.h b/inc/hgl/graph/mtl/UniformBuffer.h
index e10fd1a8..59fc792b 100644
--- a/inc/hgl/graph/mtl/UniformBuffer.h
+++ b/inc/hgl/graph/mtl/UniformBuffer.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include<hgl/graph/mtl/StdMaterial.h>
-#include<hgl/graph/mtl/ShaderBuffer.h>
+#include<hgl/graph/mtl/ShaderBufferSource.h>
 
 STD_MTL_NAMESPACE_BEGIN
 
diff --git a/inc/hgl/shadergen/MaterialCreateInfo.h b/inc/hgl/shadergen/MaterialCreateInfo.h
index 15a70b91..0f2e8b4b 100644
--- a/inc/hgl/shadergen/MaterialCreateInfo.h
+++ b/inc/hgl/shadergen/MaterialCreateInfo.h
@@ -7,7 +7,7 @@
 #include<hgl/shadergen/ShaderCreateInfoMap.h>
 #include<hgl/graph/RenderTargetOutputConfig.h>
 #include<hgl/graph/mtl/MaterialConfig.h>
-#include<hgl/graph/mtl/ShaderBuffer.h>
+#include<hgl/graph/mtl/ShaderBufferSource.h>
 #include<hgl/graph/VKSamplerType.h>
 
 namespace hgl::graph
diff --git a/inc/hgl/shadergen/MaterialDescriptorInfo.h b/inc/hgl/shadergen/MaterialDescriptorInfo.h
index 53a99a41..74a769df 100644
--- a/inc/hgl/shadergen/MaterialDescriptorInfo.h
+++ b/inc/hgl/shadergen/MaterialDescriptorInfo.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include<hgl/graph/VKShaderDescriptorSet.h>
-#include<hgl/graph/mtl/ShaderBuffer.h>
+#include<hgl/graph/mtl/ShaderBufferSource.h>
 #include<hgl/type/Map.h>
 
 namespace hgl{namespace graph{
diff --git a/src/ShaderGen/CMakeLists.txt b/src/ShaderGen/CMakeLists.txt
index 27c9cd10..ff669820 100644
--- a/src/ShaderGen/CMakeLists.txt
+++ b/src/ShaderGen/CMakeLists.txt
@@ -79,7 +79,7 @@ SET(STD_MTL_3D_SOURCE_FILES	${STD_MTL_HEADER_PATH}/Material3DCreateConfig.h
 
 SET(STD_MTL_SOURCE  ${STD_MTL_HEADER_PATH}/MaterialConfig.h
                     ${STD_MTL_HEADER_PATH}/StdMaterial.h
-                    ${STD_MTL_HEADER_PATH}/ShaderBuffer.h
+                    ${STD_MTL_HEADER_PATH}/ShaderBufferSource.h
                     StandardMaterial.cpp
                     MaterialFileData.h
                     MaterialFileLoader.cpp)
diff --git a/src/ShaderGen/common/MFBillboard.h b/src/ShaderGen/common/MFBillboard.h
index 43c7af7e..26fa2f0e 100644
--- a/src/ShaderGen/common/MFBillboard.h
+++ b/src/ShaderGen/common/MFBillboard.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include"MFCamera.h"
-#include<hgl/graph/mtl/ShaderBuffer.h>
+#include<hgl/graph/mtl/ShaderBufferSource.h>
 
 STD_MTL_NAMESPACE_BEGIN
 namespace func