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

47377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Hall
d12780ed12 Merge "Update for cleanups in hwc interface" into jb-mr1-dev 2012-08-23 09:15:53 -07:00
The Android Automerger
55e5eee17d merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-23 06:33:50 -07:00
The Android Open Source Project
0ff05c75d7 Reconcile with jb-mr1-release - do not merge 
Change-Id: Ida7b9f23f8deb451a9e6e9f2714d7a677fb6ca1c
 2012-08-22 15:35:30 -07:00
Ramanan Rajeswaran
11676d963f Revert "Added display initialization method" 
This reverts commit 3f3956236a

Change-Id: Ia2a15d9a5db88add6019edf9d955cef1f73d432d
 2012-08-22 14:57:30 -07:00
Ramanan Rajeswaran
519b3e4a3b am bc46e0ad: Merge "Revert "Added display initialization method"" into jb-mr1-dev 
* commit 'bc46e0ad869befcfa97f6272615cdeae2135008f':
  Revert "Added display initialization method"
 2012-08-22 14:27:52 -07:00
Ramanan Rajeswaran
bc46e0ad86 Merge "Revert "Added display initialization method"" into jb-mr1-dev 2012-08-22 14:25:48 -07:00
Ramanan Rajeswaran
f1bf89dd88 Revert "Added display initialization method" 
This reverts commit 3f3956236a

Change-Id: Ia2a15d9a5db88add6019edf9d955cef1f73d432d
 2012-08-22 14:23:50 -07:00
Jesse Hall
c4f4e7f968 am 8f971ff6: Pass the correct number of displays based on HWC version 
* commit '8f971ff6661c875e7adb3f14731e1579c3c80c62':
  Pass the correct number of displays based on HWC version
 2012-08-22 14:19:12 -07:00
Jesse Hall
bbd164a3c7 Update for cleanups in hwc interface 
Change-Id: I363fd8b085167a1af6c14b68012bda5c62bfe59f
 2012-08-22 12:09:39 -07:00
Jesse Hall
8f971ff666 Pass the correct number of displays based on HWC version 
Change-Id: I27372f5d3102ad56f6d67722d631ae18d37f8330
 2012-08-22 12:08:18 -07:00
The Android Automerger
6e9dc4c814 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-22 06:33:48 -07:00
Jamie Gennis
97799fbb2d am 9f54ac38: ui/Fence: change the TIMEOUT_NEVER value to -1 
* commit '9f54ac38860761ef62d9bb8282d54ff51a1a68a3':
  ui/Fence: change the TIMEOUT_NEVER value to -1
 2012-08-21 19:11:06 -07:00
Jamie Gennis
9f54ac3886 ui/Fence: change the TIMEOUT_NEVER value to -1 
Change-Id: I3ef0a4c06f80990b53a8bf2eda6edbfcbefd0f34
 2012-08-21 19:07:30 -07:00
Eino-Ville Talvala
898b4f88a1 am 04930445: Merge "Add BufferItemConsumer, a simple BufferQueue consumer." into jb-mr1-dev 
* commit '04930445031c5f41707806182bb7a152e64ddede':
  Add BufferItemConsumer, a simple BufferQueue consumer.
 2012-08-21 16:48:11 -07:00
Eino-Ville Talvala
0493044503 Merge "Add BufferItemConsumer, a simple BufferQueue consumer." into jb-mr1-dev 2012-08-21 16:46:05 -07:00
Jamie Gennis
9fea3421ff SurfaceTexture: inherit from ConsumerBase (try 2) 
This change makes SurfaceTexture inherit from ConsumerBase.  It removes all of
the functionality from SurfaceTexture that is now provided by the base class.
This includes fixes for two bugs that were found after checking this change in
the first time and then reverting it.

Change-Id: Ie2d9f4f27cfef26fdac341de3152e842b01a58d2
 2012-08-21 16:41:03 -07:00
The Android Open Source Project
ee8445a4de Reconcile with jb-mr1-release - do not merge 
Change-Id: Idb96902f4272f83b3ebc1081ace5d2511d4281b7
 2012-08-21 16:05:59 -07:00
Andy McFadden
30b84c7d03 am 3f395623: Added display initialization method 
* commit '3f3956236aac97b6aa25fa89f0983d5e9d065fdb':
  Added display initialization method
 2012-08-21 16:00:32 -07:00
Eino-Ville Talvala
e232fdca2a Add BufferItemConsumer, a simple BufferQueue consumer. 
BufferItemConsumer allows for acquiring BufferQueue's BufferItems,
which contain all the data and metadata the BufferQueue has for a
given graphics buffer.

This consumer is useful when direct access to the native buffer_handles
is needed by the client.

Also includes a minor cleanup of CpuConsumer's use of 'virtual'.

Bug: 6243944
Change-Id: If7dc4192b15ac499555f1eda42a85140f2434795
 2012-08-21 15:46:35 -07:00
Andy McFadden
3f3956236a Added display initialization method 
The primary display device was being configured to "blank" by
default, which prevented the boot animation from appearing
(unless you got lucky with the hardware composer state).

Bug 6975688

Change-Id: Idaa0d0b98ebb331a17d1b16774c6b05bfa1e8728
 2012-08-21 13:11:51 -07:00
Mathias Agopian
bd589e3248 fix various issues in SF's EventThread 
- one issues caused most timestamps to be reported as 0
- on rare occasions an uninitialized variable could be used
- vsync counts per connection were accessed unthreadsafely

we now have 2 lists of connections in the main loop, one just
keeps a list of strong refs to the connections because once
we have a strong ref we're not allowed to release it while
holding the lock.

the 2nd list holds the connections that have a vsync event to
be reported. all the calculations are made with the lock held.

Change-Id: Iacfad3745b05df79d9ece3719bd4c34ddbfd5b83
 2012-08-21 12:40:17 -07:00
Mathias Agopian
a2f58b1705 am a4cb35a2: fix various issues in SF\'s EventThread 
* commit 'a4cb35a2864d58e9a764a17623e15ab25a9964a0':
  fix various issues in SF's EventThread
 2012-08-21 12:09:42 -07:00
The Android Automerger
d77d6acc2d merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-21 06:34:25 -07:00
Mathias Agopian
a4cb35a286 fix various issues in SF's EventThread 
- one issues caused most timestamps to be reported as 0
- on rare occasions an uninitialized variable could be used
- vsync counts per connection were accessed unthreadsafely

we now have 2 lists of connections in the main loop, one just
keeps a list of strong refs to the connections because once
we have a strong ref we're not allowed to release it while
holding the lock.

the 2nd list holds the connections that have a vsync event to
be reported. all the calculations are made with the lock held.

Change-Id: Iacfad3745b05df79d9ece3719bd4c34ddbfd5b83
 2012-08-20 21:41:29 -07:00
Mathias Agopian
9cf3b93bc7 am 1648d4c1: put back the unused virtuals in Vector<> 
* commit '1648d4c13ba2eff3ea14cd87ee94028458a39f97':
  put back the unused virtuals in Vector<>
 2012-08-20 21:27:55 -07:00
Mathias Agopian
1648d4c13b put back the unused virtuals in Vector<> 
some binaries are using these private APIs and broke
(as they should!) with this change. Temporarily restore the
virtuals to work around this.

Bug: 6977550
Change-Id: I7c37f24b16e4d586b89205c493db5169cf87e024
 2012-08-20 21:23:15 -07:00
Mathias Agopian
186e2bd064 am 317357fd: Merge "get rid of mirrorItemAt() which isn\'t used anywhere" into jb-mr1-dev 
* commit '317357fdf7a2b542dfdaa06f42ff7f5f0153f9a3':
  get rid of mirrorItemAt() which isn't used anywhere
 2012-08-20 16:49:41 -07:00
Mathias Agopian
317357fdf7 Merge "get rid of mirrorItemAt() which isn't used anywhere" into jb-mr1-dev 2012-08-20 16:48:07 -07:00
Eino-Ville Talvala
cd3028dc0b am 84a9a3c0: Merge "CpuConsumer: inherit from ConsumerBase" into jb-mr1-dev 
* commit '84a9a3c0ec35915d3cc40e9e889d4032e189894a':
  CpuConsumer: inherit from ConsumerBase
 2012-08-20 16:19:53 -07:00
Eino-Ville Talvala
84a9a3c0ec Merge "CpuConsumer: inherit from ConsumerBase" into jb-mr1-dev 2012-08-20 16:18:11 -07:00
Eino-Ville Talvala
f57e7540d4 CpuConsumer: inherit from ConsumerBase 
Change-Id: I55178b1d673ffa0fbc6e63ef47642c64d4d03228
 2012-08-20 15:44:40 -07:00
Mathias Agopian
f4ce7803fe get rid of mirrorItemAt() which isn't used anywhere 
Change-Id: Id6f2dbeed21cabc127d39538c0ff464077ada83f
 2012-08-20 15:25:19 -07:00
Jamie Gennis
f3a4c96f7a Revert "SurfaceTexture: inherit from ConsumerBase" 
This reverts commit ed059a8d75

Change-Id: I72542c2595771a40c2c88251e0d6eb54e305b99b
 2012-08-20 14:50:31 -07:00
Jamie Gennis
3eb4987991 am 729f4808: Merge "Revert "SurfaceTexture: inherit from ConsumerBase"" into jb-mr1-dev 
* commit '729f48082e2c7660e94830e52006f7af4efb747a':
  Revert "SurfaceTexture: inherit from ConsumerBase"
 2012-08-20 14:35:21 -07:00
Jamie Gennis
9e08ee7493 am f7f63450: Merge "Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"" into jb-mr1-dev 
* commit 'f7f6345068fe0644bf296b88a687b361eae0cc98':
  Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"
 2012-08-20 14:35:20 -07:00
Jamie Gennis
729f48082e Merge "Revert "SurfaceTexture: inherit from ConsumerBase"" into jb-mr1-dev 2012-08-20 14:33:24 -07:00
Jamie Gennis
f7f6345068 Merge "Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"" into jb-mr1-dev 2012-08-20 14:33:16 -07:00
Jamie Gennis
ce7a6c0fc9 Revert "SurfaceTexture: inherit from ConsumerBase" 
This reverts commit ed059a8d75

Change-Id: I72542c2595771a40c2c88251e0d6eb54e305b99b
 2012-08-20 14:28:53 -07:00
Jamie Gennis
483bccd0d9 Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked" 
This reverts commit f8d33c652b

Change-Id: I1ff2e1cc85824a8fac1051f573d2931db81af511
 2012-08-20 14:28:21 -07:00
Mathias Agopian
a2613877fc am b3d68efa: Merge "Fix deadlock in SF." into jb-mr1-dev 
* commit 'b3d68efa7e807070ed63cfad3f7576055c58eeba':
  Fix deadlock in SF.
 2012-08-20 14:22:28 -07:00
Mathias Agopian
b3d68efa7e Merge "Fix deadlock in SF." into jb-mr1-dev 2012-08-20 14:20:17 -07:00
Jamie Gennis
823b33c7e1 am 220ef10c: Merge "SurfaceTexture: call ConsumerBase::freeBufferLocked" into jb-mr1-dev 
* commit '220ef10c5fe44df0ff3898de06028975995a34e4':
  SurfaceTexture: call ConsumerBase::freeBufferLocked
 2012-08-20 12:40:53 -07:00
Jamie Gennis
220ef10c5f Merge "SurfaceTexture: call ConsumerBase::freeBufferLocked" into jb-mr1-dev 2012-08-20 12:39:38 -07:00
Jamie Gennis
f8d33c652b SurfaceTexture: call ConsumerBase::freeBufferLocked 
This change fixes SurfaceTexture::freeBufferLocked so that it calls the base
class implementation.

Change-Id: I45d76fb2eb02c1fa6e4e917823ead83e2086bd15
 2012-08-20 11:30:44 -07:00
Jean-Baptiste Queru
d42a32ee01 am d3bbcaff: resolved conflicts for merge of 21938749 to jb-mr1-dev 
* commit 'd3bbcaff6f0e08db0412d92f42562a2826a58bec':
  Fix error trap in SurfaceTexture Client
 2012-08-20 10:25:39 -07:00
Jean-Baptiste Queru
d3bbcaff6f resolved conflicts for merge of 21938749 to jb-mr1-dev 
Change-Id: I17da10797736f3772a143e2015fe25df0bb3eb3f
 2012-08-20 10:22:33 -07:00
Jean-Baptiste Queru
ada5088842 am 0adc8f26: am 6e820eec: am 6f89ebde: Merge "EGL: do not use sparse files for shader" 
* commit '0adc8f260023ec25c31ff4ceadde047528cb64ab':
  EGL: do not use sparse files for shader
 2012-08-20 09:44:44 -07:00
Jean-Baptiste Queru
0adc8f2600 am 6e820eec: am 6f89ebde: Merge "EGL: do not use sparse files for shader" 
* commit '6e820eec21917f8e25c40dbc8b972468535af0e8':
  EGL: do not use sparse files for shader
 2012-08-20 09:42:32 -07:00
Jean-Baptiste Queru
21938749fa am 349149b5: Merge "Fix error trap in SurfaceTexture Client" 
* commit '349149b52a424c212e33d165bc146bc0337ea4c4':
  Fix error trap in SurfaceTexture Client
 2012-08-20 09:40:11 -07:00
Jean-Baptiste Queru
6e820eec21 am 6f89ebde: Merge "EGL: do not use sparse files for shader" 
* commit '6f89ebded650406818b5fc5e9eaf096a06a2798c':
  EGL: do not use sparse files for shader
 2012-08-20 09:40:11 -07:00