From 5eb81f0abb3992ea6923e9b6d4e888043b31a16a Mon Sep 17 00:00:00 2001 From: hyzboy Date: Fri, 18 Sep 2020 22:39:33 +0800 Subject: [PATCH] example Atmosphere use pipeline file --- CMSceneGraph | 2 +- example/Vulkan/Atomsphere.cpp | 8 ++++---- res | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMSceneGraph b/CMSceneGraph index b816297b..86b12454 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit b816297b8811a1a078819f02b740c05576ae5daf +Subproject commit 86b124547d03bc221c3f87f7af66794da42fec15 diff --git a/example/Vulkan/Atomsphere.cpp b/example/Vulkan/Atomsphere.cpp index bf61f672..5ff25cbd 100644 --- a/example/Vulkan/Atomsphere.cpp +++ b/example/Vulkan/Atomsphere.cpp @@ -87,10 +87,10 @@ private: bool InitPipeline() { vulkan::VKPipelineData pd; - - pd.SetDepthTest(true); - pd.SetDepthWrite(true); - pd.SetCullMode(VK_CULL_MODE_NONE); + + if(!vulkan::LoadFromFile(OS_TEXT("res/pipeline/sky.pipeline"),&pd)) + return(false); + pd.Set(Prim::Triangles); pipeline_solid=CreatePipeline(device,&pd,material,sc_render_target); diff --git a/res b/res index 6e4f4a93..330af463 160000 --- a/res +++ b/res @@ -1 +1 @@ -Subproject commit 6e4f4a9329b440787eb0a92eaa691e989497e9bd +Subproject commit 330af463414de83240bf6290d6f9a52aa5b55af3