ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
47,614 Commits 2 Branches 0 Tags 54 MiB
8d9f011892
Commit Graph

47614 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Hsieh
8d9f011892 am fdd8551f: Merge "Fix build" 
* commit 'fdd8551fe83754846cb91e2d7325ef90d2e0fb28':
  Fix build
 2012-12-16 16:35:31 -08:00
Andrew Hsieh
fdd8551fe8 Merge "Fix build" 2012-12-16 16:03:03 -08:00
Andrew Hsieh
370980c528 Fix build 
Change-Id: Ie011cbf74a08f760ccd93ca37fa2b437b7063462
 2012-12-17 08:01:36 +08:00
Andrew Hsieh
d8f2daada3 am acfcd62a: Merge "Revert "Fix typo"" 
* commit 'acfcd62aa9300087d3e8cca79e59b0abdcaaee35':
  Revert "Fix typo"
 2012-12-15 21:23:12 -08:00
Andrew Hsieh
4bb20303d9 am 670c570e: Merge "Fix typo" 
* commit '670c570e75e399432e96c9fd1dfa3fb92869f10c':
  Fix typo
 2012-12-15 21:23:12 -08:00
Andrew Hsieh
acfcd62aa9 Merge "Revert "Fix typo"" 2012-12-15 20:32:27 -08:00
Andrew Hsieh
c7d5fa98b5 Revert "Fix typo" 
This reverts commit c118edfc1a

Need to go together with https://android-review.googlesource.com/#/c/48117/

Change-Id: Ib413be1035cfb1d18cc9cf4099694a308dadf8f5
 2012-12-15 20:31:56 -08:00
Andrew Hsieh
670c570e75 Merge "Fix typo" 2012-12-15 20:30:31 -08:00
Andrew Hsieh
c118edfc1a Fix typo 
Changed ANDROID_BITMAP_RESUT_SUCCESS -> ANDROID_BITMAP_RESULT_SUCCESS

Change-Id: I4e15e946107ea6f3d0955f72e97894512743c6ca
 2012-12-16 11:20:34 +08:00
The Android Open Source Project
0c6fff72f7 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I946e9036a50464f974bc2d12df9d8b119f86fa00
 2012-12-11 11:54:26 -08:00
The Android Automerger
529cb9ed9c merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-10 19:33:41 -08:00
Jamie Gennis
884e3bc29e am 6426bd62: am f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees 
* commit '6426bd62676c743b0b5bdc397bcab5c669c6e51f':
  [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
 2012-12-10 17:58:33 -08:00
Jamie Gennis
6426bd6267 am f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees 
* commit 'f53f9c6d3668490f6c68f5c094c28f645c1b3da3':
  [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
 2012-12-10 17:57:40 -08:00
Jamie Gennis
f53f9c6d36 [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees 
This change makes GraphicBufferAllocator::alloc wait for pending async frees to
complete before attempting to allocate a gralloc buffer if there are more than
8 pending async frees.

Bug: 7696861
Change-Id: I1fae86e13edefcaa153b8ce9fd057f335716059e
 2012-12-10 17:19:37 -08:00
The Android Open Source Project
064d252918 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I97991f966ea0d3a6f3bad87c82d9926d55e6d63c
 2012-12-10 15:19:43 -08:00
The Android Automerger
4f9fb2ba97 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-07 13:26:18 -08:00
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
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
7bd5a76e2e Reconcile with jb-mr1.1-release - do not merge 
Change-Id: Id716af997b29350c4600ae941107e96d27f1b0af
 2012-12-07 07:53:15 -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
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
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
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
The Android Automerger
1b1e3201a8 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-26 11:29:02 -08:00
Mathias Agopian
8430095879 make transform hint multi-display aware 
if a layer is not mirrored, we now use its display
as the source for the transfrom hint calculation
instead of always using the default (main) display.

this change does two thing:
1) we make updateTransformHint take a DisplayDevice
   as a parameter instead of hard-coding the
   main display.

2) each time we do a transaction that could change
   the hint, we go through all layers and
   figure out which display should be used for their
   transform hint.

Bug: 7599344
Change-Id: I9b04a95e6c372dd770bacf81d8ef6f8e31b87b83
 2012-11-21 16:03:52 -08:00
Siva Velusamy
0e34af6284 am c859084c: am a9a4cd48: gltrace: Make sure device is debuggable. 
* commit 'c859084ca303ca1ab69bdc78f864d39c9c81ab0b':
  gltrace: Make sure device is debuggable.
 2012-11-20 20:01:30 -08:00
Siva Velusamy
c859084ca3 am a9a4cd48: gltrace: Make sure device is debuggable. 
* commit 'a9a4cd4806ea5b2cf525c8ab4c6604d78c6e3f8f':
  gltrace: Make sure device is debuggable.
 2012-11-20 19:59:23 -08:00
Siva Velusamy
a9a4cd4806 gltrace: Make sure device is debuggable. 
(cherry picked from commit 6482fa4db0)

Change-Id: I205aabcab1932025c12e7ba3d1b3cf94684f6758
 2012-11-20 15:55:35 -08:00
Mathias Agopian
b171fe9f47 am 594a8773: am 764c197c: fix typo that broke all the builds 
* commit '594a8773c1ef5632a8eb2ef61a86c319460d4248':
  fix typo that broke all the builds
 2012-11-20 07:13:12 -08:00
Mathias Agopian
594a8773c1 am 764c197c: fix typo that broke all the builds 
* commit '764c197c6fc2bf10b038c33b320a4e95594d52d8':
  fix typo that broke all the builds
 2012-11-19 17:04:44 -08:00
The Android Automerger
05dbbb932f merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-19 16:50:37 -08:00
Mathias Agopian
764c197c6f fix typo that broke all the builds 
Bug: 7584338
Change-Id: Ieb8c27a544ac583af9aa1e0376e33a673d2d9673
 2012-11-19 16:50:24 -08:00