diff options
author | tylermurphy534 <tylermurphy534@gmail.com> | 2022-09-22 18:29:34 -0400 |
---|---|---|
committer | tylermurphy534 <tylermurphy534@gmail.com> | 2022-09-22 18:32:40 -0400 |
commit | 888cdf15a90c798ad272679e037ba96d12672abe (patch) | |
tree | 8be70464069f75144b0e37a1d66bb4d900aefe53 /engine | |
parent | sound set volume (diff) | |
download | minecraftvulkan-888cdf15a90c798ad272679e037ba96d12672abe.tar.gz minecraftvulkan-888cdf15a90c798ad272679e037ba96d12672abe.tar.bz2 minecraftvulkan-888cdf15a90c798ad272679e037ba96d12672abe.zip |
update .gitmodules
Diffstat (limited to 'engine')
-rwxr-xr-x | engine/xe_device.cpp | 6 | ||||
-rw-r--r-- | engine/xe_engine.cpp | 3 | ||||
-rwxr-xr-x | engine/xe_swap_chain.cpp | 12 | ||||
-rwxr-xr-x | engine/xe_swap_chain.hpp | 3 |
4 files changed, 18 insertions, 6 deletions
diff --git a/engine/xe_device.cpp b/engine/xe_device.cpp index fb2bb7b..e58a77e 100755 --- a/engine/xe_device.cpp +++ b/engine/xe_device.cpp @@ -130,7 +130,7 @@ void XeDevice::pickPhysicalDevice() { } vkGetPhysicalDeviceProperties(physicalDevice, &properties); - std::cout << "physical device: " << properties.deviceName << std::endl; + std::cout << "Physical device: " << properties.deviceName << std::endl; } void XeDevice::createLogicalDevice() { @@ -280,14 +280,14 @@ void XeDevice::hasGflwRequiredInstanceExtensions() { std::vector<VkExtensionProperties> extensions(extensionCount); vkEnumerateInstanceExtensionProperties(nullptr, &extensionCount, extensions.data()); - std::cout << "available extensions:" << std::endl; + std::cout << "Available extensions:" << std::endl; std::unordered_set<std::string> available; for (const auto &extension : extensions) { std::cout << "\t" << extension.extensionName << std::endl; available.insert(extension.extensionName); } - std::cout << "required extensions:" << std::endl; + std::cout << "Required extensions:" << std::endl; auto requiredExtensions = getRequiredExtensions(); for (const auto &required : requiredExtensions) { std::cout << "\t" << required << std::endl; diff --git a/engine/xe_engine.cpp b/engine/xe_engine.cpp index af2c470..e137d11 100644 --- a/engine/xe_engine.cpp +++ b/engine/xe_engine.cpp @@ -2,6 +2,8 @@ #include "xe_image.hpp" #include <chrono> +#include <iostream> +#include <AL/alc.h> #include <AL/alut.h> namespace xe { @@ -12,6 +14,7 @@ XeEngine::XeEngine(int width, int height, std::string name) : xeWindow{width, he xeCamera{} { loadDescriptorPool(); alutInit(0, NULL); + std::cout << "Audio device: " << alcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER) << "\n"; }; XeEngine::~XeEngine() { diff --git a/engine/xe_swap_chain.cpp b/engine/xe_swap_chain.cpp index 6e708b9..c7a0345 100755 --- a/engine/xe_swap_chain.cpp +++ b/engine/xe_swap_chain.cpp @@ -11,6 +11,8 @@ namespace xe { +bool XeSwapChain::initialSwapChainCreated = false; + XeSwapChain::XeSwapChain(XeDevice &deviceRef, VkExtent2D extent) : device{deviceRef}, windowExtent{extent} { init(); @@ -30,6 +32,7 @@ void XeSwapChain::init() { createDepthResources(); createFramebuffers(); createSyncObjects(); + initialSwapChainCreated = true; } XeSwapChain::~XeSwapChain() { @@ -382,19 +385,22 @@ VkPresentModeKHR XeSwapChain::chooseSwapPresentMode( const std::vector<VkPresentModeKHR> &availablePresentModes) { for (const auto &availablePresentMode : availablePresentModes) { if (availablePresentMode == VK_PRESENT_MODE_MAILBOX_KHR) { - std::cout << "Present mode: Mailbox" << std::endl; + if(!initialSwapChainCreated) + std::cout << "Present mode: Mailbox" << std::endl; return availablePresentMode; } } for (const auto &availablePresentMode : availablePresentModes) { if (availablePresentMode == VK_PRESENT_MODE_IMMEDIATE_KHR) { - std::cout << "Present mode: Immediate" << std::endl; + if(!initialSwapChainCreated) + std::cout << "Present mode: Immediate" << std::endl; return availablePresentMode; } } - std::cout << "Present mode: V-Sync" << std::endl; + if(!initialSwapChainCreated) + std::cout << "Present mode: V-Sync" << std::endl; return VK_PRESENT_MODE_FIFO_KHR; } diff --git a/engine/xe_swap_chain.hpp b/engine/xe_swap_chain.hpp index 50aa03f..a15a5a0 100755 --- a/engine/xe_swap_chain.hpp +++ b/engine/xe_swap_chain.hpp @@ -83,6 +83,9 @@ class XeSwapChain { std::vector<VkFence> inFlightFences; std::vector<VkFence> imagesInFlight; size_t currentFrame = 0; + + static bool initialSwapChainCreated; + }; } |