diff options
| author | Nicolas Roard <nicolas@android.com> | 2011-01-30 19:04:54 -0800 |
|---|---|---|
| committer | Nicolas Roard <nicolas@android.com> | 2011-01-30 19:04:54 -0800 |
| commit | 1a2e2a9d1bbd0829307e9a52aa98d415f8d10e52 (patch) | |
| tree | 5283229913f2340f6d9575ac4df1e451c76f67f4 /WebCore/platform/graphics/android/BaseLayerAndroid.cpp | |
| parent | 8ffb52a0a92be5cf8f035b7db75f45b5522c97ef (diff) | |
| download | external_webkit-1a2e2a9d1bbd0829307e9a52aa98d415f8d10e52.zip external_webkit-1a2e2a9d1bbd0829307e9a52aa98d415f8d10e52.tar.gz external_webkit-1a2e2a9d1bbd0829307e9a52aa98d415f8d10e52.tar.bz2 | |
Fix GL error when initializing the browser
bug:3355704
may also fix bug:3383599
Change-Id: I77892c2e90c4edf054513de92b0c6bfba3152819
Diffstat (limited to 'WebCore/platform/graphics/android/BaseLayerAndroid.cpp')
| -rw-r--r-- | WebCore/platform/graphics/android/BaseLayerAndroid.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp index fe918e6..49a7057 100644 --- a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp +++ b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp @@ -36,6 +36,8 @@ #include <wtf/CurrentTime.h> #endif // USE(ACCELERATED_COMPOSITING) +#define HARDWARE_ACCELERATION + #ifdef DEBUG #include <cutils/log.h> @@ -68,7 +70,7 @@ BaseLayerAndroid::BaseLayerAndroid() BaseLayerAndroid::~BaseLayerAndroid() { -#if USE(ACCELERATED_COMPOSITING) +#ifdef HARDWARE_ACCELERATION TilesManager::instance()->removeOperationsForBaseLayer(this); #endif m_content.clear(); @@ -277,6 +279,10 @@ bool BaseLayerAndroid::drawGL(IntRect& viewRect, SkRect& visibleRect, glViewport(left, top, width, height); ShaderProgram* shader = TilesManager::instance()->shader(); + if (shader->program() == -1) { + XLOG("Reinit shader"); + shader->init(); + } glUseProgram(shader->program()); glUniform1i(shader->textureSampler(), 0); shader->setViewRect(viewRect); |