diff --git a/CMCMakeModule b/CMCMakeModule index d4087fe9..7d35df75 160000 --- a/CMCMakeModule +++ b/CMCMakeModule @@ -1 +1 @@ -Subproject commit d4087fe96c0acd43d376ec660bd5f1f351755448 +Subproject commit 7d35df757f12b204fd4556669d10b131cc373e3d diff --git a/CMCore b/CMCore index 72f2b58e..73ca4a13 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 72f2b58e12b0f86ed4f49cb939c18f18bb43e0df +Subproject commit 73ca4a13d2b662fde9e876909e9f92b50610aeb3 diff --git a/example/Vulkan/HQFilterTexture.cpp b/example/Vulkan/HQFilterTexture.cpp index 238bfc67..25d0d0d6 100644 --- a/example/Vulkan/HQFilterTexture.cpp +++ b/example/Vulkan/HQFilterTexture.cpp @@ -59,7 +59,7 @@ private: { delete material; delete render_obj; - SAFE_CLEAR(material_instance); + delete material_instance; delete pipeline; } }nearest,linear,nearest_hq,linear_hq; @@ -131,14 +131,14 @@ private: bool InitTexture() { - texture=vulkan::CreateTextureFromFile(device,OS_TEXT("res/image/noise32.Tex2D")); + texture=vulkan::CreateTextureFromFile(device,OS_TEXT("res/image/heightmap.Tex2D")); return texture; } bool InitMaterial(struct MPD *mpd,vulkan::Sampler *sampler,const OSString &fragment_shader) { - mpd->material=shader_manage->CreateMaterial(OS_TEXT("res/shader/Texture2D.vert.spv"), - OS_TEXT("res/shader/")+fragment_shader+OS_TEXT(".frag.spv")); + mpd->material=shader_manage->CreateMaterial(OS_TEXT("res/shader/Texture2D.vert"), + OS_TEXT("res/shader/")+fragment_shader+OS_TEXT(".frag")); if(!mpd->material) return(false); @@ -185,6 +185,7 @@ private: BuildCommandBuffer(&render_list); return(true); } + public: bool Init() diff --git a/res b/res index c8c306e5..a9754431 160000 --- a/res +++ b/res @@ -1 +1 @@ -Subproject commit c8c306e5a7cd3e975af4eb718f20ea16653ca4d3 +Subproject commit a9754431037ebc7f8056b81c6d3e982c0ba341f9