diff --git a/example/Vulkan/CMakeLists.txt b/example/Vulkan/CMakeLists.txt index 69aa450e..623c5323 100644 --- a/example/Vulkan/CMakeLists.txt +++ b/example/Vulkan/CMakeLists.txt @@ -26,4 +26,6 @@ CreateProject(09.Atomsphere Atomsphere.cpp) CreateProject(10.Deferred Deferred.cpp TGATexture.cpp) +CreateProject(10.DeferredModel DeferredModel.cpp TGATexture.cpp) + CreateProject(11.TextureFormat TextureFormat.cpp) diff --git a/example/Vulkan/Deferred.cpp b/example/Vulkan/Deferred.cpp index 0e50120c..b65b5524 100644 --- a/example/Vulkan/Deferred.cpp +++ b/example/Vulkan/Deferred.cpp @@ -19,8 +19,8 @@ VK_NAMESPACE_BEGIN Texture2D *LoadTGATexture(const OSString &filename,Device *device); VK_NAMESPACE_END -constexpr uint32_t SCREEN_WIDTH=128; -constexpr uint32_t SCREEN_HEIGHT=128; +constexpr uint32_t SCREEN_WIDTH=256; +constexpr uint32_t SCREEN_HEIGHT=256; using Texture2DPointer=vulkan::Texture2D *; @@ -288,8 +288,8 @@ private: if(!InitGBufferPipeline(&sp_gbuffer))return(false); if(!InitCompositionPipeline(&sp_composition))return(false); - texture.color =vulkan::LoadTGATexture(OS_TEXT("res/image/cardboardPlainStain.tga"),device); - texture.normal =vulkan::LoadTGATexture(OS_TEXT("res/image/APOCWALL029_NRM.tga"),device); + texture.color =vulkan::LoadTGATexture(OS_TEXT("res/image/Brickwall/Albedo.tga"),device); + texture.normal =vulkan::LoadTGATexture(OS_TEXT("res/image/Brickwall/Normal.tga"),device); //texture.specular=vulkan::LoadTGATexture(OS_TEXT("res/image/APOCWALL029_SPEC.tga"),device); VkSamplerCreateInfo sampler_create_info; diff --git a/example/Vulkan/TextureFormat.cpp b/example/Vulkan/TextureFormat.cpp index 40033cc9..9ff9dc93 100644 --- a/example/Vulkan/TextureFormat.cpp +++ b/example/Vulkan/TextureFormat.cpp @@ -62,7 +62,7 @@ vulkan::Instance *InitVulkanInstance() int main(int,char **) { Window * win =nullptr; - vulkan::Instance * inst =nullptr; + vulkan::Instance * inst =nullptr; vulkan::Device * device =nullptr; const vulkan::PhysicalDevice *physical_device =nullptr; diff --git a/example/Vulkan/VulkanAppFramework.h b/example/Vulkan/VulkanAppFramework.h index 576c13b1..70901a2d 100644 --- a/example/Vulkan/VulkanAppFramework.h +++ b/example/Vulkan/VulkanAppFramework.h @@ -96,6 +96,8 @@ public: InitNativeWindowSystem(); + VK_NAMESPACE::InitVulkanProperties(); + win=CreateRenderWindow(OS_TEXT("VulkanTest")); if(!win) return(false); @@ -103,10 +105,20 @@ public: if(!win->Create(w,h)) return(false); - inst=vulkan::CreateInstance(U8_TEXT("VulkanTest")); + { + VK_NAMESPACE::CreateInstanceLayerInfo cili; - if(!inst) - return(false); + memset(&cili, 0, sizeof(VK_NAMESPACE::CreateInstanceLayerInfo)); + + cili.lunarg.standard_validation = true; + cili.khronos.validation = true; + cili.RenderDoc.Capture = true; + + inst=vulkan::CreateInstance(U8_TEXT("VulkanTest")); + + if(!inst) + return(false); + } device=CreateRenderDevice(inst,win);