Jamie Gennis
1a4d883dcc
surfaceflinger: refactor FrambufferSurface
...
This change refactors the FramebufferSurface class to inherit from the new
ConsumerBase class.
Bug: 6620200
Change-Id: I46ec942ddb019658e3c5e79465548b171b2261f2
2012-08-06 18:55:01 -07:00
Mathias Agopian
028a7572c8
DisplayDevice doesn't need weak pointers or polymorphism
...
let's use a LightRefBase for now.
Change-Id: Ida068fa902343a8f89ffb6d34c2cd4627ab43c6c
2012-08-05 01:23:51 -07:00
Mathias Agopian
4297734c11
turn DisplayDevice into a reference-counted object
...
it's safer this way because this object owns an
EGLSurface which cannot be easily reference-counted.
it also gives us the ability to sub-class it, which
we might want to do soon.
Change-Id: I07358bb052dc5a13b4f2196b2c2b6e6e94c4bb4f
2012-08-05 00:40:46 -07:00
Mathias Agopian
d8552d796c
DisplayDevice only needs ANativeWindow not SurfaceTextureClient
...
Change-Id: Ib5be5af8bede435c8d5d9fabf586d28d0e74c2cb
2012-08-04 21:39:11 -07:00
Mathias Agopian
888c822c4c
remove a dependency of DisplayDevice on the refresh rate
...
this remove a dependency (not all) on FramebufferSurface
Change-Id: Ie07ce70760cdcedfb41b5b41bea8da45637bf474
2012-08-04 21:23:47 -07:00
Mathias Agopian
72131d9ef1
remove unneeded dependencies in libhardware
...
Change-Id: Ibb8d698d594216d0746b0e7270cf87d7e5acab2b
2012-08-04 20:22:32 -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
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
Romain Guy
53f10b7b13
Merge "Add missing break in switch statement" into jb-mr1-dev
2012-08-01 19:18:10 -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
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
cbc388ca6a
Merge "Move eglSwapBuffers out of HWComposer" into jb-mr1-dev
2012-07-31 16:17:52 -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
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
Mathias Agopian
8b33f03232
update SF binder protocol to support setting display attributes
...
no change of functionality -- the old behavior is implemented
on top of this new protocol.
this new protocol will allow, eventually, to pass informations
about displays and layer stacks.
Change-Id: Ic6c2295e61ec8ecbc8ce01ab7664e35d928202fc
2012-07-24 20:43:54 -07:00
The Android Automerger
19b93df34f
merge in jb-release history after reset to jb-dev
2012-07-24 20:23:13 -07:00
Mathias Agopian
921e6ac4b7
SurfaceFlinger cleanup
...
mostly refactored SurfaceFlinger.h, but also removed dead code.
cleaned-up a few includes as well.
Change-Id: Ib15f4ffe567912b61ee98aa076c6a283b72811b5
2012-07-24 00:09:35 -07:00
Thomas Tafertshofer
36b285eac9
Fixed bug in opengl es binding generation
...
This fixes the glgen code generation for methods
which have a buffer arg that can be NULL.
Bug: 6845189
Change-Id: I5fb745b806601e5665f97bfd15fd865cd9c241ed
2012-07-23 17:06:52 -07:00
Mathias Agopian
493c4feb75
Merge "glgen stubs to fix bad methods in gles20 bindings"
2012-07-23 16:25:44 -07:00
Jamie Gennis
9a82fe645d
Merge "Update the EGL_ANDROID_fence_sync spec."
2012-07-23 16:21:58 -07:00
Jamie Gennis
648654d741
Update the EGL_ANDROID_fence_sync spec.
...
Change-Id: I26589e51c2023aed4da8a25a098b01804200ddc2
2012-07-23 14:34:10 -07:00
Jesse Hall
6ee93c0d36
Increment iterator on early-out too
...
Bug: 6860046
Change-Id: I82f9e4062cb58d5479c9d8dc5f2f0770a1dcc605
2012-07-23 13:12:28 -07:00
Jesse Hall
2654a36a44
Merge "Handle empty HWC layer list when composing"
2012-07-21 18:51:20 -07:00
Jesse Hall
a6b32db164
Handle empty HWC layer list when composing
...
Bug: 6777877
Change-Id: I71e9b948d04dda33d45cfa986d9c7e28328cf749
2012-07-20 11:46:58 -07:00
Nick Pelly
180eaad14d
Merge "Add elapsedRealtimeNano(), and use CLOCK_BOOTTIME where possible."
2012-07-20 09:46:15 -07:00
Thomas Tafertshofer
55b4e553c8
glgen stubs to fix bad methods in gles20 bindings
...
this adds correct versions of the broken GLES20 methods
glGetShaderSource, glGetActiveAttrib and glGetActiveUniform.
the old broken methods are still there and need to be @hide later.
Bug: 6006380
Change-Id: Ide74242ada54b85459b459ae4f20cd26a23c7610
2012-07-19 16:58:40 -07:00
Nick Pelly
074cd0c076
Add elapsedRealtimeNano(), and use CLOCK_BOOTTIME where possible.
...
Change-Id: I4231c8ca32663e6e2cb5b7c126d091f837373807
2012-07-19 16:06:21 -07:00
Mathias Agopian
a49126087b
factor EGL/GL and surface creation out of DisplayHardware
...
Change-Id: Icd85a6a4caad06f056578008af3e21666fa8b1f4
2012-07-19 14:14:58 -07:00