fix a little problem

This commit is contained in:
hyzboy 2020-09-11 18:52:17 +08:00
parent 3f6742f116
commit 8f68b3935d
6 changed files with 9 additions and 9 deletions

@ -1 +1 @@
Subproject commit 0cb791614f905ecaaa26b251f01b4c9f4ea5e274 Subproject commit 36549c10cc5f6af622dcca92a31b13422bb031b9

2
CMCore

@ -1 +1 @@
Subproject commit 7927586bd1e36f0e0d7dd6d1e944570bd5121e19 Subproject commit 7c69cfff60cceb41760513ea4c5fbf78053012e3

View File

@ -5,7 +5,7 @@
#include<hgl/filesystem/FileSystem.h> #include<hgl/filesystem/FileSystem.h>
#include<hgl/graph/InlineGeometry.h> #include<hgl/graph/InlineGeometry.h>
#include<hgl/graph/RenderableInstance.h> #include<hgl/graph/RenderableInstance.h>
#include<hgl/graph/VertexBufferData.h> #include<hgl/graph/VertexAttribData.h>
#include<hgl/graph/data/SceneNodeData.h> #include<hgl/graph/data/SceneNodeData.h>

View File

@ -41,7 +41,7 @@ VK_NAMESPACE_BEGIN
class ShaderResource class ShaderResource
{ {
const void *data; const uint8 *data;
VkShaderStageFlagBits stage_flag; VkShaderStageFlagBits stage_flag;
@ -55,7 +55,7 @@ VK_NAMESPACE_BEGIN
public: public:
ShaderResource(const void *,const VkShaderStageFlagBits &,const void *,const uint32); ShaderResource(const uint8 *,const VkShaderStageFlagBits &,const void *,const uint32);
virtual ~ShaderResource(); virtual ~ShaderResource();
const VkShaderStageFlagBits GetStage ()const {return stage_flag;} const VkShaderStageFlagBits GetStage ()const {return stage_flag;}

View File

@ -53,7 +53,7 @@ namespace hgl
if(out_count>0) if(out_count>0)
{ {
tile_data->BeginCommit(); tile_data->BeginCommit();
for(uint i=0;i<ch_count;i++) for(int i=0;i<ch_count;i++)
{ {
if(!to_res.Get(*cp,to)) if(!to_res.Get(*cp,to))
{ {
@ -80,7 +80,7 @@ namespace hgl
} }
else else
{ {
for(uint i=0;i<ch_count;i++) for(int i=0;i<ch_count;i++)
{ {
to_res.Get(*cp,to); to_res.Get(*cp,to);
@ -100,7 +100,7 @@ namespace hgl
{ {
const u32char *cp=ch_list.GetData(); const u32char *cp=ch_list.GetData();
for(uint i=0;i<ch_list.GetCount();i++) for(int i=0;i<ch_list.GetCount();i++)
{ {
to_res.Release(*cp); to_res.Release(*cp);
++cp; ++cp;

View File

@ -81,7 +81,7 @@ VK_NAMESPACE_BEGIN
} }
}//namespcae }//namespcae
ShaderResource::ShaderResource(const void *fd,const VkShaderStageFlagBits &flag,const void *sd,const uint32 size) ShaderResource::ShaderResource(const uint8 *fd,const VkShaderStageFlagBits &flag,const void *sd,const uint32 size)
{ {
data=fd; data=fd;
stage_flag=flag; stage_flag=flag;