mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-10 12:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8048 from stenzek/vulkan-negative-scissor-rect

Browse Source 
Vulkan: Don't set a negative offset in scissor rect
This commit is contained in:
Connor McLaughlin 2019-04-28 23:37:51 +10:00 committed by GitHub
commit 1b1662773e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/VideoBackends/Vulkan/Renderer.cpp
View File

@ -561,6 +561,19 @@ void Renderer::SetScissorRect(const MathUtil::Rectangle<int>& rc)
{ {
VkRect2D scissor = {{rc.left, rc.top}, VkRect2D scissor = {{rc.left, rc.top},
{static_cast<u32>(rc.GetWidth()), static_cast<u32>(rc.GetHeight())}}; {static_cast<u32>(rc.GetWidth()), static_cast<u32>(rc.GetHeight())}};
// See Vulkan spec for vkCmdSetScissor:
// The x and y members of offset must be greater than or equal to 0.
if (scissor.offset.x < 0)
{
scissor.extent.width -= -scissor.offset.x;
scissor.offset.x = 0;
}
if (scissor.offset.y < 0)
{
scissor.extent.height -= -scissor.offset.y;
scissor.offset.y = 0;
}
StateTracker::GetInstance()->SetScissor(scissor); StateTracker::GetInstance()->SetScissor(scissor);
} }

7
Source/Core/VideoCommon/FramebufferManager.cpp
View File

@ -223,10 +223,7 @@ AbstractTexture* FramebufferManager::ResolveEFBColorTexture(const MathUtil::Rect
{ {
// Return the normal EFB texture if multisampling is off. // Return the normal EFB texture if multisampling is off.
if (!IsEFBMultisampled()) if (!IsEFBMultisampled())
{
m_efb_color_texture->FinishedRendering();
return m_efb_color_texture.get(); return m_efb_color_texture.get();
}
// It's not valid to resolve an out-of-range rectangle. // It's not valid to resolve an out-of-range rectangle.
MathUtil::Rectangle<int> clamped_region = region; MathUtil::Rectangle<int> clamped_region = region;
@ -246,10 +243,7 @@ AbstractTexture* FramebufferManager::ResolveEFBColorTexture(const MathUtil::Rect
AbstractTexture* FramebufferManager::ResolveEFBDepthTexture(const MathUtil::Rectangle<int>& region) AbstractTexture* FramebufferManager::ResolveEFBDepthTexture(const MathUtil::Rectangle<int>& region)
{ {
if (!IsEFBMultisampled()) if (!IsEFBMultisampled())
{
m_efb_depth_texture->FinishedRendering();
return m_efb_depth_texture.get(); return m_efb_depth_texture.get();
}
// It's not valid to resolve an out-of-range rectangle. // It's not valid to resolve an out-of-range rectangle.
MathUtil::Rectangle<int> clamped_region = region; MathUtil::Rectangle<int> clamped_region = region;
@ -566,6 +560,7 @@ void FramebufferManager::PopulateEFBCache(bool depth, u32 tile_index)
// Downsample from internal resolution to 1x. // Downsample from internal resolution to 1x.
// TODO: This won't produce correct results at IRs above 2x. More samples are required. // TODO: This won't produce correct results at IRs above 2x. More samples are required.
// This is the same issue as with EFB copies. // This is the same issue as with EFB copies.
src_texture->FinishedRendering();
g_renderer->BeginUtilityDrawing(); g_renderer->BeginUtilityDrawing();
const float rcp_src_width = 1.0f / m_efb_framebuffer->GetWidth(); const float rcp_src_width = 1.0f / m_efb_framebuffer->GetWidth();

2
Source/Core/VideoCommon/TextureCacheBase.cpp
View File

@ -2185,6 +2185,7 @@ void TextureCacheBase::CopyEFBToCacheEntry(TCacheEntry* entry, bool is_depth_cop
is_depth_copy ? g_framebuffer_manager->ResolveEFBDepthTexture(framebuffer_rect) : is_depth_copy ? g_framebuffer_manager->ResolveEFBDepthTexture(framebuffer_rect) :
g_framebuffer_manager->ResolveEFBColorTexture(framebuffer_rect); g_framebuffer_manager->ResolveEFBColorTexture(framebuffer_rect);
src_texture->FinishedRendering();
g_renderer->BeginUtilityDrawing(); g_renderer->BeginUtilityDrawing();
// Fill uniform buffer. // Fill uniform buffer.
@ -2252,6 +2253,7 @@ void TextureCacheBase::CopyEFB(AbstractStagingTexture* dst, const EFBCopyParams&
params.depth ? g_framebuffer_manager->ResolveEFBDepthTexture(framebuffer_rect) : params.depth ? g_framebuffer_manager->ResolveEFBDepthTexture(framebuffer_rect) :
g_framebuffer_manager->ResolveEFBColorTexture(framebuffer_rect); g_framebuffer_manager->ResolveEFBColorTexture(framebuffer_rect);
src_texture->FinishedRendering();
g_renderer->BeginUtilityDrawing(); g_renderer->BeginUtilityDrawing();
// Fill uniform buffer. // Fill uniform buffer.