add .material version check.
This commit is contained in:
parent
37ffb5dc8c
commit
e7ed72d6e2
@ -42,7 +42,7 @@ private:
|
|||||||
|
|
||||||
bool InitMaterial()
|
bool InitMaterial()
|
||||||
{
|
{
|
||||||
material=shader_manage->CreateMaterial(OS_TEXT("res/material/Atmosphere"));
|
material=shader_manage->CreateMaterial(OS_TEXT("res/material/Atmosphere")); //不需要写.material的扩展名
|
||||||
if(!material)
|
if(!material)
|
||||||
return(false);
|
return(false);
|
||||||
|
|
||||||
|
@ -46,6 +46,8 @@ SOURCE_GROUP("Descriptor Sets" FILES ${VK_DESCRIPTOR_SETS_SOURCE})
|
|||||||
|
|
||||||
SET(VK_SHADER_SOURCE ${RD_INCLUDE_PATH}/VKShaderModule.h
|
SET(VK_SHADER_SOURCE ${RD_INCLUDE_PATH}/VKShaderModule.h
|
||||||
${RD_INCLUDE_PATH}/VKShaderModuleManage.h
|
${RD_INCLUDE_PATH}/VKShaderModuleManage.h
|
||||||
|
${RD_INCLUDE_PATH}/ShaderModuleMap.h
|
||||||
|
ShaderModuleMap.cpp
|
||||||
VKShaderModule.cpp
|
VKShaderModule.cpp
|
||||||
VKShaderModuleManage.cpp)
|
VKShaderModuleManage.cpp)
|
||||||
|
|
||||||
@ -59,8 +61,6 @@ SET(VK_TEXTURE_SOURCE ${RD_INCLUDE_PATH}/VKImageView.h
|
|||||||
|
|
||||||
SET(VK_MATERIAL_SOURCE ${RD_INCLUDE_PATH}/VKMaterial.h
|
SET(VK_MATERIAL_SOURCE ${RD_INCLUDE_PATH}/VKMaterial.h
|
||||||
${RD_INCLUDE_PATH}/VKMaterialInstance.h
|
${RD_INCLUDE_PATH}/VKMaterialInstance.h
|
||||||
${RD_INCLUDE_PATH}/ShaderModuleMap.h
|
|
||||||
ShaderModuleMap.cpp
|
|
||||||
VKMaterial.cpp
|
VKMaterial.cpp
|
||||||
VKMaterialInstance.cpp)
|
VKMaterialInstance.cpp)
|
||||||
|
|
||||||
|
@ -231,6 +231,9 @@ Material *ShaderModuleManage::CreateMaterial(const OSString &filename)
|
|||||||
++sp;
|
++sp;
|
||||||
--left;
|
--left;
|
||||||
|
|
||||||
|
if(ver!=1)
|
||||||
|
return(nullptr);
|
||||||
|
|
||||||
const uint32_t shader_bits=*(uint32_t *)sp;
|
const uint32_t shader_bits=*(uint32_t *)sp;
|
||||||
sp+=sizeof(uint32_t);
|
sp+=sizeof(uint32_t);
|
||||||
left-=sizeof(uint32_t);
|
left-=sizeof(uint32_t);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user