diff options
| author | The Android Automerger <android-build@android.com> | 2011-03-16 17:22:05 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2011-03-16 17:22:05 -0700 |
| commit | 251d50917aa0be4e3d96875cda76f21787fb0059 (patch) | |
| tree | 66ce5485a51d9ae8a0b118f323368f81665d0640 | |
| parent | a0d80cb5cb8250d5a8241652e1c4ca2b321afad3 (diff) | |
| parent | adff8fe3e93335625cc084a33dc0506581c2048d (diff) | |
| download | external_webkit-251d50917aa0be4e3d96875cda76f21787fb0059.zip external_webkit-251d50917aa0be4e3d96875cda76f21787fb0059.tar.gz external_webkit-251d50917aa0be4e3d96875cda76f21787fb0059.tar.bz2 | |
Merge commit 'adff8fe3e93335625cc084a33dc0506581c2048d' into honeycomb-mr1-release
| -rw-r--r-- | WebCore/platform/graphics/android/SharedTexture.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/platform/graphics/android/SharedTexture.cpp b/WebCore/platform/graphics/android/SharedTexture.cpp index 7a67ae6..f2da663 100644 --- a/WebCore/platform/graphics/android/SharedTexture.cpp +++ b/WebCore/platform/graphics/android/SharedTexture.cpp @@ -94,6 +94,10 @@ void SharedTexture::initSourceTexture() m_supportsEGLImage = GLUtils::isEGLImageSupported(); m_supportsEGLFenceSyncKHR = GLUtils::isEGLFenceSyncSupported(); + // TODO temporarily disable fence sync until the EGL framework fixes + // performance issues that result from consistently adding/removing fences. + m_supportsEGLFenceSyncKHR = false; + LOGI("imageEGL: %d syncKHR: %d", m_supportsEGLImage, m_supportsEGLFenceSyncKHR); glGenTextures(1, &m_sourceTexture.m_textureId); |