diff options
| author | Stenzek <stenzek@users.noreply.github.com> | 2017-04-15 18:13:45 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-15 18:13:45 +1000 |
| commit | 2a91b2a4dd9e777054397bb239ee76bbd0598452 (patch) | |
| tree | 03a3868a69287109f5f67b9f496c3129c8909088 /Source/Core | |
| parent | 0d98ffa2b29d0bf2227dc8514c42753ac5c4650f (diff) | |
| parent | c8b98dca1ad2380a6cec1dac63ed5d200c01caf8 (diff) | |
Merge pull request #5258 from stenzek/vulkan-out-of-range-clear
Vulkan: Fix incorrect render pass for out-of-range clears
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/VideoBackends/Vulkan/CommandBufferManager.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Vulkan/Renderer.cpp | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Source/Core/VideoBackends/Vulkan/CommandBufferManager.cpp b/Source/Core/VideoBackends/Vulkan/CommandBufferManager.cpp index 460ec919aa..19ebbf3cb7 100644 --- a/Source/Core/VideoBackends/Vulkan/CommandBufferManager.cpp +++ b/Source/Core/VideoBackends/Vulkan/CommandBufferManager.cpp @@ -91,8 +91,8 @@ bool CommandBufferManager::CreateCommandBuffers() VkDescriptorPoolSize pool_sizes[] = {{VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, 500000}, {VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 500000}, {VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 16}, - {VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, 1024}, - {VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, 1024}}; + {VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, 16384}, + {VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, 16384}}; VkDescriptorPoolCreateInfo pool_create_info = {VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO, nullptr, diff --git a/Source/Core/VideoBackends/Vulkan/Renderer.cpp b/Source/Core/VideoBackends/Vulkan/Renderer.cpp index eba40f0315..7e5c78f6b0 100644 --- a/Source/Core/VideoBackends/Vulkan/Renderer.cpp +++ b/Source/Core/VideoBackends/Vulkan/Renderer.cpp @@ -332,6 +332,11 @@ void Renderer::ClearScreen(const EFBRectangle& rc, bool color_enable, bool alpha { // Native -> EFB coordinates TargetRectangle target_rc = Renderer::ConvertEFBRectangle(rc); + + // Size we pass this size to vkBeginRenderPass, it has to be clamped to the framebuffer + // dimensions. The other backends just silently ignore this case. + target_rc.ClampUL(0, 0, m_target_width, m_target_height); + VkRect2D target_vk_rc = { {target_rc.left, target_rc.top}, {static_cast<uint32_t>(target_rc.GetWidth()), static_cast<uint32_t>(target_rc.GetHeight())}}; |