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

Bug 1131793 - Disable SurfaceTexture detach on Mali r=jgilbert

Browse Source
This commit is contained in:
James Willcox
2015-02-13 16:59:03 -06:00
parent da8f353828
commit 0a9b93bb83
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/gl/AndroidSurfaceTexture.cpp
View File

@@ -129,9 +129,11 @@ void
AndroidSurfaceTexture::UpdateCanDetach() AndroidSurfaceTexture::UpdateCanDetach()
{ {
// The API for attach/detach only exists on 16+, and PowerVR has some sort of // The API for attach/detach only exists on 16+, and PowerVR has some sort of
// fencing issue. // fencing issue. Additionally, attach/detach seems to be busted on at least some
// Mali adapters (400MP2 for sure, bug 1131793)
mCanDetach = AndroidBridge::Bridge()->GetAPIVersion() >= 16 && mCanDetach = AndroidBridge::Bridge()->GetAPIVersion() >= 16 &&
(!mAttachedContext || mAttachedContext->Vendor() != GLVendor::Imagination); (!mAttachedContext || mAttachedContext->Vendor() != GLVendor::Imagination) &&
(!mAttachedContext || mAttachedContext->Vendor() != GLVendor::ARM /* Mali */);
} }
bool bool

3
gfx/gl/GLContext.cpp
View File

@@ -584,7 +584,8 @@ GLContext::InitWithPrefix(const char *prefix, bool trygl)
"Imagination", "Imagination",
"nouveau", "nouveau",
"Vivante", "Vivante",
"VMware, Inc." "VMware, Inc.",
"ARM"
}; };
mVendor = GLVendor::Other; mVendor = GLVendor::Other;

1
gfx/gl/GLContext.h
View File

@@ -154,6 +154,7 @@ enum class GLVendor {
Nouveau, Nouveau,
Vivante, Vivante,
VMware, VMware,
ARM,
Other Other
}; };