summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix a few issues with NATIVE_WINDOW_TRANSFORM_HINT"Mathias Agopian2011-07-212-21/+10
|\
| * Fix a few issues with NATIVE_WINDOW_TRANSFORM_HINTMathias Agopian2011-07-212-21/+10
| | | | | | | | | | | | | | | | | | - fixed uninitialized variable - set hint to indentity when transform is too complex - make sure FrameBufferNativeWindow doesn't fail on needed perform commands Bug: 4487161 Change-Id: I7cb2b0869b72404732eca7cb2d145ff669e2ed9b
* | Merge "Decouple GLES20RecordingCanvas lifetime from GLES20DisplayList. Bug: ↵Jeff Brown2011-07-212-9/+6
|\ \ | |/ |/| | | 5062011"
| * Decouple GLES20RecordingCanvas lifetime from GLES20DisplayList.Jeff Brown2011-07-212-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5062011 Previously, each GLES20DisplayList would hold onto an instance of GLES20RecordingCanvas. In turn, each GLES20RecordingCanvas held onto an SkWriter with a 16Kb buffer along with several other objects. With one display list per view and hundreds of views, the overhead could add up to a few megabytes. Ensured that the GLES20RecordingCanvas is reset as soon as the display list has been constructed, thereby promptly freeing the 16Kb buffer. Changed GLES20DisplayList so that it acquires a GLES20RecordingCanvas from a pool as needed and recycles it when done. Removed some dead code and cruft related to the construction of GLES20Canvas objects in general. Some code was written with the assumption that the underlying renderer object could change behind the scenes or might be lazily constructed, but that isn't actually the case so we can simplify things. Removed an unnecessary weak reference from GLES20DisplayList to the View. It isn't actually used anywhere. Fixed a bug in GLES20DisplayList where isValid() would return true while the display list was being recorded. This is incorrect because the native display list might not actually exist. Worse, even if the native display list does exist, it is stale and potentially refers to old Bitmaps that have been GC'd (because the mBitmaps list was cleared when recording started). Change-Id: Ib12d5483688cb253478edeb0156d34c476c2566b
* | Merge "clean-up. get rid ofunused code and members in Surface[Control].cpp"Mathias Agopian2011-07-204-78/+9
|\ \ | |/ |/|
| * clean-up. get rid ofunused code and members in Surface[Control].cppMathias Agopian2011-07-204-78/+9
| | | | | | | | Change-Id: Ia7790ae28af2c2ac99eae01c2c5044ace4a490a4
* | Merge "Remove unimplemented memory pool."Jeff Brown2011-07-202-38/+0
|\ \
| * | Remove unimplemented memory pool.Jeff Brown2011-07-202-38/+0
| | | | | | | | | | | | | | | | | | dlmalloc does such a great job that we don't need a pool anyways. Change-Id: I105b28c4a5c491543959190c7c0a9de75a5b8052
* | | Merge "Correctly call glviewport when surface changes."Alex Sakhartchouk2011-07-202-0/+2
|\ \ \ | |/ / |/| |
| * | Correctly call glviewport when surface changes.Alex Sakhartchouk2011-07-192-0/+2
| | | | | | | | | | | | Change-Id: I7ef1539e39ea67245bac5ee410deb5918fc5dfcf
* | | Merge "Extract BC metadata using a single call."Stephen Hines2011-07-192-60/+46
|\ \ \
| * | | Extract BC metadata using a single call.Stephen Hines2011-07-182-60/+46
| | | | | | | | | | | | | | | | | | | | | | | | BUG=4278636 Change-Id: Idc056c4fa50240aadbc81d300fbed759c5a187cf
* | | | Merge "implement: "Add an ANativeWindow API for SurfaceFlinger to suggest an ↵Mathias Agopian2011-07-194-17/+56
|\ \ \ \ | | |_|/ | |/| | | | | | optimal buffer orientation""
| * | | implement: "Add an ANativeWindow API for SurfaceFlinger to suggest an ↵Mathias Agopian2011-07-194-17/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | optimal buffer orientation" Bug: 4487161 Change-Id: I883f34efe542c2a566d04966f873374f40c50092
* | | | Merge "Reduce the fade area to save bandwidth."Romain Guy2011-07-191-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Reduce the fade area to save bandwidth.Romain Guy2011-07-191-1/+1
| | | | | | | | | | | | | | | | Change-Id: I8ccea17fc1fb3c132329baa0acc1b3d5a140a5c6
* | | | use SurfaceTexture new scaling mode in SFMathias Agopian2011-07-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | SF now obeys SurfaceTexture's scaling mode instead of inferring it from the buffer's size Change-Id: I4d50e9851abedd7e64bfcfc8af9eefb9fb668529
* | | | Add set_scaling_mode() to ANativeWindow.Mathias Agopian2011-07-194-5/+86
|/ / / | | | | | | | | | | | | | | | | | | This allows to specify the scaling mode independently from the buffer size. Change-Id: Iaa2baa660445531a97d3fac192e580f4929c5d3b
* | | Merge "Trim OpenGLRenderer's memory usage whenever possible"Romain Guy2011-07-183-0/+49
|\ \ \ | |/ / |/| |
| * | Trim OpenGLRenderer's memory usage whenever possibleRomain Guy2011-07-183-0/+49
| | | | | | | | | | | | Change-Id: I9225077184f374b1a43300add15cc1d5b6869d1c
* | | Merge "SurfaceTexture: add a multi-SurfaceTexture test"Jamie Gennis2011-07-181-0/+86
|\ \ \
| * | | SurfaceTexture: add a multi-SurfaceTexture testJamie Gennis2011-07-111-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a test that does simple, unverified GL rendering to multiple SurfaceTextures. Change-Id: I51a41d68ae5a27e01ae93842242897b0d3558ca6
* | | | Merge "move lock/unlock implementaion outside of Surface into ↵Mathias Agopian2011-07-184-299/+258
|\ \ \ \ | |_|/ / |/| | | | | | | SurfaceTextureClient"
| * | | move lock/unlock implementaion outside of Surface into SurfaceTextureClientMathias Agopian2011-07-154-299/+258
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes ANativeWindow_lock/ANativeWindow_unlockAndPost work with ANativeWindows implemented by Surface and SurfaceTextureClient. Also, Surface now inherits directly from SurfaceTextureClient. Bug: 5003724 Change-Id: I9f285877c7bae9a262e9a7af91c2bae78804b2ef
* | | | Fix build break on MacOSGlenn Kasten2011-07-151-9/+9
|/ / / | | | | | | | | | Change-Id: Ica19984d0e623ac2482fc3512231e6c00671fd3a
* | | Merge "CPU statistics library"Glenn Kasten2011-07-153-0/+241
|\ \ \
| * | | CPU statistics libraryGlenn Kasten2011-07-153-0/+241
| | | | | | | | | | | | | | | | Change-Id: I113e2a926466cc410cfa5602ceb165b390a290fc
* | | | Merge "SurfaceTexture: fix SurfaceTextureGLToGLTest"Jamie Gennis2011-07-151-5/+30
|\ \ \ \
| * | | | SurfaceTexture: fix SurfaceTextureGLToGLTestJamie Gennis2011-07-141-5/+30
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes a couple different issues in the SurfaceTextureGLToGLTest test fixture: - incorrect use of conditions - move logging after the locks are acquired - call the parent class's TearDown method - clean up the SurfaceTexture before eglTerminate gets called Change-Id: I6960e5ab7f144225f01a2089d3f849c99fed0b38
* | | | Merge "For the serialization context, no fifo initialization is necessary."Alex Sakhartchouk2011-07-153-8/+6
|\ \ \ \
| * | | | For the serialization context, no fifo initialization is necessary.Alex Sakhartchouk2011-07-133-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On shutdown it was attempting to free uninitialized memory. Change-Id: I9141be5a51253f87f21594ae38f7e653f9e69c6c
* | | | | Merge "Add a call to pthread_attr_destroy to avoid potential memory leaks."Jeff Brown2011-07-141-0/+1
|\ \ \ \ \
| * | | | | Add a call to pthread_attr_destroy to avoid potential memory leaks.Le-Chun Wu2011-07-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib57efc3530e9793298190cc9cab19c9af54e11a7
* | | | | | fix a typo in ISurfaceTexture IPC codeMathias Agopian2011-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ied1d9ddb0d849b17219d0ea3d333ce12be849419
* | | | | | Merge changes Id9aa1003,I8c154189Jamie Gennis2011-07-143-31/+85
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * changes: SurfaceTexture: make (dis)connect into an IPC SurfaceTexture: add support for new connect values
| * | | | | SurfaceTexture: make (dis)connect into an IPCJamie Gennis2011-07-143-37/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes the ANativeWindow connect and disconnect calls result in an IPC to the SurfaceTexture object. This will allow us to prevent multiple simultaneous connections from different processes. Change-Id: Id9aa1003b1335b96ca6bd4a1f5a67aa433d42efb
| * | | | | SurfaceTexture: add support for new connect valuesJamie Gennis2011-07-141-0/+6
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds support to SurfaceTextureClient for the new enum values that can be passed to the ANativeWindow connect call. Change-Id: I8c15418909e43a15673a9b22a5eb40df6923b273
* | | | | Minor code cleanups in vector.Jeff Brown2011-07-141-26/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a potential bug where calling replaceAt with a reference to an existing element in the vector at the same index would cause the element to be destroyed while being copied to itself. Refactored the conditions in _grow and _shrink for clarity. The computations are exactly the same but I think it reads better this way. In particular, the ssize_t variable 's' is gone: it didn't need to be signed anyways because its value could never be negative. Change-Id: If087841c15e6a87160eee874720c4a77eb0e99a6
* | | | | Replace Vector _grow/_shrink checks with assert.Jeff Brown2011-07-141-5/+7
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On review of the code, _grow and _shrink are checking for conditions that cannot happen and that don't even really make sense. For example, if _shrink is called with where + amount > mCount then this is really bad, however the check only considered the case when where >= mCount and then it would arbitrarily choose a new value for where. Huh? As it happens, the callers are correctly validating the arguments before passing them down to these methods so we can get rid of this code. Change-Id: I921852dba8997065bb0e9cac733e82028d14afcd
* | | | Provide more descriptive name for InputChannel ashmem.Jeff Brown2011-07-131-1/+3
| | | | | | | | | | | | | | | | Change-Id: I4307de9f717ac4810b1b91ee0c1a3899325acf71
* | | | Merge "Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator ↵Mike Lockwood2011-07-131-12/+0
|\ \ \ \ | | | | | | | | | | | | | | | build"
| * | | | Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator buildMike Lockwood2011-07-131-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I13d9f251f86c05ae5405f37adbf6b8e9660935ba Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | Merge "Fix native crash when GL driver fails to initialize."Jason Sams2011-07-131-1/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix native crash when GL driver fails to initialize.Jason Sams2011-07-131-1/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I85714de9029285027dc75fb3b62076be41a4c985
* | | | | Merge "Fix debugging for hwui caches"Kenny Root2011-07-132-2/+1
|\ \ \ \ \
| * | | | | Fix debugging for hwui cachesKenny Root2011-07-132-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Debugging code attempted to delete a stack item. Also, the flag fields weren't exactly clear, so rewrite it so it's clear that kDebugMoreCaches is a combined flag. Change-Id: If42b7f0f754919343301da5656aee5943cc9bd4a
* | | | | | Merge "Compress the backup output stream"Christopher Tate2011-07-131-4/+12
|\ \ \ \ \ \
| * | | | | | Compress the backup output streamChristopher Tate2011-07-131-4/+12
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Zlib compression, with a full flush between each application's data. Encryption will be performed on the already-compressed data once that's implemented. On restore, the streamed data is similarly uncompressed on the fly. Change-Id: I19b65c88e759a66527d10913d18fffa9df0bc011
* | | | | | Merge "Add slot number to forEach hal."Jason Sams2011-07-134-1/+4
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Add slot number to forEach hal.Jason Sams2011-07-134-1/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I0f2992d5f4128422d07f897b335c219cc7f1d02c