Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-21 06:33:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixes in VulkanContext

Browse Source
This commit is contained in:
Henrik Rydgard 2015-12-31 00:30:36 +01:00
parent 2a449f78bb
commit 847cab231f
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ext/native/thin3d/VulkanContext.cpp
View File

@ -55,8 +55,10 @@ VulkanContext::VulkanContext(const char *app_name, uint32_t flags)
swap_chain_(nullptr),
cmd_pool_(nullptr),
cmd_(nullptr),
cmdInitActive_(false),
dbgCreateMsgCallback(nullptr),
dbgDestroyMsgCallback(nullptr)
dbgDestroyMsgCallback(nullptr),
queue_count(0)
{
// List extensions to try to enable.
instance_extension_names.push_back(VK_KHR_SURFACE_EXTENSION_NAME);
@ -273,11 +275,17 @@ void vk_submit_sync(VkDevice device, VkSemaphore waitForSemaphore, VkQueue queue
}
void VulkanContext::BeginInitCommandBuffer() {
assert(!cmdInitActive_);
VulkanBeginCommandBuffer(cmd_);
cmdInitActive_ = true;
}
void VulkanContext::SubmitInitCommandBufferSync() {
vk_submit_sync(device_, 0, gfx_queue_, cmd_);
if (cmdInitActive_) {
vkEndCommandBuffer(cmd_);
vk_submit_sync(device_, 0, gfx_queue_, cmd_);
cmdInitActive_ = false;
}
}
void VulkanContext::InitObjects(HINSTANCE hInstance, HWND hWnd, bool depthPresent) {
@ -306,11 +314,11 @@ void VulkanContext::DestroyObjects() {
void VulkanContext::EndSurfaceRenderPass() {
vkCmdEndRenderPass(cmd_);
vk_transition_to_present(cmd_, swapChainBuffers[current_buffer].image);
VkResult res = vkEndCommandBuffer(cmd_);
assert(res == VK_SUCCESS);
vk_transition_to_present(cmd_, swapChainBuffers[current_buffer].image);
/* Make sure command buffer is finished before presenting */
vk_submit_sync(device_, acquireSemaphore, gfx_queue_, cmd_);
// At this point we are certain that acquireSemaphore is of no further use and can be destroyed.
@ -1056,7 +1064,7 @@ void VulkanContext::InitCommandPool() {
cmd_pool_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO;
cmd_pool_info.pNext = NULL;
cmd_pool_info.queueFamilyIndex = gfx_queue_family_index_;
cmd_pool_info.flags = 0;
cmd_pool_info.flags = VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT | VK_COMMAND_POOL_CREATE_TRANSIENT_BIT;
res = vkCreateCommandPool(device_, &cmd_pool_info, NULL, &cmd_pool_);
assert(res == VK_SUCCESS);

1
ext/native/thin3d/VulkanContext.h
View File

@ -161,6 +161,7 @@ public:
VkCommandPool cmd_pool_;
VkCommandBuffer cmd_; // Buffer for initialization commands
bool cmdInitActive_;
VkInstance instance_;
VkDevice device_;