diff --git a/CMCMakeModule b/CMCMakeModule index 0cb79161..36549c10 160000 --- a/CMCMakeModule +++ b/CMCMakeModule @@ -1 +1 @@ -Subproject commit 0cb791614f905ecaaa26b251f01b4c9f4ea5e274 +Subproject commit 36549c10cc5f6af622dcca92a31b13422bb031b9 diff --git a/CMCore b/CMCore index 7927586b..7c69cfff 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 7927586bd1e36f0e0d7dd6d1e944570bd5121e19 +Subproject commit 7c69cfff60cceb41760513ea4c5fbf78053012e3 diff --git a/example/Vulkan/LoadStaticMesh.cpp b/example/Vulkan/LoadStaticMesh.cpp index 2475d3f8..4cd50b44 100644 --- a/example/Vulkan/LoadStaticMesh.cpp +++ b/example/Vulkan/LoadStaticMesh.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include diff --git a/inc/hgl/graph/shader/ShaderResource.h b/inc/hgl/graph/shader/ShaderResource.h index f66b5a5b..d356fe12 100644 --- a/inc/hgl/graph/shader/ShaderResource.h +++ b/inc/hgl/graph/shader/ShaderResource.h @@ -41,7 +41,7 @@ VK_NAMESPACE_BEGIN class ShaderResource { - const void *data; + const uint8 *data; VkShaderStageFlagBits stage_flag; @@ -55,7 +55,7 @@ VK_NAMESPACE_BEGIN public: - ShaderResource(const void *,const VkShaderStageFlagBits &,const void *,const uint32); + ShaderResource(const uint8 *,const VkShaderStageFlagBits &,const void *,const uint32); virtual ~ShaderResource(); const VkShaderStageFlagBits GetStage ()const {return stage_flag;} diff --git a/src/SceneGraph/font/TileFont.cpp b/src/SceneGraph/font/TileFont.cpp index d1eb95e6..bf8d0e90 100644 --- a/src/SceneGraph/font/TileFont.cpp +++ b/src/SceneGraph/font/TileFont.cpp @@ -53,7 +53,7 @@ namespace hgl if(out_count>0) { tile_data->BeginCommit(); - for(uint i=0;i