Skip to content

A
angle
Commit 1cbe9203 by Frank Henigman Committed by Commit Bot
Options

Clip TextureGL::copyImage to framebuffer.

Ensure the underlying GL does not modify areas of the texture that correspond to areas outside the framebuffer, as required for WebGL. Also zero out the texture in WebGL mode because CopyTexImage must return zeroes for areas outside the framebuffer. Enable corresponding test. BUG=angleproject:1815 Change-Id: I51b1221dbf0dda0952e2ae89ee6ac925b5d1d4a4 Reviewed-on: https://chromium-review.googlesource.com/551535 Commit-Queue: Frank Henigman <fjhenigman@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org>
parent 0cdf3683
Showing with 70 additions and 28 deletions
src/libANGLE/renderer/gl/TextureGL.cpp
...@@ -548,45 +548,90 @@ gl::Error TextureGL::setCompressedSubImage(const gl::Context *context, ...@@ -548,45 +548,90 @@ gl::Error TextureGL::setCompressedSubImage(const gl::Context *context,
gl::Error TextureGL::copyImage(const gl::Context *context, gl::Error TextureGL::copyImage(const gl::Context *context,
GLenum target, GLenum target,
size_t level, size_t level,
const gl::Rectangle &sourceArea, const gl::Rectangle &origSourceArea,
GLenum internalFormat, GLenum internalFormat,
const gl::Framebuffer *source) const gl::Framebuffer *source)
{ {
nativegl::CopyTexImageImageFormat copyTexImageFormat = nativegl::GetCopyTexImageImageFormat( GLenum type = source->getImplementationColorReadType(context);
mFunctions, mWorkarounds, internalFormat, source->getImplementationColorReadType(context)); nativegl::CopyTexImageImageFormat copyTexImageFormat =
nativegl::GetCopyTexImageImageFormat(mFunctions, mWorkarounds, internalFormat, type);
LevelInfoGL levelInfo = GetLevelInfo(internalFormat, copyTexImageFormat.internalFormat); mStateManager->bindTexture(getTarget(), mTextureID);
if (levelInfo.lumaWorkaround.enabled)
const FramebufferGL *sourceFramebufferGL = GetImplAs<FramebufferGL>(source);
gl::Extents fbSize = sourceFramebufferGL->getState().getReadAttachment()->getSize();
// Did the read area go outside the framebuffer?
bool outside = origSourceArea.x < 0 || origSourceArea.y < 0 ||
origSourceArea.x + origSourceArea.width > fbSize.width ||
origSourceArea.y + origSourceArea.height > fbSize.height;
// In WebGL mode the area outside the framebuffer must be zeroed.
// We just zero the whole thing before copying into the area that overlaps the framebuffer.
if (outside && context->getExtensions().webglCompatibility)
{ {
gl::Error error = mBlitter->copyImageToLUMAWorkaroundTexture( // TODO(fjhenigman): When robust resource initialization is implemented, avoid redundant
context, mTextureID, getTarget(), target, levelInfo.sourceFormat, level, sourceArea, // clearing of the texture.
copyTexImageFormat.internalFormat, source); GLuint pixelBytes =
if (error.isError()) gl::GetInternalFormatInfo(copyTexImageFormat.internalFormat, type).pixelBytes;
{ angle::MemoryBuffer *zero;
return error; ANGLE_TRY(context->getScratchBuffer(
} origSourceArea.width * origSourceArea.height * pixelBytes, &zero));
zero->fill(0);
mStateManager->setPixelUnpackState(gl::PixelUnpackState(1, 0));
mFunctions->texImage2D(target, static_cast<GLint>(level), copyTexImageFormat.internalFormat,
origSourceArea.width, origSourceArea.height, 0,
gl::GetUnsizedFormat(copyTexImageFormat.internalFormat), type,
zero->data());
} }
else
{
const FramebufferGL *sourceFramebufferGL = GetImplAs<FramebufferGL>(source);
mStateManager->bindTexture(getTarget(), mTextureID); // Clip source area to framebuffer and copy if remaining area is not empty.
mStateManager->bindFramebuffer(GL_READ_FRAMEBUFFER, gl::Rectangle sourceArea;
sourceFramebufferGL->getFramebufferID()); if (ClipRectangle(origSourceArea, gl::Rectangle(0, 0, fbSize.width, fbSize.height),
&sourceArea))
{
LevelInfoGL levelInfo = GetLevelInfo(internalFormat, copyTexImageFormat.internalFormat);
gl::Offset destOffset(sourceArea.x - origSourceArea.x, sourceArea.y - origSourceArea.y, 0);
if (UseTexImage2D(getTarget())) if (levelInfo.lumaWorkaround.enabled)
{ {
mFunctions->copyTexImage2D(target, static_cast<GLint>(level), if (outside)
copyTexImageFormat.internalFormat, sourceArea.x, {
sourceArea.y, sourceArea.width, sourceArea.height, 0); ANGLE_TRY(mBlitter->copySubImageToLUMAWorkaroundTexture(
context, mTextureID, getTarget(), target, levelInfo.sourceFormat, level,
destOffset, sourceArea, source));
}
else
{
ANGLE_TRY(mBlitter->copyImageToLUMAWorkaroundTexture(
context, mTextureID, getTarget(), target, levelInfo.sourceFormat, level,
sourceArea, copyTexImageFormat.internalFormat, source));
}
}
else if (UseTexImage2D(getTarget()))
{
mStateManager->bindFramebuffer(GL_READ_FRAMEBUFFER,
sourceFramebufferGL->getFramebufferID());
if (outside)
{
mFunctions->copyTexSubImage2D(target, static_cast<GLint>(level), destOffset.x,
destOffset.y, sourceArea.x, sourceArea.y,
sourceArea.width, sourceArea.height);
}
else
{
mFunctions->copyTexImage2D(target, static_cast<GLint>(level),
copyTexImageFormat.internalFormat, sourceArea.x,
sourceArea.y, sourceArea.width, sourceArea.height, 0);
}
} }
else else
{ {
UNREACHABLE(); UNREACHABLE();
} }
}
setLevelInfo(target, level, 1, levelInfo); setLevelInfo(target, level, 1, levelInfo);
}
return gl::NoError(); return gl::NoError();
} }
......
src/tests/gl_tests/WebGLReadOutsideFramebufferTest.cpp
...@@ -276,10 +276,7 @@ TEST_P(WebGLReadOutsideFramebufferTest, CopyTexSubImage2D) ...@@ -276,10 +276,7 @@ TEST_P(WebGLReadOutsideFramebufferTest, CopyTexSubImage2D)
// Check that copyTexImage2D sets (0,0,0,0) for pixels outside the framebuffer. // Check that copyTexImage2D sets (0,0,0,0) for pixels outside the framebuffer.
TEST_P(WebGLReadOutsideFramebufferTest, CopyTexImage2D) TEST_P(WebGLReadOutsideFramebufferTest, CopyTexImage2D)
{ {
if (IsD3DSM3() || IsD3D11()) Main(&WebGLReadOutsideFramebufferTest::TestCopyTexImage2D, true);
{
Main(&WebGLReadOutsideFramebufferTest::TestCopyTexImage2D, true);
}
} }
ANGLE_INSTANTIATE_TEST(WebGLReadOutsideFramebufferTest, ANGLE_INSTANTIATE_TEST(WebGLReadOutsideFramebufferTest,
......
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