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

改进VulkanAppFramework

Browse Source
This commit is contained in:
hyzboy 2019-11-14 17:57:46 +08:00
parent dc50f1e0d3
commit a444f6b795
4 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/Vulkan/CMakeLists.txt
View File

@ -26,4 +26,6 @@ CreateProject(09.Atomsphere Atomsphere.cpp)
CreateProject(10.Deferred Deferred.cpp TGATexture.cpp) CreateProject(10.Deferred Deferred.cpp TGATexture.cpp)
CreateProject(10.DeferredModel DeferredModel.cpp TGATexture.cpp)
CreateProject(11.TextureFormat TextureFormat.cpp) CreateProject(11.TextureFormat TextureFormat.cpp)

8
example/Vulkan/Deferred.cpp
View File

@ -19,8 +19,8 @@ VK_NAMESPACE_BEGIN
Texture2D *LoadTGATexture(const OSString &filename,Device *device); Texture2D *LoadTGATexture(const OSString &filename,Device *device);
VK_NAMESPACE_END VK_NAMESPACE_END
constexpr uint32_t SCREEN_WIDTH=128; constexpr uint32_t SCREEN_WIDTH=256;
constexpr uint32_t SCREEN_HEIGHT=128; constexpr uint32_t SCREEN_HEIGHT=256;
using Texture2DPointer=vulkan::Texture2D *; using Texture2DPointer=vulkan::Texture2D *;
@ -288,8 +288,8 @@ private:
if(!InitGBufferPipeline(&sp_gbuffer))return(false); if(!InitGBufferPipeline(&sp_gbuffer))return(false);
if(!InitCompositionPipeline(&sp_composition))return(false); if(!InitCompositionPipeline(&sp_composition))return(false);
texture.color =vulkan::LoadTGATexture(OS_TEXT("res/image/cardboardPlainStain.tga"),device); texture.color =vulkan::LoadTGATexture(OS_TEXT("res/image/Brickwall/Albedo.tga"),device);
texture.normal =vulkan::LoadTGATexture(OS_TEXT("res/image/APOCWALL029_NRM.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); //texture.specular=vulkan::LoadTGATexture(OS_TEXT("res/image/APOCWALL029_SPEC.tga"),device);
VkSamplerCreateInfo sampler_create_info; VkSamplerCreateInfo sampler_create_info;

2
example/Vulkan/TextureFormat.cpp
View File

@ -62,7 +62,7 @@ vulkan::Instance *InitVulkanInstance()
int main(int,char **) int main(int,char **)
{ {
Window * win =nullptr; Window * win =nullptr;
vulkan::Instance * inst =nullptr; vulkan::Instance * inst =nullptr;
vulkan::Device * device =nullptr; vulkan::Device * device =nullptr;
const vulkan::PhysicalDevice *physical_device =nullptr; const vulkan::PhysicalDevice *physical_device =nullptr;

18
example/Vulkan/VulkanAppFramework.h
View File

@ -96,6 +96,8 @@ public:
InitNativeWindowSystem(); InitNativeWindowSystem();
VK_NAMESPACE::InitVulkanProperties();
win=CreateRenderWindow(OS_TEXT("VulkanTest")); win=CreateRenderWindow(OS_TEXT("VulkanTest"));
if(!win) if(!win)
return(false); return(false);
@ -103,10 +105,20 @@ public:
if(!win->Create(w,h)) if(!win->Create(w,h))
return(false); return(false);
inst=vulkan::CreateInstance(U8_TEXT("VulkanTest")); {
VK_NAMESPACE::CreateInstanceLayerInfo cili;
if(!inst) memset(&cili, 0, sizeof(VK_NAMESPACE::CreateInstanceLayerInfo));
return(false);
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); device=CreateRenderDevice(inst,win);