Skip to content

A
angle
Commit 235e56fb by Geoff Lang Committed by Commit Bot
Options

BlitGL: Support CL readback from non-renderable textures.

External textures are often not renderable for the CPU readback path. Instead, copy them into a renderable texture and then read them back. BUG=906724 Change-Id: I61bd0a9d51c4b24e1d285b5f1883e01ccb53ebea Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1680053 Commit-Queue: Geoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarShahbaz Youssefi <syoussefi@chromium.org>
parent c5da7997
Showing with 79 additions and 26 deletions
src/libANGLE/renderer/gl/BlitGL.cpp
...@@ -502,7 +502,7 @@ angle::Result BlitGL::copySubTexture(const gl::Context *context, ...@@ -502,7 +502,7 @@ angle::Result BlitGL::copySubTexture(const gl::Context *context,
TextureGL *source, TextureGL *source,
size_t sourceLevel, size_t sourceLevel,
GLenum sourceComponentType, GLenum sourceComponentType,
TextureGL *dest, GLuint destID,
gl::TextureTarget destTarget, gl::TextureTarget destTarget,
size_t destLevel, size_t destLevel,
GLenum destComponentType, GLenum destComponentType,
...@@ -524,7 +524,7 @@ angle::Result BlitGL::copySubTexture(const gl::Context *context, ...@@ -524,7 +524,7 @@ angle::Result BlitGL::copySubTexture(const gl::Context *context,
// cube maps may not be renderable until all faces have been filled. // cube maps may not be renderable until all faces have been filled.
mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mScratchFBO); mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mScratchFBO);
mFunctions->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, ToGLenum(destTarget), mFunctions->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, ToGLenum(destTarget),
dest->getTextureID(), static_cast<GLint>(destLevel)); destID, static_cast<GLint>(destLevel));
GLenum status = mFunctions->checkFramebufferStatus(GL_FRAMEBUFFER); GLenum status = mFunctions->checkFramebufferStatus(GL_FRAMEBUFFER);
if (status != GL_FRAMEBUFFER_COMPLETE) if (status != GL_FRAMEBUFFER_COMPLETE)
{ {
...@@ -608,14 +608,17 @@ angle::Result BlitGL::copySubTexture(const gl::Context *context, ...@@ -608,14 +608,17 @@ angle::Result BlitGL::copySubTexture(const gl::Context *context,
angle::Result BlitGL::copySubTextureCPUReadback(const gl::Context *context, angle::Result BlitGL::copySubTextureCPUReadback(const gl::Context *context,
TextureGL *source, TextureGL *source,
size_t sourceLevel, size_t sourceLevel,
GLenum sourceComponentType, GLenum sourceSizedInternalFormat,
TextureGL *dest, TextureGL *dest,
gl::TextureTarget destTarget, gl::TextureTarget destTarget,
size_t destLevel, size_t destLevel,
GLenum destFormat, GLenum destFormat,
GLenum destType, GLenum destType,
const gl::Extents &sourceSize,
const gl::Rectangle &sourceArea, const gl::Rectangle &sourceArea,
const gl::Offset &destOffset, const gl::Offset &destOffset,
bool needsLumaWorkaround,
GLenum lumaFormat,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
bool unpackUnmultiplyAlpha) bool unpackUnmultiplyAlpha)
...@@ -624,20 +627,65 @@ angle::Result BlitGL::copySubTextureCPUReadback(const gl::Context *context, ...@@ -624,20 +627,65 @@ angle::Result BlitGL::copySubTextureCPUReadback(const gl::Context *context,
ContextGL *contextGL = GetImplAs<ContextGL>(context); ContextGL *contextGL = GetImplAs<ContextGL>(context);
ASSERT(source->getType() == gl::TextureType::_2D); ASSERT(source->getType() == gl::TextureType::_2D ||
source->getType() == gl::TextureType::External);
const auto &destInternalFormatInfo = gl::GetInternalFormatInfo(destFormat, destType); const auto &destInternalFormatInfo = gl::GetInternalFormatInfo(destFormat, destType);
const gl::InternalFormat &sourceInternalFormatInfo =
gl::GetSizedInternalFormatInfo(sourceSizedInternalFormat);
gl::Rectangle readPixelsArea = sourceArea;
mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mScratchFBO); mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mScratchFBO);
mFunctions->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mFunctions->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
source->getTextureID(), static_cast<GLint>(sourceLevel)); ToGLenum(source->getType()), source->getTextureID(),
static_cast<GLint>(sourceLevel));
GLenum status = mFunctions->checkFramebufferStatus(GL_FRAMEBUFFER); GLenum status = mFunctions->checkFramebufferStatus(GL_FRAMEBUFFER);
if (status != GL_FRAMEBUFFER_COMPLETE)
{
// The source texture cannot be read with glReadPixels. Copy it into another RGBA texture
// and read that back instead.
nativegl::TexImageFormat texImageFormat = nativegl::GetTexImageFormat(
mFunctions, mFeatures, sourceInternalFormatInfo.internalFormat,
sourceInternalFormatInfo.format, sourceInternalFormatInfo.type);
gl::TextureType scratchTextureType = gl::TextureType::_2D;
mStateManager->bindTexture(scratchTextureType, mScratchTextures[0]);
mFunctions->texImage2D(ToGLenum(scratchTextureType), 0, texImageFormat.internalFormat,
sourceArea.width, sourceArea.height, 0, texImageFormat.format,
texImageFormat.type, nullptr);
bool copySucceeded = false;
ANGLE_TRY(copySubTexture(
context, source, sourceLevel, sourceInternalFormatInfo.componentType,
mScratchTextures[0], NonCubeTextureTypeToTarget(scratchTextureType), 0,
sourceInternalFormatInfo.componentType, sourceSize, sourceArea, gl::Offset(0, 0, 0),
needsLumaWorkaround, lumaFormat, false, false, false, &copySucceeded));
if (!copySucceeded)
{
// No fallback options if we can't render to the scratch texture.
return angle::Result::Stop;
}
// Bind the scratch texture as the readback texture
mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mScratchFBO);
mFunctions->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
ToGLenum(scratchTextureType), mScratchTextures[0], 0);
// The scratch texture sized to sourceArea so adjust the readpixels area
readPixelsArea.x = 0;
readPixelsArea.y = 0;
// Recheck the status
status = mFunctions->checkFramebufferStatus(GL_FRAMEBUFFER);
}
ASSERT(status == GL_FRAMEBUFFER_COMPLETE); ASSERT(status == GL_FRAMEBUFFER_COMPLETE);
// Create a buffer for holding the source and destination memory // Create a buffer for holding the source and destination memory
const size_t sourcePixelSize = 4; const size_t sourcePixelSize = 4;
size_t sourceBufferSize = sourceArea.width * sourceArea.height * sourcePixelSize; size_t sourceBufferSize = readPixelsArea.width * readPixelsArea.height * sourcePixelSize;
size_t destBufferSize = size_t destBufferSize =
sourceArea.width * sourceArea.height * destInternalFormatInfo.pixelBytes; readPixelsArea.width * readPixelsArea.height * destInternalFormatInfo.pixelBytes;
angle::MemoryBuffer *buffer = nullptr; angle::MemoryBuffer *buffer = nullptr;
ANGLE_CHECK_GL_ALLOC(contextGL, ANGLE_CHECK_GL_ALLOC(contextGL,
context->getScratchBuffer(sourceBufferSize + destBufferSize, &buffer)); context->getScratchBuffer(sourceBufferSize + destBufferSize, &buffer));
...@@ -647,14 +695,14 @@ angle::Result BlitGL::copySubTextureCPUReadback(const gl::Context *context, ...@@ -647,14 +695,14 @@ angle::Result BlitGL::copySubTextureCPUReadback(const gl::Context *context,
GLenum readPixelsFormat = GL_NONE; GLenum readPixelsFormat = GL_NONE;
PixelReadFunction readFunction = nullptr; PixelReadFunction readFunction = nullptr;
if (sourceComponentType == GL_UNSIGNED_INT) if (sourceInternalFormatInfo.componentType == GL_UNSIGNED_INT)
{ {
readPixelsFormat = GL_RGBA_INTEGER; readPixelsFormat = GL_RGBA_INTEGER;
readFunction = angle::ReadColor<angle::R8G8B8A8, GLuint>; readFunction = angle::ReadColor<angle::R8G8B8A8, GLuint>;
} }
else else
{ {
ASSERT(sourceComponentType != GL_INT); ASSERT(sourceInternalFormatInfo.componentType != GL_INT);
readPixelsFormat = GL_RGBA; readPixelsFormat = GL_RGBA;
readFunction = angle::ReadColor<angle::R8G8B8A8, GLfloat>; readFunction = angle::ReadColor<angle::R8G8B8A8, GLfloat>;
} }
...@@ -663,18 +711,18 @@ angle::Result BlitGL::copySubTextureCPUReadback(const gl::Context *context, ...@@ -663,18 +711,18 @@ angle::Result BlitGL::copySubTextureCPUReadback(const gl::Context *context,
unpack.alignment = 1; unpack.alignment = 1;
mStateManager->setPixelUnpackState(unpack); mStateManager->setPixelUnpackState(unpack);
mStateManager->setPixelUnpackBuffer(nullptr); mStateManager->setPixelUnpackBuffer(nullptr);
mFunctions->readPixels(sourceArea.x, sourceArea.y, sourceArea.width, sourceArea.height, mFunctions->readPixels(readPixelsArea.x, readPixelsArea.y, readPixelsArea.width,
readPixelsFormat, GL_UNSIGNED_BYTE, sourceMemory); readPixelsArea.height, readPixelsFormat, GL_UNSIGNED_BYTE, sourceMemory);
angle::FormatID destFormatID = angle::FormatID destFormatID =
angle::Format::InternalFormatToID(destInternalFormatInfo.sizedInternalFormat); angle::Format::InternalFormatToID(destInternalFormatInfo.sizedInternalFormat);
const auto &destFormatInfo = angle::Format::Get(destFormatID); const auto &destFormatInfo = angle::Format::Get(destFormatID);
CopyImageCHROMIUM( CopyImageCHROMIUM(
sourceMemory, sourceArea.width * sourcePixelSize, sourcePixelSize, 0, readFunction, sourceMemory, readPixelsArea.width * sourcePixelSize, sourcePixelSize, 0, readFunction,
destMemory, sourceArea.width * destInternalFormatInfo.pixelBytes, destMemory, readPixelsArea.width * destInternalFormatInfo.pixelBytes,
destInternalFormatInfo.pixelBytes, 0, destFormatInfo.pixelWriteFunction, destInternalFormatInfo.pixelBytes, 0, destFormatInfo.pixelWriteFunction,
destInternalFormatInfo.format, destInternalFormatInfo.componentType, sourceArea.width, destInternalFormatInfo.format, destInternalFormatInfo.componentType, readPixelsArea.width,
sourceArea.height, 1, unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha); readPixelsArea.height, 1, unpackFlipY, unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
gl::PixelPackState pack; gl::PixelPackState pack;
pack.alignment = 1; pack.alignment = 1;
...@@ -686,7 +734,7 @@ angle::Result BlitGL::copySubTextureCPUReadback(const gl::Context *context, ...@@ -686,7 +734,7 @@ angle::Result BlitGL::copySubTextureCPUReadback(const gl::Context *context,
mStateManager->bindTexture(dest->getType(), dest->getTextureID()); mStateManager->bindTexture(dest->getType(), dest->getTextureID());
mFunctions->texSubImage2D(ToGLenum(destTarget), static_cast<GLint>(destLevel), destOffset.x, mFunctions->texSubImage2D(ToGLenum(destTarget), static_cast<GLint>(destLevel), destOffset.x,
destOffset.y, sourceArea.width, sourceArea.height, destOffset.y, readPixelsArea.width, readPixelsArea.height,
texSubImageFormat.format, texSubImageFormat.type, destMemory); texSubImageFormat.format, texSubImageFormat.type, destMemory);
return angle::Result::Continue; return angle::Result::Continue;
......
src/libANGLE/renderer/gl/BlitGL.h
...@@ -75,7 +75,7 @@ class BlitGL : angle::NonCopyable ...@@ -75,7 +75,7 @@ class BlitGL : angle::NonCopyable
TextureGL *source, TextureGL *source,
size_t sourceLevel, size_t sourceLevel,
GLenum sourceComponentType, GLenum sourceComponentType,
TextureGL *dest, GLuint destID,
gl::TextureTarget destTarget, gl::TextureTarget destTarget,
size_t destLevel, size_t destLevel,
GLenum destComponentType, GLenum destComponentType,
...@@ -92,14 +92,17 @@ class BlitGL : angle::NonCopyable ...@@ -92,14 +92,17 @@ class BlitGL : angle::NonCopyable
angle::Result copySubTextureCPUReadback(const gl::Context *context, angle::Result copySubTextureCPUReadback(const gl::Context *context,
TextureGL *source, TextureGL *source,
size_t sourceLevel, size_t sourceLevel,
GLenum sourceComponentType, GLenum sourceSizedInternalFormat,
TextureGL *dest, TextureGL *dest,
gl::TextureTarget destTarget, gl::TextureTarget destTarget,
size_t destLevel, size_t destLevel,
GLenum destFormat, GLenum destFormat,
GLenum destType, GLenum destType,
const gl::Extents &sourceSize,
const gl::Rectangle &sourceArea, const gl::Rectangle &sourceArea,
const gl::Offset &destOffset, const gl::Offset &destOffset,
bool needsLumaWorkaround,
GLenum lumaFormat,
bool unpackFlipY, bool unpackFlipY,
bool unpackPremultiplyAlpha, bool unpackPremultiplyAlpha,
bool unpackUnmultiplyAlpha); bool unpackUnmultiplyAlpha);
......
src/libANGLE/renderer/gl/TextureGL.cpp
...@@ -791,12 +791,13 @@ angle::Result TextureGL::copySubTextureHelper(const gl::Context *context, ...@@ -791,12 +791,13 @@ angle::Result TextureGL::copySubTextureHelper(const gl::Context *context,
sourceGL->getLevelInfo(NonCubeTextureTypeToTarget(source->getType()), sourceLevel); sourceGL->getLevelInfo(NonCubeTextureTypeToTarget(source->getType()), sourceLevel);
bool needsLumaWorkaround = sourceLevelInfo.lumaWorkaround.enabled; bool needsLumaWorkaround = sourceLevelInfo.lumaWorkaround.enabled;
GLenum sourceFormat = sourceImageDesc.format.info->format; const gl::InternalFormat &sourceFormatInfo = *sourceImageDesc.format.info;
GLenum sourceFormat = sourceFormatInfo.format;
bool sourceFormatContainSupersetOfDestFormat = bool sourceFormatContainSupersetOfDestFormat =
(sourceFormat == destFormat.format && sourceFormat != GL_BGRA_EXT) || (sourceFormat == destFormat.format && sourceFormat != GL_BGRA_EXT) ||
(sourceFormat == GL_RGBA && destFormat.format == GL_RGB); (sourceFormat == GL_RGBA && destFormat.format == GL_RGB);
GLenum sourceComponentType = sourceImageDesc.format.info->componentType; GLenum sourceComponentType = sourceFormatInfo.componentType;
GLenum destComponentType = destFormat.componentType; GLenum destComponentType = destFormat.componentType;
bool destSRGB = destFormat.colorEncoding == GL_SRGB; bool destSRGB = destFormat.colorEncoding == GL_SRGB;
if (!unpackFlipY && unpackPremultiplyAlpha == unpackUnmultiplyAlpha && !needsLumaWorkaround && if (!unpackFlipY && unpackPremultiplyAlpha == unpackUnmultiplyAlpha && !needsLumaWorkaround &&
...@@ -819,7 +820,7 @@ angle::Result TextureGL::copySubTextureHelper(const gl::Context *context, ...@@ -819,7 +820,7 @@ angle::Result TextureGL::copySubTextureHelper(const gl::Context *context,
{ {
bool copySucceeded = false; bool copySucceeded = false;
ANGLE_TRY(blitter->copySubTexture( ANGLE_TRY(blitter->copySubTexture(
context, sourceGL, sourceLevel, sourceComponentType, this, target, level, context, sourceGL, sourceLevel, sourceComponentType, mTextureID, target, level,
destComponentType, sourceImageDesc.size, sourceArea, destOffset, needsLumaWorkaround, destComponentType, sourceImageDesc.size, sourceArea, destOffset, needsLumaWorkaround,
sourceLevelInfo.sourceFormat, unpackFlipY, unpackPremultiplyAlpha, sourceLevelInfo.sourceFormat, unpackFlipY, unpackPremultiplyAlpha,
unpackUnmultiplyAlpha, &copySucceeded)); unpackUnmultiplyAlpha, &copySucceeded));
...@@ -830,10 +831,11 @@ angle::Result TextureGL::copySubTextureHelper(const gl::Context *context, ...@@ -830,10 +831,11 @@ angle::Result TextureGL::copySubTextureHelper(const gl::Context *context,
} }
// Fall back to CPU-readback // Fall back to CPU-readback
return blitter->copySubTextureCPUReadback(context, sourceGL, sourceLevel, sourceComponentType, return blitter->copySubTextureCPUReadback(
this, target, level, destFormat.format, context, sourceGL, sourceLevel, sourceFormatInfo.sizedInternalFormat, this, target, level,
destFormat.type, sourceArea, destOffset, unpackFlipY, destFormat.format, destFormat.type, sourceImageDesc.size, sourceArea, destOffset,
unpackPremultiplyAlpha, unpackUnmultiplyAlpha); needsLumaWorkaround, sourceLevelInfo.sourceFormat, unpackFlipY, unpackPremultiplyAlpha,
unpackUnmultiplyAlpha);
} }
angle::Result TextureGL::setStorage(const gl::Context *context, angle::Result TextureGL::setStorage(const gl::Context *context,
......
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