diff --git a/src/ShaderGen/MaterialFileData.h b/src/ShaderGen/MaterialFileData.h index 63b3ce8d..10484693 100644 --- a/src/ShaderGen/MaterialFileData.h +++ b/src/ShaderGen/MaterialFileData.h @@ -75,7 +75,7 @@ namespace material_file SVList output; VertexShaderData():ShaderData(VK_SHADER_STAGE_VERTEX_BIT){} - + public: void AddOutput(const ShaderVariable &sv){output.Add(sv);} @@ -92,7 +92,7 @@ namespace material_file public: GeometryShaderData():ShaderData(VK_SHADER_STAGE_GEOMETRY_BIT){} - + public: void AddOutput(const ShaderVariable &sv){output.Add(sv);} diff --git a/src/ShaderGen/MaterialFileLoader.cpp b/src/ShaderGen/MaterialFileLoader.cpp index cf9d17e3..48e69361 100644 --- a/src/ShaderGen/MaterialFileLoader.cpp +++ b/src/ShaderGen/MaterialFileLoader.cpp @@ -430,11 +430,11 @@ namespace struct VertexInputBlockParse:public TextParse { - List *via_list=nullptr; + VIAList *via_list=nullptr; public: - VertexInputBlockParse(List *ual) + VertexInputBlockParse(VIAList *ual) { via_list=ual; } @@ -485,7 +485,7 @@ namespace shader_data->code_length=code_parse.end-code_parse.start; } - return(true); + return(true); } if(output)