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

add .material version check.

Browse Source
This commit is contained in:
hyzboy 2020-09-17 21:56:16 +08:00
parent 37ffb5dc8c
commit e7ed72d6e2
4 changed files with 75 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/Vulkan/Atomsphere.cpp
View File

@ -42,7 +42,7 @@ private:
bool InitMaterial()
{
material=shader_manage->CreateMaterial(OS_TEXT("res/material/Atmosphere"));
material=shader_manage->CreateMaterial(OS_TEXT("res/material/Atmosphere")); //不需要写.material的扩展名
if(!material)
return(false);

4
src/RenderDevice/Vulkan/CMakeLists.txt
View File

@ -46,6 +46,8 @@ SOURCE_GROUP("Descriptor Sets" FILES ${VK_DESCRIPTOR_SETS_SOURCE})
SET(VK_SHADER_SOURCE ${RD_INCLUDE_PATH}/VKShaderModule.h
${RD_INCLUDE_PATH}/VKShaderModuleManage.h
${RD_INCLUDE_PATH}/ShaderModuleMap.h
ShaderModuleMap.cpp
VKShaderModule.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
${RD_INCLUDE_PATH}/VKMaterialInstance.h
${RD_INCLUDE_PATH}/ShaderModuleMap.h
ShaderModuleMap.cpp
VKMaterial.cpp
VKMaterialInstance.cpp)

3
src/RenderDevice/Vulkan/VKShaderModuleManage.cpp
View File

@ -231,6 +231,9 @@ Material *ShaderModuleManage::CreateMaterial(const OSString &filename)
++sp;
--left;
if(ver!=1)
return(nullptr);
const uint32_t shader_bits=*(uint32_t *)sp;
sp+=sizeof(uint32_t);
left-=sizeof(uint32_t);