From 1dbf8ae5c7b9c6f50473f3c5d023e62309100641 Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Sun, 24 Dec 2023 01:35:30 +0800
Subject: [PATCH] renamed values.

---
 CMCore                               |  2 +-
 inc/hgl/graph/VK.h                   | 17 ++++-------------
 src/ShaderGen/MaterialFileData.h     |  6 +++---
 src/ShaderGen/MaterialFileLoader.cpp | 10 +++++-----
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/CMCore b/CMCore
index 1141f37c..9eb928dc 160000
--- a/CMCore
+++ b/CMCore
@@ -1 +1 @@
-Subproject commit 1141f37cc4ae98441e0e75809a8757851c836408
+Subproject commit 9eb928dc3a567f9cc95548bdd3955733944a63ea
diff --git a/inc/hgl/graph/VK.h b/inc/hgl/graph/VK.h
index 01273b18..c456b84e 100644
--- a/inc/hgl/graph/VK.h
+++ b/inc/hgl/graph/VK.h
@@ -144,19 +144,10 @@ enum IndexType:uint
     U8=VK_INDEX_TYPE_UINT8_EXT,
 };
 
-/**
- * max-lengths:
- *
-        256 bytes:  nvidia,arm
-        128 bytes:  amd,intel,powervr,adreno
- */
-struct PushConstant
-{
-    Matrix4f local_to_world;
-    Matrix4f normal;
-};
-
-constexpr uint32_t MAX_PUSH_CONSTANT_BYTES=sizeof(PushConstant);
+//Push Constant max-lengths:
+//
+//    256 bytes:  nvidia,arm
+//    128 bytes:  amd,intel,powervr,adreno
 
 inline void copy(VkExtent3D &e3d,const VkExtent2D &e2d,const uint32 depth=1)
 {
diff --git a/src/ShaderGen/MaterialFileData.h b/src/ShaderGen/MaterialFileData.h
index 2456b590..2e4a19b9 100644
--- a/src/ShaderGen/MaterialFileData.h
+++ b/src/ShaderGen/MaterialFileData.h
@@ -10,7 +10,7 @@ namespace material_file
     using namespace hgl;
     using namespace hgl::graph;
 
-    struct UniformAttrib
+    struct ShaderIOAttrib
     {
         VAT vat;
         
@@ -52,7 +52,7 @@ namespace material_file
         const char *            code;
         uint                    code_length;
 
-        List<UniformAttrib>     output;
+        List<ShaderIOAttrib>    output;
 
         List<SamplerData>       sampler;
 
@@ -100,7 +100,7 @@ namespace material_file
 
         MaterialInstanceData    mi{};
 
-        List<UniformAttrib>     vi;                         ///<Vertex Input
+        List<ShaderIOAttrib>    vi;                         ///<Vertex Input
 
         UBODataList             ubo_list;
 
diff --git a/src/ShaderGen/MaterialFileLoader.cpp b/src/ShaderGen/MaterialFileLoader.cpp
index 14f57375..2ed50ef5 100644
--- a/src/ShaderGen/MaterialFileLoader.cpp
+++ b/src/ShaderGen/MaterialFileLoader.cpp
@@ -314,7 +314,7 @@ namespace
         }
     };//struct MaterialInstanceBlockParse
 
-    bool ParseUniformAttrib(UniformAttrib *ua,const char *str)
+    bool ParseUniformAttrib(ShaderIOAttrib *ua,const char *str)
     {
         const char *sp;
 
@@ -337,11 +337,11 @@ namespace
 
     struct VertexInputBlockParse:public TextParse
     {
-        List<UniformAttrib> *vi_list=nullptr;
+        List<ShaderIOAttrib> *vi_list=nullptr;
 
     public:
 
-        VertexInputBlockParse(List<UniformAttrib> *ual)
+        VertexInputBlockParse(List<ShaderIOAttrib> *ual)
         {
             vi_list=ual;
         }
@@ -351,7 +351,7 @@ namespace
             if(!text||!*text||len<=0)
                 return(false);
 
-            UniformAttrib ua;
+            ShaderIOAttrib ua;
 
             if(ParseUniformAttrib(&ua,text))
                 vi_list->Add(ua);
@@ -402,7 +402,7 @@ namespace
                     return(true);
                 }
 
-                UniformAttrib ua;
+                ShaderIOAttrib ua;
 
                 if(ParseUniformAttrib(&ua,text))
                     shader_data->output.Add(ua);