ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
48,308 Commits 2 Branches 0 Tags 54 MiB
552a620482
Commit Graph

48308 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamie Gennis
50f8d2856b am d4e70620: am 72c3f7d8: Revert "ConsumerBase: free buffers outside the lock" 
* commit 'd4e706208c99ff1716fb0009ec867ff29ff04a7c':
  Revert "ConsumerBase: free buffers outside the lock"
 2012-12-07 11:07:03 -08:00
Jamie Gennis
d4e706208c am 72c3f7d8: Revert "ConsumerBase: free buffers outside the lock" 
* commit '72c3f7d88160b7c279f90f0efe3c1cb12cd140ae':
  Revert "ConsumerBase: free buffers outside the lock"
 2012-12-07 11:04:51 -08:00
Jamie Gennis
7e590a04fb am 7df16644: (-s ours) am 2d659286: am 2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees async 
* commit '7df16644c4e5fbb30d011b9098d9c8833f89f0aa':
  DO NOT MERGE GraphicBufferAllocator: make frees async
 2012-12-07 11:00:33 -08:00
Jamie Gennis
7df16644c4 am 2d659286: am 2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees async 
* commit '2d659286b59dc7ff7378fe967f1c425e92155995':
  DO NOT MERGE GraphicBufferAllocator: make frees async
 2012-12-07 10:59:29 -08:00
Jamie Gennis
2d659286b5 am 2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees async 
* commit '2e59d2c3fdc0bcfedbe9c5d04d7acadc3eff8887':
  DO NOT MERGE GraphicBufferAllocator: make frees async
 2012-12-07 10:58:22 -08:00
Jamie Gennis
72c3f7d881 Revert "ConsumerBase: free buffers outside the lock" 
This reverts commit b21a4e3b5f.
 2012-12-07 10:33:07 -08:00
Jamie Gennis
2e59d2c3fd DO NOT MERGE GraphicBufferAllocator: make frees async 
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
 2012-12-07 10:32:13 -08:00
The Android Open Source Project
f3a736e8f0 am 7bd5a76e: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit '7bd5a76e2e89ca6d172539ef2dfa43f42f07c001':
 2012-12-07 07:56:46 -08:00
The Android Open Source Project
7bd5a76e2e Reconcile with jb-mr1.1-release - do not merge 
Change-Id: Id716af997b29350c4600ae941107e96d27f1b0af
 2012-12-07 07:53:15 -08:00
Jamie Gennis
b5fe96b813 am 05989772: am 3ed2736c: am b21a4e3b: ConsumerBase: free buffers outside the lock 
* commit '05989772d5b46cd5328e88d546f04deef39cc3c8':
  ConsumerBase: free buffers outside the lock
 2012-12-06 23:24:25 -08:00
The Android Automerger
2fef5c45e7 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-06 19:36:11 -08:00
Jamie Gennis
05989772d5 am 3ed2736c: am b21a4e3b: ConsumerBase: free buffers outside the lock 
* commit '3ed2736c10efb2f18062591e308036837d9725a4':
  ConsumerBase: free buffers outside the lock
 2012-12-06 19:00:57 -08:00
Jamie Gennis
3ed2736c10 am b21a4e3b: ConsumerBase: free buffers outside the lock 
* commit 'b21a4e3b5f7f07ed160ca6e1809313e2a8e2a6a4':
  ConsumerBase: free buffers outside the lock
 2012-12-06 18:37:24 -08:00
Jamie Gennis
b21a4e3b5f ConsumerBase: free buffers outside the lock 
This change makes ConsumerBase::onBuffersReleased hold a reference to all its
gralloc buffers until after the mutex is unlocked.  This prevents slow
gralloc::free calls from causing lock contention with rendering threads.

Bug: 7675940
Change-Id: I0ec805d1b612afeeecfffec03f982371d27d93be
 2012-12-06 18:17:35 -08:00
Chris Craik
0a73f822b1 Add LinearAllocator 
Moving from external/webkit/Source/WebCore/platform/graphics/android/utils/

Change-Id: If91830aa9b207dbc8692b2ca7c4a0b76778addd5
 2012-12-05 17:34:54 -08:00
Igor Murashkin
6dbe6d4d0f utils: fix warnings for unused parameters 
Change-Id: Ibfb755a30ba2923669060fe0aed019beecbe38a1
 2012-12-05 16:10:26 -08:00
Ying Wang
ac0de62ba3 Use LOCAL_REQUIRED_MODULES to establish dependency 
instead of using the tricky order-only dependency on a phony target
module name.

Change-Id: I691f2d352d1bd7f619bdb0b75070709e1b8222c0
 2012-12-04 12:04:44 -08:00
Alex Ray
653078f652 utils: clarify scoped tracing functionality 
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
 2012-11-30 19:54:00 -08:00
Jesse Hall
c342044368 Mark extensions 'Complete', correct some stale version info 
Change-Id: I46ccd8eaeacc647399a5531e262c1b01e0a080b0
 2012-11-29 16:13:10 -08:00
Chad Jones
4b3c7feb65 Remove copy of atrace imported to wrong location 2012-11-29 15:13:36 -08:00
Chad Jones
6ce1093b8e Merge branch 'master' of https://googleplex-android.googlesource.com/a/platform/frameworks/native 2012-11-29 14:51:39 -08:00
Chad Jones
797105b9b5 Merge "Add the atrace utility." 2012-11-29 14:50:17 -08:00
Chad Jones
9a57c5c69b Merge atrace/ from platform/system/extras to cmds/atrace/ 2012-11-29 14:35:18 -08:00
Jesse Hall
530c0cf76c Merge "Initial draft of EGL_ANDROID_image_native_buffer" 2012-11-29 14:21:48 -08:00
Alex Ray
72f320195c Merge "utils: Use cutils tracing functionality." 2012-11-29 13:36:26 -08:00
Alex Ray
b7e06477f0 utils: Use cutils tracing functionality. 
Tracing functionality has moved to cutils.

Change-Id: Ie78ccc1d59dd5178f5058fbc3858a37f9adce552
 2012-11-29 13:33:14 -08:00
Jesse Hall
721192ed0d Initial draft of EGL_ANDROID_image_native_buffer 
Change-Id: If9bdd27ffdb13fb85e9ef873b311d6721399f75f
 2012-11-29 11:43:47 -08:00
Romain Guy
7f32b1da82 Merge "Add LruCache::Iterator" 2012-11-29 11:23:14 -08:00
The Android Open Source Project
2b556bc988 am 6d93da46: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit '6d93da465ab8fff02728f268785e59ab86a2a0c2':
 2012-11-29 09:49:34 -08:00
The Android Open Source Project
6d93da465a Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I83096147b7adbf5396fdb88114abce568b4ec0cc
 2012-11-29 09:13:38 -08:00
The Android Automerger
d98ae61dfb merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-29 07:09:35 -08:00
Romain Guy
f1951df8a1 Add LruCache::Iterator 
Required by libhwui

Change-Id: I164b9a4a82d89d132da01a56535c0df084de86f7
 2012-11-28 18:26:54 -08:00
Romain Guy
e402f1fde2 Add another ifndef and a couple of methods to LruCache 
The new methods on LruCache are needed by libhwui to manage
the cache of paths.

Change-Id: If54fa325c54e2b04e7fe5dfe6dad66066c40127c
 2012-11-28 17:37:03 -08:00
Romain Guy
98fc88d3ce Add #ifndef to prevent multiple definitions 
Change-Id: Ib861eee0f333fe29290437b7e67623622d8dabd0
 2012-11-28 12:59:40 -08:00
The Android Open Source Project
7fbe8e12da am 31e84850: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit '31e8485028e93c16312c57b5bb6b511e3bc8582d':
  workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
 2012-11-28 09:49:34 -08:00
The Android Open Source Project
31e8485028 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I7d22820ba101417d4dd982b642b45d80beb011f4
 2012-11-28 09:47:35 -08:00
Mathias Agopian
9913b9941e am a7da0dda: am 98cbec81: am efd614b8: Merge "make transform hint multi-display aware" into jb-mr1.1-dev 
* commit 'a7da0dda39cf1e807eea1304b48d4583e7329b72':
  make transform hint multi-display aware
 2012-11-27 18:43:52 -08:00
Jesse Hall
9d0e4708a1 am 1e310d64: am 2004307b: Merge "Create builtin display tokens on demand" 
* commit '1e310d64d1e51faf35962f23da1c90ec95a35e5d':
  Create builtin display tokens on demand
 2012-11-27 18:42:41 -08:00
Andy McFadden
9b60acdb52 am db2e4f16: (-s ours) am a90173d8: am 762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev 
* commit 'db2e4f16bb1c804414773862030cdb0aa5413778':
  DO NOT MERGE - native_fence_sync: fix an enum name
 2012-11-27 17:34:20 -08:00
Mathias Agopian
a7da0dda39 am 98cbec81: am efd614b8: Merge "make transform hint multi-display aware" into jb-mr1.1-dev 
* commit '98cbec81be1d39223e33abde9ac35e43b62918bf':
  make transform hint multi-display aware
 2012-11-27 16:10:29 -08:00
Mathias Agopian
98cbec81be am efd614b8: Merge "make transform hint multi-display aware" into jb-mr1.1-dev 
* commit 'efd614b869e952792b009db4ab54f3bb4375d198':
  make transform hint multi-display aware
 2012-11-27 16:08:43 -08:00
Mathias Agopian
efd614b869 Merge "make transform hint multi-display aware" into jb-mr1.1-dev 2012-11-27 16:07:04 -08:00
The Android Automerger
282b79d7c1 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-27 15:34:35 -08:00
Jesse Hall
1e310d64d1 am 2004307b: Merge "Create builtin display tokens on demand" 
* commit '2004307b65c0cb34c854331e5be21d3426a3ef06':
  Create builtin display tokens on demand
 2012-11-27 12:59:56 -08:00
Jesse Hall
2004307b65 Merge "Create builtin display tokens on demand" 2012-11-27 12:43:11 -08:00
Jesse Hall
6edebdf600 Create builtin display tokens on demand 
For hotpluggable builtin displays (currently just HDMI), create the
display device IBinder token when the display is connected and destroy
it when the display is disconnected. Previously we created the tokens
at startup and never changed them. This made it so that when comparing
current and drawing state, we couldn't tell whether a display had been
disconnected and reconnected.

Bug: 7491120
Change-Id: I2ac82b864e10cb1cd0a308782d7e0ab9745c5d81
 2012-11-27 12:30:18 -08:00
Andy McFadden
db2e4f16bb am a90173d8: am 762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev 
* commit 'a90173d86dd209aee55d833c73c424d854a98c70':
  DO NOT MERGE - native_fence_sync: fix an enum name
 2012-11-27 11:39:20 -08:00
Andy McFadden
a90173d86d am 762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev 
* commit '762a6d86de63ad319884ab6e666be6ad0d75996e':
  DO NOT MERGE - native_fence_sync: fix an enum name
 2012-11-27 11:31:44 -08:00
Andy McFadden
762a6d86de Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev 2012-11-27 07:36:50 -08:00
Jamie Gennis
378787cf62 DO NOT MERGE - native_fence_sync: fix an enum name 
This change replaces all references to the "EGL_NO_NATIVE_FENCE_ANDROID" enum
with "EGL_NO_NATIVE_FENCE_FD_ANDROID".

Bug: http://code.google.com/p/android/issues/detail?id=40295

(cherry-pick from master)

Change-Id: Ie25d4ab9721d8b69b8d4afcf18e902ef8e3ad911
 2012-11-26 14:26:31 -08:00