hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed values.

Browse Source
This commit is contained in:
hyzboy 2023-12-24 01:35:30 +08:00
parent 8dbc1d899c
commit 1dbf8ae5c7
No known key found for this signature in database
GPG Key ID: 067EE4525D4FB6D3
4 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMCore

@ -1 +1 @@
Subproject commit 1141f37cc4ae98441e0e75809a8757851c836408 Subproject commit 9eb928dc3a567f9cc95548bdd3955733944a63ea

17
inc/hgl/graph/VK.h
View File

@ -144,19 +144,10 @@ enum IndexType:uint
U8=VK_INDEX_TYPE_UINT8_EXT, U8=VK_INDEX_TYPE_UINT8_EXT,
}; };
/** //Push Constant max-lengths:
* max-lengths: //
* // 256 bytes: nvidia,arm
256 bytes: nvidia,arm // 128 bytes: amd,intel,powervr,adreno
128 bytes: amd,intel,powervr,adreno
*/
struct PushConstant
{
Matrix4f local_to_world;
Matrix4f normal;
};
constexpr uint32_t MAX_PUSH_CONSTANT_BYTES=sizeof(PushConstant);
inline void copy(VkExtent3D &e3d,const VkExtent2D &e2d,const uint32 depth=1) inline void copy(VkExtent3D &e3d,const VkExtent2D &e2d,const uint32 depth=1)
{ {

6
src/ShaderGen/MaterialFileData.h
View File

@ -10,7 +10,7 @@ namespace material_file
using namespace hgl; using namespace hgl;
using namespace hgl::graph; using namespace hgl::graph;
struct UniformAttrib struct ShaderIOAttrib
{ {
VAT vat; VAT vat;
@ -52,7 +52,7 @@ namespace material_file
const char * code; const char * code;
uint code_length; uint code_length;
List<UniformAttrib> output; List<ShaderIOAttrib> output;
List<SamplerData> sampler; List<SamplerData> sampler;
@ -100,7 +100,7 @@ namespace material_file
MaterialInstanceData mi{}; MaterialInstanceData mi{};
List<UniformAttrib> vi; ///<Vertex Input List<ShaderIOAttrib> vi; ///<Vertex Input
UBODataList ubo_list; UBODataList ubo_list;

10
src/ShaderGen/MaterialFileLoader.cpp
View File

@ -314,7 +314,7 @@ namespace
} }
};//struct MaterialInstanceBlockParse };//struct MaterialInstanceBlockParse
bool ParseUniformAttrib(UniformAttrib *ua,const char *str) bool ParseUniformAttrib(ShaderIOAttrib *ua,const char *str)
{ {
const char *sp; const char *sp;
@ -337,11 +337,11 @@ namespace
struct VertexInputBlockParse:public TextParse struct VertexInputBlockParse:public TextParse
{ {
List<UniformAttrib> *vi_list=nullptr; List<ShaderIOAttrib> *vi_list=nullptr;
public: public:
VertexInputBlockParse(List<UniformAttrib> *ual) VertexInputBlockParse(List<ShaderIOAttrib> *ual)
{ {
vi_list=ual; vi_list=ual;
} }
@ -351,7 +351,7 @@ namespace
if(!text||!*text||len<=0) if(!text||!*text||len<=0)
return(false); return(false);
UniformAttrib ua; ShaderIOAttrib ua;
if(ParseUniformAttrib(&ua,text)) if(ParseUniformAttrib(&ua,text))
vi_list->Add(ua); vi_list->Add(ua);
@ -402,7 +402,7 @@ namespace
return(true); return(true);
} }
UniformAttrib ua; ShaderIOAttrib ua;
if(ParseUniformAttrib(&ua,text)) if(ParseUniformAttrib(&ua,text))
shader_data->output.Add(ua); shader_data->output.Add(ua);