diff options
| author | Mathias Agopian <mathias@google.com> | 2009-10-05 17:07:12 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-10-06 17:00:25 -0700 |
| commit | 3330b203039dea366d4981db1408a460134b2d2c (patch) | |
| tree | f165f7801f2ee8034ad1edfd34e2b554fdaf662f /libs/ui/Android.mk | |
| parent | 0ad3f9f4009c76b56f41da5d26eb7712dee938f1 (diff) | |
| download | frameworks_native-3330b203039dea366d4981db1408a460134b2d2c.zip frameworks_native-3330b203039dea366d4981db1408a460134b2d2c.tar.gz frameworks_native-3330b203039dea366d4981db1408a460134b2d2c.tar.bz2 | |
fix [2167050] glTexImage2D code path buggy in SurfaceFlinger
When EGLImage extension is not available, SurfaceFlinger will fallback to using
glTexImage2D and glTexSubImage2D instead, which requires 50% more memory and an
extra copy. However this code path has never been exercised and had some bugs
which this patch fix.
Mainly the scale factor wasn't computed right when falling back on glDrawElements.
We also fallback to this mode of operation if a buffer doesn't have the adequate
usage bits for EGLImage usage.
This changes only code that is currently not executed. Some refactoring was needed to
keep the change clean. This doesn't change anything functionaly.
Diffstat (limited to 'libs/ui/Android.mk')
| -rw-r--r-- | libs/ui/Android.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/ui/Android.mk b/libs/ui/Android.mk index 9577044..73d86ea 100644 --- a/libs/ui/Android.mk +++ b/libs/ui/Android.mk @@ -2,13 +2,15 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ - BufferMapper.cpp \ Camera.cpp \ CameraParameters.cpp \ EGLUtils.cpp \ EventHub.cpp \ EventRecurrence.cpp \ FramebufferNativeWindow.cpp \ + GraphicBuffer.cpp \ + GraphicBufferAllocator.cpp \ + GraphicBufferMapper.cpp \ KeyLayoutMap.cpp \ KeyCharacterMap.cpp \ ICamera.cpp \ @@ -25,7 +27,6 @@ LOCAL_SRC_FILES:= \ Region.cpp \ SharedBufferStack.cpp \ Surface.cpp \ - SurfaceBuffer.cpp \ SurfaceComposerClient.cpp \ SurfaceFlingerSynchro.cpp |