claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved swapchain creation into prepare function

Browse source
This commit is contained in:
saschawillems 2017-10-21 16:51:39 +02:00
parent ef067b0cf7
commit 19245a0f51
3 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
base/vulkanexamplebase.cpp
View file

@ -176,10 +176,10 @@ void VulkanExampleBase::createPipelineCache()
void VulkanExampleBase::prepare() void VulkanExampleBase::prepare()
{ {
if (vulkanDevice->enableDebugMarkers) if (vulkanDevice->enableDebugMarkers) {
{
vks::debugmarker::setup(device); vks::debugmarker::setup(device);
} }
initSwapchain();
createCommandPool(); createCommandPool();
setupSwapChain(); setupSwapChain();
createCommandBuffers(); createCommandBuffers();

4
base/vulkanexamplebase.h
View file

@ -416,7 +416,6 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int) \
vulkanExample = new VulkanExample(); \ vulkanExample = new VulkanExample(); \
vulkanExample->initVulkan(); \ vulkanExample->initVulkan(); \
vulkanExample->setupWindow(hInstance, WndProc); \ vulkanExample->setupWindow(hInstance, WndProc); \
vulkanExample->initSwapchain(); \
vulkanExample->prepare(); \ vulkanExample->prepare(); \
vulkanExample->renderLoop(); \ vulkanExample->renderLoop(); \
delete(vulkanExample); \ delete(vulkanExample); \
@ -451,7 +450,6 @@ int main(const int argc, const char *argv[]) \
for (size_t i = 0; i < argc; i++) { VulkanExample::args.push_back(argv[i]); }; \ for (size_t i = 0; i < argc; i++) { VulkanExample::args.push_back(argv[i]); }; \
vulkanExample = new VulkanExample(); \ vulkanExample = new VulkanExample(); \
vulkanExample->initVulkan(); \ vulkanExample->initVulkan(); \
vulkanExample->initSwapchain(); \
vulkanExample->prepare(); \ vulkanExample->prepare(); \
vulkanExample->renderLoop(); \ vulkanExample->renderLoop(); \
delete(vulkanExample); \ delete(vulkanExample); \
@ -466,7 +464,6 @@ int main(const int argc, const char *argv[]) \
vulkanExample = new VulkanExample(); \ vulkanExample = new VulkanExample(); \
vulkanExample->initVulkan(); \ vulkanExample->initVulkan(); \
vulkanExample->setupWindow(); \ vulkanExample->setupWindow(); \
vulkanExample->initSwapchain(); \
vulkanExample->prepare(); \ vulkanExample->prepare(); \
vulkanExample->renderLoop(); \ vulkanExample->renderLoop(); \
delete(vulkanExample); \ delete(vulkanExample); \
@ -488,7 +485,6 @@ int main(const int argc, const char *argv[]) \
vulkanExample = new VulkanExample(); \ vulkanExample = new VulkanExample(); \
vulkanExample->initVulkan(); \ vulkanExample->initVulkan(); \
vulkanExample->setupWindow(); \ vulkanExample->setupWindow(); \
vulkanExample->initSwapchain(); \
vulkanExample->prepare(); \ vulkanExample->prepare(); \
vulkanExample->renderLoop(); \ vulkanExample->renderLoop(); \
delete(vulkanExample); \ delete(vulkanExample); \

4
triangle/triangle.cpp
View file

@ -1115,7 +1115,6 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR pCmdLin
vulkanExample = new VulkanExample(); vulkanExample = new VulkanExample();
vulkanExample->initVulkan(); vulkanExample->initVulkan();
vulkanExample->setupWindow(hInstance, WndProc); vulkanExample->setupWindow(hInstance, WndProc);
vulkanExample->initSwapchain();
vulkanExample->prepare(); vulkanExample->prepare();
vulkanExample->renderLoop(); vulkanExample->renderLoop();
delete(vulkanExample); delete(vulkanExample);
@ -1150,7 +1149,6 @@ int main(const int argc, const char *argv[])
for (size_t i = 0; i < argc; i++) { VulkanExample::args.push_back(argv[i]); }; for (size_t i = 0; i < argc; i++) { VulkanExample::args.push_back(argv[i]); };
vulkanExample = new VulkanExample(); vulkanExample = new VulkanExample();
vulkanExample->initVulkan(); vulkanExample->initVulkan();
vulkanExample->initSwapchain();
vulkanExample->prepare(); vulkanExample->prepare();
vulkanExample->renderLoop(); vulkanExample->renderLoop();
delete(vulkanExample); delete(vulkanExample);
@ -1164,7 +1162,6 @@ int main(const int argc, const char *argv[])
vulkanExample = new VulkanExample(); vulkanExample = new VulkanExample();
vulkanExample->initVulkan(); vulkanExample->initVulkan();
vulkanExample->setupWindow(); vulkanExample->setupWindow();
vulkanExample->initSwapchain();
vulkanExample->prepare(); vulkanExample->prepare();
vulkanExample->renderLoop(); vulkanExample->renderLoop();
delete(vulkanExample); delete(vulkanExample);
@ -1187,7 +1184,6 @@ int main(const int argc, const char *argv[])
vulkanExample = new VulkanExample(); vulkanExample = new VulkanExample();
vulkanExample->initVulkan(); vulkanExample->initVulkan();
vulkanExample->setupWindow(); vulkanExample->setupWindow();
vulkanExample->initSwapchain();
vulkanExample->prepare(); vulkanExample->prepare();
vulkanExample->renderLoop(); vulkanExample->renderLoop();
delete(vulkanExample); delete(vulkanExample);