diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-03-15 12:56:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-15 12:56:56 -0700 |
| commit | 49fff159362adc0289fe593ac113a8d0a0671edf (patch) | |
| tree | 310ee6487d8c8dba4e876cd6c1e562db46e9c784 /WebCore/platform | |
| parent | c9464184bfacc628a8d6cbc59969c1d4f9413c81 (diff) | |
| parent | 7710abc298e9b0cd5f05c6f80fed251dbd85ecca (diff) | |
| download | external_webkit-49fff159362adc0289fe593ac113a8d0a0671edf.zip external_webkit-49fff159362adc0289fe593ac113a8d0a0671edf.tar.gz external_webkit-49fff159362adc0289fe593ac113a8d0a0671edf.tar.bz2 | |
Merge "Enable synchronization with fencing." into honeycomb-mr1
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/graphics/android/SharedTexture.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/platform/graphics/android/SharedTexture.cpp b/WebCore/platform/graphics/android/SharedTexture.cpp index ace7234..7a67ae6 100644 --- a/WebCore/platform/graphics/android/SharedTexture.cpp +++ b/WebCore/platform/graphics/android/SharedTexture.cpp @@ -94,9 +94,6 @@ void SharedTexture::initSourceTexture() m_supportsEGLImage = GLUtils::isEGLImageSupported(); m_supportsEGLFenceSyncKHR = GLUtils::isEGLFenceSyncSupported(); - //TODO temporarily disable fence sync until nvidia implementation is complete - m_supportsEGLFenceSyncKHR = false; - LOGI("imageEGL: %d syncKHR: %d", m_supportsEGLImage, m_supportsEGLFenceSyncKHR); glGenTextures(1, &m_sourceTexture.m_textureId); |