summaryrefslogtreecommitdiffstats
path: root/libs/surfaceflinger
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-10-30 17:54:03 -0400
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-10-30 17:54:03 -0400
commitf989c1140bbc84480498df38abec0fafff04e6ee (patch)
tree88fa9b4256d04c5971c6652e04d8bdf9eeea26a9 /libs/surfaceflinger
parent1864d01f2be0e82da7d8844fa91bee8880282041 (diff)
parentf007a2faa1d765e9b53553a8214179b253e3cbbd (diff)
downloadframeworks_base-f989c1140bbc84480498df38abec0fafff04e6ee.zip
frameworks_base-f989c1140bbc84480498df38abec0fafff04e6ee.tar.gz
frameworks_base-f989c1140bbc84480498df38abec0fafff04e6ee.tar.bz2
Merge change If007a2fa into eclair
* changes: return proper error code from eglCreateImageKHR
Diffstat (limited to 'libs/surfaceflinger')
-rw-r--r--libs/surfaceflinger/LayerBuffer.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/libs/surfaceflinger/LayerBuffer.cpp b/libs/surfaceflinger/LayerBuffer.cpp
index 6590503..f70bcf4 100644
--- a/libs/surfaceflinger/LayerBuffer.cpp
+++ b/libs/surfaceflinger/LayerBuffer.cpp
@@ -437,9 +437,7 @@ void LayerBuffer::BufferSource::onDraw(const Region& clip) const
}
if (err != NO_ERROR) {
- // OpenGL fall-back
- GLuint w = 0;
- GLuint h = 0;
+ // slower fallback
GGLSurface t;
t.version = sizeof(GGLSurface);
t.width = src.crop.r;