Commit Graph

46979 Commits

Author SHA1 Message Date
Mathias Agopian
72131d9ef1 remove unneeded dependencies in libhardware
Change-Id: Ibb8d698d594216d0746b0e7270cf87d7e5acab2b
2012-08-04 20:22:32 -07:00
Mathias Agopian
e083077bc3 am c1d359d4: break SF dependencies on libdvm and libandroid_runtime
* commit 'c1d359d42b753fcc2426d66a0f782f7c300893bc':
  break SF dependencies on libdvm and libandroid_runtime
2012-08-04 20:16:52 -07:00
Mathias Agopian
c1d359d42b break SF dependencies on libdvm and libandroid_runtime
these libraries are only needed for debugging and are now
linked at runtime if needed.

Change-Id: I03f138523c6de166a1e2700d4454d4a854aee145
2012-08-04 20:09:48 -07:00
Mathias Agopian
7730b3d571 am 92efd84f: screen-off animation won\'t be handled by SF anymore
* commit '92efd84f37ce5a8aae74dc9086f825a67b6894e9':
  screen-off animation won't be handled by SF anymore
2012-08-03 17:14:55 -07:00
Mathias Agopian
ed71e87779 am 92a979a9: We now have a real list of displays.
* commit '92a979a92c34b7de609ce2b1662c73bb8a2728b9':
  We now have a real list of displays.
2012-08-03 17:14:54 -07:00
Mathias Agopian
450171ac11 am fcb239d3: don\'t filter when capturing a screenshot unless needed
* commit 'fcb239d3dac8bc80f28177f1951611c1d43286ff':
  don't filter when capturing a screenshot unless needed
2012-08-03 17:14:53 -07:00
Mathias Agopian
d364ea2c1e am d3ee231e: cleanups in preparation of bigger changes
* commit 'd3ee231eddce0b69ec5e35188dbd0f4a2c3b9ac3':
  cleanups in preparation of bigger changes
2012-08-03 17:14:52 -07:00
Mathias Agopian
1583a15400 am 0f2f5ff7: rename DisplayHardware to DisplayDevice
* commit '0f2f5ff75b7b48ceb64270655ee6b62d09bf4d00':
  rename DisplayHardware to DisplayDevice
2012-08-03 17:14:52 -07:00
Mathias Agopian
0e626e064a am be246f86: Layers are now sorted by layer-stack first, then by z-order
* commit 'be246f86bd6378a5110e81e9d9068ab03c3b077e':
  Layers are now sorted by layer-stack first, then by z-order
2012-08-03 17:14:51 -07:00
Mathias Agopian
50e1602050 am 52bbb1ae: getting closer to final main composition loop
* commit '52bbb1ae239c8a4d05543a23fa8c08467d09c3b2':
  getting closer to final main composition loop
2012-08-03 17:14:50 -07:00
Mathias Agopian
9b04a90155 am 87baae10: get rid of global regions that should be tracked per display
* commit '87baae104a3e4c2059990b01c393476065c558b0':
  get rid of global regions that should be tracked per display
2012-08-03 17:14:49 -07:00
Mathias Agopian
92efd84f37 screen-off animation won't be handled by SF anymore
Change-Id: Idc41386804ae7d7eb981c36e1bc55c270870c8d0
2012-08-03 13:22:58 -07:00
Mathias Agopian
92a979a92c We now have a real list of displays.
displays can be dynamically added or removed, and the
list is part of the SF's transaction.

Change-Id: I4186ea39f1317c0e7c044f869004017738968fab
2012-08-02 22:24:12 -07:00
Mathias Agopian
fcb239d3da don't filter when capturing a screenshot unless needed
bug: 6919952
Change-Id: Ia6fbe9bc7e533a64cfdd6ef7f0cd6b9f11feb947
2012-08-02 22:24:12 -07:00
Mathias Agopian
d3ee231edd cleanups in preparation of bigger changes
- fix typo drawForSreenshot misspelled
- get rid of DisplayDeviceBase
- removed unused or unneeded code
- always pass a DisplayDevice to Layer methods that are called
  on a per-display basis (to make it clear that this could be
  called more than once per composition).

Change-Id: Id948b7e09fe5c06db0e42d40d6ed75dd095c7f44
2012-08-02 22:24:12 -07:00
Mathias Agopian
0f2f5ff75b rename DisplayHardware to DisplayDevice
Change-Id: I3f7250cd914e0da4f9ec2c9403587bbe12f3cc62
2012-08-02 22:24:12 -07:00
Mathias Agopian
be246f86bd Layers are now sorted by layer-stack first, then by z-order
Change-Id: I7a82929df5ba87b9d88cc5be87e1a233bc4628e9
2012-08-02 22:24:12 -07:00
Mathias Agopian
52bbb1ae23 getting closer to final main composition loop
Change-Id: Icd63782366ffd11d9ea00c925ae5783ed7440cdb
2012-08-02 22:24:12 -07:00
Mathias Agopian
87baae104a get rid of global regions that should be tracked per display
Change-Id: I3b871860cc29f1b2fdcc22b0c577a6eae65d9296
2012-08-02 22:24:12 -07:00
The Android Open Source Project
6c19776e9c Reconcile with jb-mr1-release - do not merge
Change-Id: Ied7fb684e20303e807cb5f06d7cdcdf8e2e16276
2012-08-02 11:26:38 -07:00
The Android Automerger
a8545d555e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-02 07:16:59 -07:00
Romain Guy
b4c3a393f0 am 53f10b7b: Merge "Add missing break in switch statement" into jb-mr1-dev
* commit '53f10b7b13363e6d017985ead704494fe79c9e09':
  Add missing break in switch statement
2012-08-01 19:20:44 -07:00
Romain Guy
53f10b7b13 Merge "Add missing break in switch statement" into jb-mr1-dev 2012-08-01 19:18:10 -07:00
Dianne Hackborn
4d1a4829bf am 22ea9b37: Dalvik heap size for a 10" xhdpi tablet.
* commit '22ea9b37e2a2b5e3e0e2e1d556f499fc20a9de17':
  Dalvik heap size for a 10" xhdpi tablet.
2012-08-01 19:17:59 -07:00
Romain Guy
4f9c284de4 Add missing break in switch statement
Change-Id: I6206cc9ca46c4e2f125d3d820256280586ad66a1
2012-08-01 19:16:59 -07:00
Dianne Hackborn
22ea9b37e2 Dalvik heap size for a 10" xhdpi tablet.
Change-Id: Ie47702cda764817e023464944cd6dc5352fc439e
2012-08-01 18:14:45 -07:00
Jamie Gennis
e5b50d312f am 1dd2003f: Merge "libgui: enable EGL_fence_sync usage for exynos5" into jb-mr1-dev
* commit '1dd2003f1a9a7a4826da7a4b565d41b941b7cc5d':
  libgui: enable EGL_fence_sync usage for exynos5
2012-07-31 17:15:28 -07:00
Jamie Gennis
1dd2003f1a Merge "libgui: enable EGL_fence_sync usage for exynos5" into jb-mr1-dev 2012-07-31 17:13:32 -07:00
Jamie Gennis
12bd497f28 libgui: enable EGL_fence_sync usage for exynos5
Bug: 6876502
Change-Id: I2ec2800881dcba9e4f6ff32ffa1341a2de01f0a2
2012-07-31 17:07:53 -07:00
Jesse Hall
b765f2c2db am cbc388ca: Merge "Move eglSwapBuffers out of HWComposer" into jb-mr1-dev
* commit 'cbc388ca6a363d5228e69fdab5c583877a760280':
  Move eglSwapBuffers out of HWComposer
2012-07-31 16:20:18 -07:00
Jesse Hall
cbc388ca6a Merge "Move eglSwapBuffers out of HWComposer" into jb-mr1-dev 2012-07-31 16:17:52 -07:00
The Android Open Source Project
2b24add32e Reconcile with jb-mr1-release - do not merge
Change-Id: I198408ef678851f19476836b10a2fc002dd11a95
2012-07-31 15:03:17 -07:00
Jesse Hall
08da0bf17c Revert "Minimal changes to support multi-display HWC"
This reverts commit bddd724b17

Change-Id: Ib7db20b5b3de4779b6e173473a33976ae398abd4
2012-07-31 13:11:51 -07:00
Jesse Hall
b3bcc46c36 am b6ae16f0: Merge "Revert "Minimal changes to support multi-display HWC"" into jb-mr1-dev
* commit 'b6ae16f04e0655f938cd511c3965fa00e2ae6763':
  Revert "Minimal changes to support multi-display HWC"
2012-07-31 12:25:36 -07:00
Jesse Hall
b6ae16f04e Merge "Revert "Minimal changes to support multi-display HWC"" into jb-mr1-dev 2012-07-31 12:24:17 -07:00
Jesse Hall
bc0d7dc8f5 Revert "Minimal changes to support multi-display HWC"
This reverts commit bddd724b17

Change-Id: Ib7db20b5b3de4779b6e173473a33976ae398abd4
2012-07-31 12:16:31 -07:00
The Android Open Source Project
082f48b8d3 Sync with jb-mr1-dev
Change-Id: I8ad322a285ffbcda32be279f3e06fdb2908789d9
2012-07-31 07:51:52 -07:00
Jesse Hall
402a65da15 Merge "Minimal changes to support multi-display HWC" into jb-mr1-dev 2012-07-30 21:20:05 -07:00
Jesse Hall
34a09ba1ef Move eglSwapBuffers out of HWComposer
Commit 8630320 moved the eglSwapBuffers fallback (for devices with no
HWC implementation) from DisplayHardware to HWComposer. But HWComposer
only knows about the framebuffer EGL display and surface handles if
there is a HWC, so it was always passing bogus handles.

This change moves the eglSwapBuffers fallback up to SurfaceFlinger,
which has access to the framebuffer EGL handles.

Bug: 6886613
Change-Id: Iad3f5ff7c90ee48d7053999e6a4548d6794b6ebd
2012-07-30 16:10:49 -07:00
Mathias Agopian
e21facef01 Merge "log more info on fence sync_merge error" into jb-mr1-dev 2012-07-30 15:22:00 -07:00
Mathias Agopian
d83d67b5d5 log more info on fence sync_merge error
also fix a typo where the wrong value was passed to sterror.

Change-Id: I4df2abe582e14c8f816b65818f4593a6bd3c23ea
2012-07-30 15:10:35 -07:00
Ed Heyl
747c480b0e Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev
Conflicts:
	include/media/hardware/CryptoAPI.h

Change-Id: I84bf34edbef000558f088bbf1d1e5b55d6217d2e
2012-07-28 09:55:54 -07:00
The Android Open Source Project
657ea79b62 am 5e966ef6: Reconcile with jb-release
* commit '5e966ef64bda21a14b5f835040f515932c52e966':
2012-07-27 15:45:33 -07:00
The Android Open Source Project
5e966ef64b Reconcile with jb-release
Change-Id: Ied4d1f919062ea2abeee45ce4ecbc92a105b8f3d
2012-07-27 14:52:00 -07:00
Jesse Hall
bddd724b17 Minimal changes to support multi-display HWC
Change-Id: I5efea78ac381c3e3118e6e92b508f336233ac319
2012-07-27 10:28:36 -07:00
Mathias Agopian
c666cae2d5 get rid of the shared-memory control block
Change-Id: If814060aca1d2ff2619d4adcd57296983d207f7f
2012-07-25 21:13:10 -07:00
Mathias Agopian
028508cad5 hopefully fixe a race condition in sf initialization
if we received a vsync event during SF init, we could crash
as not all objects were ready to go.

Change-Id: Ie11b46e3eb1b37a709dd8757843d444f93dd0189
2012-07-25 21:13:10 -07:00
Mathias Agopian
8630320433 split HWComposer out of DisplayHardware
we will only ever have a single instance of HWComposer, so
it's now an attribute of SurfaceFlinger, instead of being part
of DisplayHardware.

DisplayHardware now just represents a "display" (it should be renamed).

Change-Id: Iec191e57686868e1df6daa8b880a286c9fefde56
2012-07-24 22:49:49 -07:00
Mathias Agopian
98a121aa91 get rid of ro.sf.hwrotation, it's not used anymore
Change-Id: I2ee469ac89ecd65d7187be5cab08b5cc18f67cbe
2012-07-24 21:42:27 -07:00
Mathias Agopian
8785578391 add a layerStack attribute to Layers.
this attribute can be set through a regular transaction using
SurfaceComposerClient (just like any other attribute, eg: position or size)

Change-Id: I701a47c677ea6442ca713728a93335328cd2b172
2012-07-24 21:42:27 -07:00