zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-01-31 04:20:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

- hook up vid_vsync and vk_debug

Browse source
This commit is contained in:
Magnus Norddahl 2019-02-27 22:20:18 +01:00
parent b4154f1772
commit c2e0eba270
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/rendering/vulkan/system/vk_device.cpp
View file

@ -46,6 +46,8 @@ extern HWND Window;
#include "version.h"
#include "doomerrors.h"
EXTERN_CVAR(Bool, vid_vsync);
#ifdef NDEBUG
CVAR(Bool, vk_debug, true, 0); // this should be false, once the oversized model can be removed.
#else
@ -74,7 +76,7 @@ VulkanDevice::VulkanDevice()
RECT clientRect = { 0 };
GetClientRect(Window, &clientRect);
swapChain = std::make_unique<VulkanSwapChain>(this, clientRect.right, clientRect.bottom, true);
swapChain = std::make_unique<VulkanSwapChain>(this, clientRect.right, clientRect.bottom, vid_vsync);
createSemaphores();
}
@ -96,7 +98,7 @@ void VulkanDevice::windowResized()
GetClientRect(Window, &clientRect);
swapChain.reset();
swapChain = std::make_unique<VulkanSwapChain>(this, clientRect.right, clientRect.bottom, true);
swapChain = std::make_unique<VulkanSwapChain>(this, clientRect.right, clientRect.bottom, vid_vsync);
}
void VulkanDevice::waitPresent()
@ -177,10 +179,11 @@ void VulkanDevice::createInstance()
std::vector<const char*> validationLayers;
std::string debugLayer = "VK_LAYER_LUNARG_standard_validation";
bool wantDebugLayer = vk_debug;
bool debugLayerFound = false;
for (const VkLayerProperties &layer : availableLayers)
{
if (layer.layerName == debugLayer)
if (layer.layerName == debugLayer && wantDebugLayer)
{
validationLayers.push_back(debugLayer.c_str());
enabledExtensions.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);

4
src/rendering/vulkan/system/vk_framebuffer.cpp
View file

@ -261,6 +261,10 @@ uint32_t VulkanFrameBuffer::GetCaps()
void VulkanFrameBuffer::SetVSync(bool vsync)
{
if (device->swapChain->vsync != vsync)
{
device->windowResized();
}
}
void VulkanFrameBuffer::CleanForRestart()

2
src/rendering/vulkan/system/vk_swapchain.cpp
View file

@ -1,7 +1,7 @@
#include "vk_swapchain.h"
VulkanSwapChain::VulkanSwapChain(VulkanDevice *device, int width, int height, bool vsync) : device(device)
VulkanSwapChain::VulkanSwapChain(VulkanDevice *device, int width, int height, bool vsync) : vsync(vsync), device(device)
{
VkSurfaceCapabilitiesKHR surfaceCapabilities;
VkResult result = vkGetPhysicalDeviceSurfaceCapabilitiesKHR(device->physicalDevice, device->surface, &surfaceCapabilities);

1
src/rendering/vulkan/system/vk_swapchain.h
View file

@ -8,6 +8,7 @@ public:
VulkanSwapChain(VulkanDevice *device, int width, int height, bool vsync);
~VulkanSwapChain();
bool vsync;
VkSwapchainKHR swapChain;
VkSurfaceFormatKHR swapChainFormat;