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

Move Vulkan initialization out of example constructor to allow overriding initialization functins (e.g. instance creation)

Browse source
This commit is contained in:
saschawillems 2016-12-13 19:59:15 +01:00
parent fac6524564
commit 17e3313b53
2 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
base/vulkanexamplebase.cpp
View file

@ -713,11 +713,6 @@ VulkanExampleBase::VulkanExampleBase(bool enableValidation, PFN_GetEnabledFeatur
setupConsole("VulkanExample"); setupConsole("VulkanExample");
} }
#endif #endif
#if !defined(__ANDROID__)
// Android Vulkan initialization is handled in APP_CMD_INIT_WINDOW event
initVulkan(enableValidation);
#endif
} }
VulkanExampleBase::~VulkanExampleBase() VulkanExampleBase::~VulkanExampleBase()
@ -787,7 +782,7 @@ VulkanExampleBase::~VulkanExampleBase()
#endif #endif
} }
void VulkanExampleBase::initVulkan(bool enableValidation) void VulkanExampleBase::initVulkan()
{ {
VkResult err; VkResult err;
@ -1229,7 +1224,7 @@ void VulkanExampleBase::handleAppCommand(android_app * app, int32_t cmd)
LOGD("APP_CMD_INIT_WINDOW"); LOGD("APP_CMD_INIT_WINDOW");
if (vulkanExample->androidApp->window != NULL) if (vulkanExample->androidApp->window != NULL)
{ {
vulkanExample->initVulkan(false); vulkanExample->initVulkan();
vulkanExample->initSwapchain(); vulkanExample->initSwapchain();
vulkanExample->prepare(); vulkanExample->prepare();
assert(vulkanExample->prepared); assert(vulkanExample->prepared);

18
base/vulkanexamplebase.h
View file

@ -50,8 +50,6 @@ typedef VkPhysicalDeviceFeatures (*PFN_GetEnabledFeatures)();
class VulkanExampleBase class VulkanExampleBase
{ {
private: private:
// Set to true when example is created with enabled validation layers
bool enableValidation = false;
// Set to true if v-sync will be forced for the swapchain // Set to true if v-sync will be forced for the swapchain
bool enableVSync = false; bool enableVSync = false;
// Device features enabled by the example // Device features enabled by the example
@ -59,8 +57,6 @@ private:
VkPhysicalDeviceFeatures enabledFeatures = {}; VkPhysicalDeviceFeatures enabledFeatures = {};
// fps timer (one second interval) // fps timer (one second interval)
float fpsTimer = 0.0f; float fpsTimer = 0.0f;
// Create application wide Vulkan instance
VkResult createInstance(bool enableValidation);
// Get window title with example name, device, et. // Get window title with example name, device, et.
std::string getWindowTitle(); std::string getWindowTitle();
/** brief Indicates that the view (position, rotation) has changed and */ /** brief Indicates that the view (position, rotation) has changed and */
@ -72,6 +68,8 @@ private:
// Called if the window is resized and some resources have to be recreatesd // Called if the window is resized and some resources have to be recreatesd
void windowResize(); void windowResize();
protected: protected:
// Is true when example is created validation layers enabled
bool enableValidation = false;
// Last frame time, measured using a high performance timer (if available) // Last frame time, measured using a high performance timer (if available)
float frameTimer = 1.0f; float frameTimer = 1.0f;
// Frame counter to display fps // Frame counter to display fps
@ -214,7 +212,7 @@ public:
~VulkanExampleBase(); ~VulkanExampleBase();
// Setup the vulkan instance, enable required extensions and connect to the physical device (GPU) // Setup the vulkan instance, enable required extensions and connect to the physical device (GPU)
void initVulkan(bool enableValidation); void initVulkan();
#if defined(_WIN32) #if defined(_WIN32)
void setupConsole(std::string title); void setupConsole(std::string title);
@ -228,6 +226,13 @@ public:
void initxcbConnection(); void initxcbConnection();
void handleEvent(const xcb_generic_event_t *event); void handleEvent(const xcb_generic_event_t *event);
#endif #endif
/**
* Create the application wide Vulkan instance
*
* @note Virtual, can be overriden by derived example class for custom instance creation
*/
virtual VkResult createInstance(bool enableValidation);
// Pure virtual render function (override in derived class) // Pure virtual render function (override in derived class)
virtual void render() = 0; virtual void render() = 0;
// Called when view change occurs // Called when view change occurs
@ -372,6 +377,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR pCmdLin
{ \ { \
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->setupWindow(hInstance, WndProc); \ vulkanExample->setupWindow(hInstance, WndProc); \
vulkanExample->initSwapchain(); \ vulkanExample->initSwapchain(); \
vulkanExample->prepare(); \ vulkanExample->prepare(); \
@ -406,6 +412,7 @@ static void handleEvent() \
int main(const int argc, const char *argv[]) \ int main(const int argc, const char *argv[]) \
{ \ { \
vulkanExample = new VulkanExample(); \ vulkanExample = new VulkanExample(); \
vulkanExample->initVulkan(); \
vulkanExample->initSwapchain(); \ vulkanExample->initSwapchain(); \
vulkanExample->prepare(); \ vulkanExample->prepare(); \
vulkanExample->renderLoop(); \ vulkanExample->renderLoop(); \
@ -428,6 +435,7 @@ 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->setupWindow(); \ vulkanExample->setupWindow(); \
vulkanExample->initSwapchain(); \ vulkanExample->initSwapchain(); \
vulkanExample->prepare(); \ vulkanExample->prepare(); \