summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Rename ISurfaceTexture and SurfaceTextureAndy McFadden2012-12-1813-87/+87
| | | | | | | | | | The C++ class names don't match what the classes do, so rename ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to GLConsumer. Bug 7736700 Change-Id: Ia03e468888025b5cae3c0ee1995434515dbea387
* Added some commentsAndy McFadden2012-12-174-0/+53
| | | | | | | Added a quick intro section at the top of the class. Also noted the proposed new name for the class. Change-Id: I3f79663527544aa4e910db0e5a1374b54d16ba2f
* am 8d9f0118: am fdd8551f: Merge "Fix build"Andrew Hsieh2012-12-161-1/+4
|\ | | | | | | | | * commit '8d9f0118926d54b5a5fc1508a7c43aa661839f1f': Fix build
| * am fdd8551f: Merge "Fix build"Andrew Hsieh2012-12-161-1/+4
| |\ | | | | | | | | | | | | * commit 'fdd8551fe83754846cb91e2d7325ef90d2e0fb28': Fix build
| | * Fix buildAndrew Hsieh2012-12-171-1/+4
| | | | | | | | | | | | Change-Id: Ie011cbf74a08f760ccd93ca37fa2b437b7063462
* | | am d8f2daad: am acfcd62a: Merge "Revert "Fix typo""Andrew Hsieh2012-12-151-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'd8f2daada3a828c5d9e6dfa29f53ab054618e129': Revert "Fix typo"
| * | am acfcd62a: Merge "Revert "Fix typo""Andrew Hsieh2012-12-151-1/+1
| |\ \ | | |/ | | | | | | | | | * commit 'acfcd62aa9300087d3e8cca79e59b0abdcaaee35': Revert "Fix typo"
| | * Revert "Fix typo"Andrew Hsieh2012-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c118edfc1ab9a608537ebc2f2ec936216f15a36c Need to go together with https://android-review.googlesource.com/#/c/48117/ Change-Id: Ib413be1035cfb1d18cc9cf4099694a308dadf8f5
| * | am 670c570e: Merge "Fix typo"Andrew Hsieh2012-12-151-1/+1
| |\ \ | | |/ | | | | | | | | | * commit '670c570e75e399432e96c9fd1dfa3fb92869f10c': Fix typo
| | * Fix typoAndrew Hsieh2012-12-161-1/+1
| | | | | | | | | | | | | | | | | | Changed ANDROID_BITMAP_RESUT_SUCCESS -> ANDROID_BITMAP_RESULT_SUCCESS Change-Id: I4e15e946107ea6f3d0955f72e97894512743c6ca
| * | am 2d659286: am 2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees asyncJamie Gennis2012-12-071-0/+1
| |\ \ | | |/ | |/| | | | | | | * commit '2d659286b59dc7ff7378fe967f1c425e92155995': DO NOT MERGE GraphicBufferAllocator: make frees async
| | * am 2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees asyncJamie Gennis2012-12-071-0/+1
| | |\ | | | | | | | | | | | | | | | | * commit '2e59d2c3fdc0bcfedbe9c5d04d7acadc3eff8887': DO NOT MERGE GraphicBufferAllocator: make frees async
| | | * DO NOT MERGE GraphicBufferAllocator: make frees asyncJamie Gennis2012-12-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes GraphicBufferAllocator::free queue a job to another thread to perform the actual free operation. This prevents potentially slow free operations from blocking rendering. Bug: 7675940 Change-Id: Id61099d66bb4c3949d04184e0d7f192ac18076b4
* | | | Merge "Fix typo"Andrew Hsieh2012-12-131-1/+1
|\ \ \ \
| * | | | Fix typoAndrew Hsieh2012-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed ANDROID_BITMAP_RESUT_SUCCESS -> ANDROID_BITMAP_RESULT_SUCCESS Change-Id: I4e15e946107ea6f3d0955f72e97894512743c6ca
* | | | | Merge "utils: fix warnings for unused parameters"Igor Murashkin2012-12-123-6/+6
|\ \ \ \ \
| * | | | | utils: fix warnings for unused parametersIgor Murashkin2012-12-053-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibfb755a30ba2923669060fe0aed019beecbe38a1
* | | | | | Merge "SurfaceTextureClient: remove a deprecated ctor"Jamie Gennis2012-12-121-6/+0
|\ \ \ \ \ \
| * | | | | | SurfaceTextureClient: remove a deprecated ctorJamie Gennis2012-12-121-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibf2746fdca26851677cd90199c60eab80f6d0c73
* | | | | | | Merge "SurfaceFlinger: Move GraphicBufferAlloc to libgui"Jamie Gennis2012-12-121-0/+44
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | SurfaceFlinger: Move GraphicBufferAlloc to libguiJamie Gennis2012-12-111-0/+44
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change moves the GraphicBufferAlloc class from SurfaceFlinger to libgui. Change-Id: Idf31d2004efa2651b60590733f73c4a7b831e8a9
* | | | | | Avoid unnecessary texture bindAndy McFadden2012-12-111-7/+12
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In SurfaceFlingerConsumer, check to see if native fence sync is enabled. If so, defer the texture binding step to Layer::onDraw. Change-Id: I7d4034a31c0143207eea2509dfa13ef3820f9b8c
* | | | | Refactor SurfaceTexture a bit.Andy McFadden2012-12-112-32/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rearranges updateTexImage() so that the SurfaceFlinger-specific behavior is in a new SurfaceFlingerConsumer subclass. SurfaceTexture behavior should not be altered. Instead of acquire-bind-release we now do acquire-release-bind, but since it's all done with the lock held there shouldn't be any externally-visible change. Change-Id: Ia566e4727945e2cfb9359fc6d2a8f8af64d7b7b7
* | | | | Add LinearAllocatorChris Craik2012-12-051-0/+97
|/ / / / | | | | | | | | | | | | | | | | | | | | Moving from external/webkit/Source/WebCore/platform/graphics/android/utils/ Change-Id: If91830aa9b207dbc8692b2ca7c4a0b76778addd5
* | | | utils: clarify scoped tracing functionalityAlex Ray2012-11-301-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ScopedTrace objects were being used in place of ATRACE_NAME because of a misunderstanding of it's function. Cleared up documentation for usage. Also explicitly use global namespace for sysprop callback. Change-Id: I7c248b486b614ccdb841659ca0dcfc644fda670a
* | | | Merge "utils: Use cutils tracing functionality."Alex Ray2012-11-291-141/+9
|\ \ \ \
| * | | | utils: Use cutils tracing functionality.Alex Ray2012-11-291-141/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tracing functionality has moved to cutils. Change-Id: Ie78ccc1d59dd5178f5058fbc3858a37f9adce552
* | | | | Add LruCache::IteratorRomain Guy2012-11-281-24/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Required by libhwui Change-Id: I164b9a4a82d89d132da01a56535c0df084de86f7
* | | | | Add another ifndef and a couple of methods to LruCacheRomain Guy2012-11-282-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new methods on LruCache are needed by libhwui to manage the cache of paths. Change-Id: If54fa325c54e2b04e7fe5dfe6dad66066c40127c
* | | | | Add #ifndef to prevent multiple definitionsRomain Guy2012-11-281-0/+5
|/ / / / | | | | | | | | | | | | Change-Id: Ib861eee0f333fe29290437b7e67623622d8dabd0
* | | | SurfaceFlinger: refactor frame time trackingJamie Gennis2012-11-191-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change moves the frame time history tracking code out of Layer and into a new class called FrameTracker. It also changes the tracking to use signal timestamps from fences when available for more accurate results. Change-Id: I323c5f075c58bf86ce363b52af885ad0f6365f2b
* | | | am 41f7736a: am 434e21bf: am 3fdeb48e: Reduce emulator logspamAndy McFadden2012-11-091-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '41f7736ad1e72df8796416a82ce3cede6193d1eb': Reduce emulator logspam
| * | | am 434e21bf: am 3fdeb48e: Reduce emulator logspamAndy McFadden2012-11-091-0/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '434e21bfd6b14f8d99b9bcdb829e7252edd574f3': Reduce emulator logspam
| | * | am 3fdeb48e: Reduce emulator logspamAndy McFadden2012-11-091-0/+2
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '3fdeb48e3c89be15fe3b539a26ec9a3cf28c898c': Reduce emulator logspam
| | | * Reduce emulator logspamAndy McFadden2012-11-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The emulator doesn't support systrace, but we should point that out at most once per process. Bug 7436352 Change-Id: I06b2c1ea0df6c02c11cd2496423c337f8d7c62a1
* | | | Change ConsumerBase's FrameAvailableListener to be a weak pointerIgor Murashkin2012-11-052-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents strong reference cycles when the listener implementation also holds a strong pointer to the ConsumerBase Bug: 7425644 Change-Id: I1514b13a32b18d421c902dddebec0765a989c55c
* | | | Merge "Add an LRU cache plus hashing primitives"Raph Levien2012-10-294-1/+252
|\ \ \ \
| * | | | Add an LRU cache plus hashing primitivesRaph Levien2012-10-264-1/+252
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a hashtable-based LRU cache. This should be significantly higher performance than the GenerationCache it is intended to replace. It is a large part of the fix for bug 7271109 TextLayoutCache low-level performance issues. We added a new method to BasicHashtable to detect when rehashing is needed, because the internal linked list pointers would get invalidated by that rehashing. Also, the hash_type specialized to pointers had a small flaw. Change-Id: I950c2083f96519777b851dbe157100e0a334caec
* | | | | am 40cd4515: am 78b4977e: Merge "Ensure that Vector::erase() returns a valid ↵Jason Simmons2012-10-251-1/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | iterator" into jb-mr1-aah-dev * commit '40cd45151513ecc02c95e0cc1b40480dd816cdd4': Ensure that Vector::erase() returns a valid iterator
| * | | | am 78b4977e: Merge "Ensure that Vector::erase() returns a valid iterator" ↵Jason Simmons2012-10-251-1/+2
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | into jb-mr1-aah-dev * commit '78b4977efd365d2ad7c9227c3a89e65ab60c3260': Ensure that Vector::erase() returns a valid iterator
| | * | | Merge "Ensure that Vector::erase() returns a valid iterator" into jb-mr1-aah-devJason Simmons2012-10-251-1/+2
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Ensure that Vector::erase() returns a valid iteratorJason Simmons2012-10-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vector::erase may reallocate the Vector's storage while removing an element. However, erase() calls begin() before calling removeItemsAt(), thus caching a pointer the the Vector's old storage. If the storage is reallocated, the iterator returned by erase() will be based on the old storage pointer and will thus be invalid. Change-Id: I2450c55fd418e6b1c558a4ca7c024573abbaa098
* | | | | am 296cd1cb: am 04075569: Revert "Revert "put back the unused virtuals in ↵Dave Burke2012-10-251-0/+20
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Vector<>"" * commit '296cd1cb9ac7b7ea201662860347755d0349a7de': Revert "Revert "put back the unused virtuals in Vector<>""
| * | | | am 04075569: Revert "Revert "put back the unused virtuals in Vector<>""Dave Burke2012-10-251-0/+20
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | * commit '04075569b565c949a6db8b4e8a9f10d281de4d9c': Revert "Revert "put back the unused virtuals in Vector<>""
| | * | Revert "Revert "put back the unused virtuals in Vector<>""Dave Burke2012-10-251-0/+20
| | |/ | | | | | | | | | | | | | | | This reverts commit 225c66a48cdc3acef21ee380dc134449749d3cb3 Change-Id: If31a04b81052cbc7dd7bf237c07107c33066d03d
* | | More changes to fix PDK build:Mike Lockwood2012-10-241-0/+30
|/ / | | | | | | | | | | | | move screencap back to frameworks/base move libdiskusage over from frameworks/base Change-Id: I8415716634a4cb5b0fae15ef15ff21ee0a08906a
* | am ba7dc2db: Merge "SurfaceFlinger: add support for secure displays" into ↵Jamie Gennis2012-10-223-6/+5
|\ \ | |/ | | | | | | | | | | jb-mr1-dev * commit 'ba7dc2db6e93a2407c8c328f2838591b7b760658': SurfaceFlinger: add support for secure displays
| * SurfaceFlinger: add support for secure displaysJamie Gennis2012-10-223-6/+5
| | | | | | | | | | | | | | | | | | This change adds support for displays that are not allowed to display surfaces with the eSecure flag set. All non-virtual displays are considered secure, while virtual displays have their secure-ness specified at creation time. Bug: 7368436 Change-Id: I81ad535d2d1e5a7ff78269017e85b111f0098500
* | am 60393d45: Merge "Add runtime debugging capabilities to OpenGL" into ↵Romain Guy2012-10-181-0/+5
|\ \ | |/ | | | | | | | | | | jb-mr1-dev * commit '60393d45207b6548e1f61ca104fa59aecee87d30': Add runtime debugging capabilities to OpenGL
| * Add runtime debugging capabilities to OpenGLRomain Guy2012-10-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The shell property debug.egl.trace can now be set to: 0 disables tracing 1 logs all GL calls error checks glGetError after every GL call, logs a stack trace on error systrace logs each GL call to systrace Change-Id: I34a2a2d4e19c373fd9eaa1b0cd93e67c87378996