From 152180ca7f3e986fb88e11a6ff6f5e6874144ed5 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Thu, 24 Oct 2019 18:05:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8InitDefaultShaderBuildResourc?= =?UTF-8?q?e=E8=B0=83=E7=94=A8=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMCore | 2 +- example/Vulkan/VulkanAppFramework.h | 3 +++ example/Vulkan/first_triangle.cpp | 3 --- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMCore b/CMCore index 64dfbbcf..7fe04114 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 64dfbbcf7b748ad6b2c29ba1a4e0841f56201436 +Subproject commit 7fe04114524aa4e6e2e1a8bba08e2605237a461c diff --git a/example/Vulkan/VulkanAppFramework.h b/example/Vulkan/VulkanAppFramework.h index dcaf5ced..576c13b1 100644 --- a/example/Vulkan/VulkanAppFramework.h +++ b/example/Vulkan/VulkanAppFramework.h @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -91,6 +92,8 @@ public: return(false); #endif// + InitDefaultShaderBuildResource(); + InitNativeWindowSystem(); win=CreateRenderWindow(OS_TEXT("VulkanTest")); diff --git a/example/Vulkan/first_triangle.cpp b/example/Vulkan/first_triangle.cpp index d55d0cc3..bccd93b8 100644 --- a/example/Vulkan/first_triangle.cpp +++ b/example/Vulkan/first_triangle.cpp @@ -4,7 +4,6 @@ #include"VulkanAppFramework.h" #include #include -#include using namespace hgl; using namespace hgl::graph; @@ -160,8 +159,6 @@ public: int main(int,char **) { - hgl::graph::InitDefaultShaderBuildResource(); - TestApp app; if(!app.Init())