Skip to content
Permalink
Browse files

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

Vulkan: Don't set a negative offset in scissor rect
  • Loading branch information...
stenzek committed Apr 28, 2019
2 parents d2d8d7c + 53af27b commit 1b1662773eff56d4c25818b7470ff2d6de19cb53
@@ -561,6 +561,19 @@ void Renderer::SetScissorRect(const MathUtil::Rectangle<int>& rc)
{
VkRect2D scissor = {{rc.left, rc.top},
{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);
}

@@ -223,10 +223,7 @@ AbstractTexture* FramebufferManager::ResolveEFBColorTexture(const MathUtil::Rect
{
// Return the normal EFB texture if multisampling is off.
if (!IsEFBMultisampled())
{
m_efb_color_texture->FinishedRendering();
return m_efb_color_texture.get();
}

// It's not valid to resolve an out-of-range rectangle.
MathUtil::Rectangle<int> clamped_region = region;
@@ -246,10 +243,7 @@ AbstractTexture* FramebufferManager::ResolveEFBColorTexture(const MathUtil::Rect
AbstractTexture* FramebufferManager::ResolveEFBDepthTexture(const MathUtil::Rectangle<int>& region)
{
if (!IsEFBMultisampled())
{
m_efb_depth_texture->FinishedRendering();
return m_efb_depth_texture.get();
}

// It's not valid to resolve an out-of-range rectangle.
MathUtil::Rectangle<int> clamped_region = region;
@@ -566,6 +560,7 @@ void FramebufferManager::PopulateEFBCache(bool depth, u32 tile_index)
// Downsample from internal resolution to 1x.
// TODO: This won't produce correct results at IRs above 2x. More samples are required.
// This is the same issue as with EFB copies.
src_texture->FinishedRendering();
g_renderer->BeginUtilityDrawing();

const float rcp_src_width = 1.0f / m_efb_framebuffer->GetWidth();
@@ -2185,6 +2185,7 @@ void TextureCacheBase::CopyEFBToCacheEntry(TCacheEntry* entry, bool is_depth_cop
is_depth_copy ? g_framebuffer_manager->ResolveEFBDepthTexture(framebuffer_rect) :
g_framebuffer_manager->ResolveEFBColorTexture(framebuffer_rect);

src_texture->FinishedRendering();
g_renderer->BeginUtilityDrawing();

// Fill uniform buffer.
@@ -2252,6 +2253,7 @@ void TextureCacheBase::CopyEFB(AbstractStagingTexture* dst, const EFBCopyParams&
params.depth ? g_framebuffer_manager->ResolveEFBDepthTexture(framebuffer_rect) :
g_framebuffer_manager->ResolveEFBColorTexture(framebuffer_rect);

src_texture->FinishedRendering();
g_renderer->BeginUtilityDrawing();

// Fill uniform buffer.

0 comments on commit 1b16627

Please sign in to comment.
You can’t perform that action at this time.