corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 950050 - Use EXTERNAL for gralloc texture targets on SGX. r=nical

Browse Source
This commit is contained in:
Chris Lord
2014-03-18 08:12:40 +00:00
parent 0d7222ab6b
commit 22c5629b78
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
gfx/layers/opengl/GrallocTextureHost.cpp
View File

@@ -88,12 +88,14 @@ TextureTargetForAndroidPixelFormat(android::PixelFormat aFormat)
GrallocTextureSourceOGL::GrallocTextureSourceOGL(CompositorOGL* aCompositor,
android::GraphicBuffer* aGraphicBuffer,
gfx::SurfaceFormat aFormat)
gfx::SurfaceFormat aFormat,
TextureFlags aFlags)
: mCompositor(aCompositor)
, mGraphicBuffer(aGraphicBuffer)
, mEGLImage(0)
, mFormat(aFormat)
, mNeedsReset(true)
, mFlags(aFlags)
{
MOZ_ASSERT(mGraphicBuffer.get());
}
@@ -187,22 +189,34 @@ GrallocTextureSourceOGL::SetCompositor(Compositor* aCompositor)
GLenum
GrallocTextureSourceOGL::GetTextureTarget() const
{
MOZ_ASSERT(gl());
MOZ_ASSERT(mGraphicBuffer.get());
if (!mGraphicBuffer.get()) {
if (!gl() || !mGraphicBuffer.get()) {
return LOCAL_GL_TEXTURE_EXTERNAL;
}
// SGX has a quirk that only TEXTURE_EXTERNAL works and any other value will
// result in black pixels when trying to draw from bound textures.
// Unfortunately, using TEXTURE_EXTERNAL on Adreno has a terrible effect on
// performance.
// See Bug 950050.
if (gl()->Renderer() == gl::GLRenderer::SGX530 ||
gl()->Renderer() == gl::GLRenderer::SGX540) {
return LOCAL_GL_TEXTURE_EXTERNAL;
}
return TextureTargetForAndroidPixelFormat(mGraphicBuffer->getPixelFormat());
}
gfx::SurfaceFormat
GrallocTextureSourceOGL::GetFormat() const {
MOZ_ASSERT(mGraphicBuffer.get());
if (!mGraphicBuffer.get()) {
return gfx::SurfaceFormat::UNKNOWN;
}
if (GetTextureTarget() == LOCAL_GL_TEXTURE_EXTERNAL) {
return gfx::SurfaceFormat::R8G8B8A8;
}
return mFormat;
return SurfaceFormatForAndroidPixelFormat(mGraphicBuffer->getPixelFormat(),
mFlags & TEXTURE_RB_SWAPPED);
}
void
@@ -294,7 +308,8 @@ GrallocTextureHostOGL::GrallocTextureHostOGL(TextureFlags aFlags,
}
mTextureSource = new GrallocTextureSourceOGL(nullptr,
graphicBuffer,
format);
format,
aFlags);
}
GrallocTextureHostOGL::~GrallocTextureHostOGL()