Skip to content

A
angle
Commit 7c2e6a96 by Martin Radev Committed by Commit Bot
Options

Do not forward multi-view fields to backend on detach

The patch fixes an unexposed bug in FramebufferGL which would pass an incorrect multi-view state to StateManagerGL on texture detachment. The bug is not exposed because upon a subsequent syncing step the correct state is queried and restored from the framebuffer state. BUG=angleproject:2062 TEST=angle_end2end_tests Change-Id: Ie0e783c53e87497b3673ef87ab9c53c3c04054a7 Reviewed-on: https://chromium-review.googlesource.com/636369 Commit-Queue: Martin Radev <mradev@nvidia.com> Reviewed-by: 's avatarOlli Etuaho <oetuaho@nvidia.com> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org>
parent 1ba9b85a
Showing with 29 additions and 49 deletions
src/libANGLE/renderer/gl/FramebufferGL.cpp
......@@ -104,19 +104,6 @@ void BindFramebufferAttachment(const FunctionsGL *functions,
}
}
void RetrieveMultiviewFieldsFromAttachment(const gl::FramebufferAttachment *attachment,
const std::vector<gl::Offset> **viewportOffsets,
GLenum *multiviewLayout,
int *baseViewIndex)
{
if (attachment)
{
*viewportOffsets = &attachment->getMultiviewViewportOffsets();
*multiviewLayout = attachment->getMultiviewLayout();
*baseViewIndex = attachment->getBaseViewIndex();
}
}
bool RequiresMultiviewClear(const FramebufferAttachment *attachment, bool scissorTestEnabled)
{
if (attachment == nullptr)
......@@ -582,31 +569,33 @@ void FramebufferGL::syncState(const gl::Context *context, const Framebuffer::Dir
mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mFramebufferID);
const std::vector<gl::Offset> *attachmentViewportOffsets = nullptr;
GLenum multiviewLayout = GL_NONE;
int baseViewIndex = -1;
bool isAttachmentModified = false;
// A pointer to one of the attachments for which the texture or the render buffer is not zero.
const FramebufferAttachment *attachment = nullptr;
for (auto dirtyBit : dirtyBits)
{
switch (dirtyBit)
{
case Framebuffer::DIRTY_BIT_DEPTH_ATTACHMENT:
BindFramebufferAttachment(mFunctions, GL_DEPTH_ATTACHMENT,
mState.getDepthAttachment());
RetrieveMultiviewFieldsFromAttachment(mState.getDepthAttachment(),
&attachmentViewportOffsets, &multiviewLayout,
&baseViewIndex);
isAttachmentModified = true;
{
const FramebufferAttachment *newAttachment = mState.getDepthAttachment();
BindFramebufferAttachment(mFunctions, GL_DEPTH_ATTACHMENT, newAttachment);
if (newAttachment)
{
attachment = newAttachment;
}
break;
}
case Framebuffer::DIRTY_BIT_STENCIL_ATTACHMENT:
BindFramebufferAttachment(mFunctions, GL_STENCIL_ATTACHMENT,
mState.getStencilAttachment());
RetrieveMultiviewFieldsFromAttachment(mState.getStencilAttachment(),
&attachmentViewportOffsets, &multiviewLayout,
&baseViewIndex);
isAttachmentModified = true;
{
const FramebufferAttachment *newAttachment = mState.getStencilAttachment();
BindFramebufferAttachment(mFunctions, GL_STENCIL_ATTACHMENT, newAttachment);
if (newAttachment)
{
attachment = newAttachment;
}
break;
}
case Framebuffer::DIRTY_BIT_DRAW_BUFFERS:
{
const auto &drawBuffers = mState.getDrawBufferStates();
......@@ -641,33 +630,24 @@ void FramebufferGL::syncState(const gl::Context *context, const Framebuffer::Dir
dirtyBit < Framebuffer::DIRTY_BIT_COLOR_ATTACHMENT_MAX);
size_t index =
static_cast<size_t>(dirtyBit - Framebuffer::DIRTY_BIT_COLOR_ATTACHMENT_0);
BindFramebufferAttachment(mFunctions,
static_cast<GLenum>(GL_COLOR_ATTACHMENT0 + index),
mState.getColorAttachment(index));
RetrieveMultiviewFieldsFromAttachment(mState.getColorAttachment(index),
&attachmentViewportOffsets, &multiviewLayout,
&baseViewIndex);
isAttachmentModified = true;
const FramebufferAttachment *newAttachment = mState.getColorAttachment(index);
BindFramebufferAttachment(
mFunctions, static_cast<GLenum>(GL_COLOR_ATTACHMENT0 + index), newAttachment);
if (newAttachment)
{
attachment = newAttachment;
}
break;
}
}
}
// TODO(mradev): Handle case in which a texture is detached in a multi-view context.
if (isAttachmentModified)
if (attachment)
{
const bool isSideBySide = multiviewLayout == GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE;
const bool isSideBySide =
(attachment->getMultiviewLayout() == GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE);
mStateManager->setSideBySide(isSideBySide);
if (attachmentViewportOffsets != nullptr)
{
mStateManager->setViewportOffsets(*attachmentViewportOffsets);
}
else
{
mStateManager->setViewportOffsets(
FramebufferAttachment::GetDefaultViewportOffsetVector());
}
mStateManager->setViewportOffsets(attachment->getMultiviewViewportOffsets());
mStateManager->updateMultiviewBaseViewLayerIndexUniform(context->getGLState().getProgram(),
getState());
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment