zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-01-18 15:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- present an empty back buffer while keeping vsync

Browse source
This commit is contained in:
Magnus Norddahl 2019-02-21 10:19:59 +01:00
parent 75403ec744
commit fc79cd1280
2 changed files with 68 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,6 +34,7 @@
#include "vk_framebuffer.h"
#include "vulkan/textures/vk_samplers.h"
#include "vulkan/system/vk_builders.h"
#include "vulkan/system/vk_swapchain.h"
#include "doomerrors.h"
#include <ShaderLang.h>
@ -45,9 +46,20 @@ EXTERN_CVAR(Int, gl_tonemap)
VulkanFrameBuffer::VulkanFrameBuffer(void *hMonitor, bool fullscreen, VulkanDevice *dev) :
Super(hMonitor, fullscreen)
{
ShInitialize();
device = dev;
SetViewportRects(nullptr);
}
//screen = this; // temporary hack to make the tutorial code work.
VulkanFrameBuffer::~VulkanFrameBuffer()
{
ShFinalize();
}
void VulkanFrameBuffer::InitializeState()
{
ShInitialize();
mSamplerManager.reset(new VkSamplerManager(device));
mGraphicsCommandPool.reset(new VulkanCommandPool(device, device->graphicsFamily));
#if 0
{
@ -66,20 +78,6 @@ VulkanFrameBuffer::VulkanFrameBuffer(void *hMonitor, bool fullscreen, VulkanDevi
auto shader = builder.create(dev);
}
#endif
device = dev;
mSamplerManager = new VkSamplerManager(device);
SetViewportRects(nullptr);
}
VulkanFrameBuffer::~VulkanFrameBuffer()
{
delete mSamplerManager;
ShFinalize();
}
void VulkanFrameBuffer::InitializeState()
{
}
void VulkanFrameBuffer::Update()
@ -87,24 +85,57 @@ void VulkanFrameBuffer::Update()
twoD.Reset();
Flush3D.Reset();
DrawRateStuff();
Flush3D.Clock();
//vulkantest_tick();
int newWidth = GetClientWidth();
int newHeight = GetClientHeight();
if (lastSwapWidth != newWidth || lastSwapHeight != newHeight)
{
device->windowResized();
lastSwapWidth = newWidth;
lastSwapHeight = newHeight;
}
device->beginFrame();
mPresentCommands = mGraphicsCommandPool->createBuffer();
mPresentCommands->begin();
Draw2D();
Clear2D();
//DrawPresentTexture(mOutputLetterbox, true);
mPresentCommands->end();
VkSemaphore waitSemaphores[] = { device->imageAvailableSemaphore };
VkPipelineStageFlags waitStages[] = { VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT };
VkSubmitInfo submitInfo = {};
submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
submitInfo.waitSemaphoreCount = 1;
submitInfo.pWaitSemaphores = waitSemaphores;
submitInfo.pWaitDstStageMask = waitStages;
submitInfo.commandBufferCount = 1;
submitInfo.pCommandBuffers = &mPresentCommands->buffer;
submitInfo.signalSemaphoreCount = 1;
submitInfo.pSignalSemaphores = &device->renderFinishedSemaphore;
VkResult result = vkQueueSubmit(device->graphicsQueue, 1, &submitInfo, device->renderFinishedFence);
if (result != VK_SUCCESS)
I_FatalError("Failed to submit command buffer!\n");
Flush3D.Unclock();
Swap();
CheckBench();
Finish.Reset();
Finish.Clock();
device->presentFrame();
device->waitPresent();
int initialWidth = GetClientWidth();
int initialHeight = GetClientHeight();
int clientWidth = ViewportScaledWidth(initialWidth, initialHeight);
int clientHeight = ViewportScaledHeight(initialWidth, initialHeight);
if (clientWidth > 0 && clientHeight > 0 && (GetWidth() != clientWidth || GetHeight() != clientHeight))
{
SetVirtualSize(clientWidth, clientHeight);
V_OutputResized(clientWidth, clientHeight);
//GLRenderer->mVBO->OutputResized(clientWidth, clientHeight);
}
mPresentCommands.reset();
mUploadCommands.reset();
Finish.Unclock();
Super::Update();
}
void VulkanFrameBuffer::WriteSavePic(player_t *player, FileWriter *file, int width, int height)
@ -135,11 +166,6 @@ uint32_t VulkanFrameBuffer::GetCaps()
return (uint32_t)FlagSet;
}
void VulkanFrameBuffer::Swap()
{
//vulkantest_present();
}
void VulkanFrameBuffer::SetVSync(bool vsync)
{
}

10
src/rendering/vulkan/system/vk_framebuffer.h
View file

@ -13,9 +13,11 @@ class VulkanFrameBuffer : public SystemBaseFrameBuffer
public:
VulkanDevice *device;
VkSamplerManager *mSamplerManager;
std::unique_ptr<VkSamplerManager> mSamplerManager;
std::unique_ptr<VulkanCommandPool> mGraphicsCommandPool;
std::unique_ptr<VulkanCommandBuffer> mUploadCommands;
std::unique_ptr<VulkanCommandBuffer> mPresentCommands;
explicit VulkanFrameBuffer() {}
VulkanFrameBuffer(void *hMonitor, bool fullscreen, VulkanDevice *dev);
~VulkanFrameBuffer();
@ -43,11 +45,13 @@ public:
void WipeCleanup();
*/
void Swap();
void SetVSync(bool vsync);
void Draw2D() override;
private:
int camtexcount = 0;
int lastSwapWidth = 0;
int lastSwapHeight = 0;
};