OSDN Git Service
Mathias Agopian [Tue, 21 Aug 2012 22:47:28 +0000 (15:47 -0700)]
simplify further vsync handling
- we now clean-up "dead" connection in the main loop,
this entirely avoid the problem with the side effects of
releasing strong references. We now only hold on to strong
reference for the connection we will signal.
- also simplify how we build the list of "ready" connections, by
only adding them to the list when we did receive a vsync event
Change-Id: I2a84da431320a2af8e8a93e07622a1d258236f43
Ramanan Rajeswaran [Wed, 22 Aug 2012 21:25:48 +0000 (14:25 -0700)]
Merge "Revert "Added display initialization method"" into jb-mr1-dev
Ramanan Rajeswaran [Wed, 22 Aug 2012 21:23:50 +0000 (14:23 -0700)]
Revert "Added display initialization method"
This reverts commit
3f3956236aac97b6aa25fa89f0983d5e9d065fdb
Change-Id: Ia2a15d9a5db88add6019edf9d955cef1f73d432d
Jesse Hall [Wed, 22 Aug 2012 18:50:00 +0000 (11:50 -0700)]
Pass the correct number of displays based on HWC version
Change-Id: I27372f5d3102ad56f6d67722d631ae18d37f8330
Jamie Gennis [Wed, 22 Aug 2012 00:03:18 +0000 (17:03 -0700)]
ui/Fence: change the TIMEOUT_NEVER value to -1
Change-Id: I3ef0a4c06f80990b53a8bf2eda6edbfcbefd0f34
Eino-Ville Talvala [Tue, 21 Aug 2012 23:46:05 +0000 (16:46 -0700)]
Merge "Add BufferItemConsumer, a simple BufferQueue consumer." into jb-mr1-dev
Eino-Ville Talvala [Tue, 21 Aug 2012 20:37:35 +0000 (13:37 -0700)]
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
Andy McFadden [Mon, 20 Aug 2012 22:39:23 +0000 (15:39 -0700)]
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
Mathias Agopian [Tue, 21 Aug 2012 03:07:34 +0000 (20:07 -0700)]
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
Mathias Agopian [Tue, 21 Aug 2012 00:03:29 +0000 (17:03 -0700)]
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
Mathias Agopian [Mon, 20 Aug 2012 23:48:07 +0000 (16:48 -0700)]
Merge "get rid of mirrorItemAt() which isn't used anywhere" into jb-mr1-dev
Eino-Ville Talvala [Mon, 20 Aug 2012 23:18:10 +0000 (16:18 -0700)]
Merge "CpuConsumer: inherit from ConsumerBase" into jb-mr1-dev
Eino-Ville Talvala [Mon, 20 Aug 2012 22:44:40 +0000 (15:44 -0700)]
CpuConsumer: inherit from ConsumerBase
Change-Id: I55178b1d673ffa0fbc6e63ef47642c64d4d03228
Mathias Agopian [Mon, 20 Aug 2012 21:21:29 +0000 (14:21 -0700)]
get rid of mirrorItemAt() which isn't used anywhere
Change-Id: Id6f2dbeed21cabc127d39538c0ff464077ada83f
Jamie Gennis [Mon, 20 Aug 2012 21:33:23 +0000 (14:33 -0700)]
Merge "Revert "SurfaceTexture: inherit from ConsumerBase"" into jb-mr1-dev
Jamie Gennis [Mon, 20 Aug 2012 21:33:15 +0000 (14:33 -0700)]
Merge "Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"" into jb-mr1-dev
Jamie Gennis [Mon, 20 Aug 2012 21:28:53 +0000 (14:28 -0700)]
Revert "SurfaceTexture: inherit from ConsumerBase"
This reverts commit
ed059a8d754770c3cf28b78dba30f7a6ba475dbe
Change-Id: I72542c2595771a40c2c88251e0d6eb54e305b99b
Jamie Gennis [Mon, 20 Aug 2012 21:28:21 +0000 (14:28 -0700)]
Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"
This reverts commit
f8d33c652b930abbfb0722f3a2928cbc2ea71078
Change-Id: I1ff2e1cc85824a8fac1051f573d2931db81af511
Mathias Agopian [Mon, 20 Aug 2012 21:20:17 +0000 (14:20 -0700)]
Merge "Fix deadlock in SF." into jb-mr1-dev
Jamie Gennis [Mon, 20 Aug 2012 19:39:37 +0000 (12:39 -0700)]
Merge "SurfaceTexture: call ConsumerBase::freeBufferLocked" into jb-mr1-dev
Jamie Gennis [Mon, 20 Aug 2012 18:30:44 +0000 (11:30 -0700)]
SurfaceTexture: call ConsumerBase::freeBufferLocked
This change fixes SurfaceTexture::freeBufferLocked so that it calls the base
class implementation.
Change-Id: I45d76fb2eb02c1fa6e4e917823ead83e2086bd15
Jean-Baptiste Queru [Mon, 20 Aug 2012 17:22:33 +0000 (10:22 -0700)]
resolved conflicts for merge of
21938749 to jb-mr1-dev
Change-Id: I17da10797736f3772a143e2015fe25df0bb3eb3f
Jean-Baptiste Queru [Mon, 20 Aug 2012 16:42:32 +0000 (09:42 -0700)]
am
6e820eec: am
6f89ebde: Merge "EGL: do not use sparse files for shader"
* commit '
6e820eec21917f8e25c40dbc8b972468535af0e8':
EGL: do not use sparse files for shader
Jean-Baptiste Queru [Mon, 20 Aug 2012 16:40:11 +0000 (09:40 -0700)]
am
349149b5: Merge "Fix error trap in SurfaceTexture Client"
* commit '
349149b52a424c212e33d165bc146bc0337ea4c4':
Fix error trap in SurfaceTexture Client
Jean-Baptiste Queru [Mon, 20 Aug 2012 16:40:11 +0000 (09:40 -0700)]
am
6f89ebde: Merge "EGL: do not use sparse files for shader"
* commit '
6f89ebded650406818b5fc5e9eaf096a06a2798c':
EGL: do not use sparse files for shader
Jean-Baptiste Queru [Mon, 20 Aug 2012 15:55:04 +0000 (08:55 -0700)]
Merge "Fix error trap in SurfaceTexture Client"
Jean-Baptiste Queru [Mon, 20 Aug 2012 15:54:42 +0000 (08:54 -0700)]
Merge "EGL: do not use sparse files for shader"
Mathias Agopian [Fri, 17 Aug 2012 22:06:02 +0000 (15:06 -0700)]
Fix deadlock in SF.
problem was that we were acquiring a strong reference
on Connection object with a lock held, when those
got out of scope (lock still held) their dtor
could be called if all other refs had dropped,
the dtor would acquire the lock again to
remove the Connection from the main list. boom.
we rearange the code so this doesn't happen.
Bug:
6942208
Change-Id: I0a0ebabce2842d29d60d645b64aac2f26640e59b
Jamie Gennis [Fri, 17 Aug 2012 22:35:17 +0000 (15:35 -0700)]
Merge "SurfaceTexture: inherit from ConsumerBase" into jb-mr1-dev
Mathias Agopian [Thu, 16 Aug 2012 23:28:27 +0000 (16:28 -0700)]
refactor compositing code to avoid multiple eglMakeCurrent() calls
when multiple displays are connected, we ended-up having to
call eglMakeCurrent() twice per display due to a limitation
in EGL. this fixes that.
Change-Id: I11e4584df50f8c24bbecee74e37b28b3ee031d2f
Mathias Agopian [Sat, 11 Aug 2012 01:50:38 +0000 (18:50 -0700)]
reimplement wifi display hack with new external display SF framework
fix a few bugs with external displays
- HWComposer doesn't really handle multiple displays yet
so there is a lot of ugliness there
- We also need to make sure that external displays are not
blanked by default
- due to some EGL limitations surfaces being swapped need
to be current
Change-Id: I82bff05b43bcebd8da863c7c76b4edbc3bc223a9
Mathias Agopian [Fri, 17 Aug 2012 03:57:39 +0000 (20:57 -0700)]
display states can't share the dirty flags
Change-Id: Ifade9f2f1a0df9a36aede77a6cf5eee4be534f98
Mathias Agopian [Fri, 17 Aug 2012 03:52:17 +0000 (20:52 -0700)]
binder interfaces can't be compared directly
we always need to compare their binder
Change-Id: I70d554ebc5009fe81e87923235f91451f32e1a30
Jamie Gennis [Wed, 8 Aug 2012 01:03:04 +0000 (18:03 -0700)]
SurfaceTexture: inherit from ConsumerBase
This change makes SurfaceTexture inherit from ConsumerBase. It removes all of
the functionality from SurfaceTexture that is now provided by the base class.
Change-Id: I4a881df42810a14ee32d4ef7c8772a8f2510f4c7
Siva Velusamy [Thu, 16 Aug 2012 23:26:59 +0000 (16:26 -0700)]
Merge "gltrace: flush trace buffer on createContext & makeCurrent" into jb-mr1-dev
Siva Velusamy [Thu, 16 Aug 2012 21:41:20 +0000 (14:41 -0700)]
gltrace: flush trace buffer on createContext & makeCurrent
Certain apps (e.g. chrome) seem to create contexts which are unused
for long periods of time. If tracing is stopped before those contexts
are used, then the debugger never gets to know that these contexts
were created. Flushing the trace after these calls ensures that
the debugger knows about all created/used contexts.
Change-Id: I01baa11aa56ac89eddce3c2851e4bf01076984d1
Mathias Agopian [Wed, 15 Aug 2012 23:14:33 +0000 (16:14 -0700)]
oopsie, missed a spot when fixing b/
6970310
Change-Id: Ia320fddc7cc4b0666a4fee678af710ecf5f83ff5
Mathias Agopian [Wed, 15 Aug 2012 20:46:03 +0000 (13:46 -0700)]
we were mistakenly optimizing out SF's main transactions in some cases
due to a typo, SF's main transaction was conditional to having a
display transaction.
more correct fix for
6970310
Bug:
6970310
Change-Id: Iafd8c4e02afa5db829cc1c65950cfcc74754c6af
Jeff Brown [Sat, 28 Jul 2012 01:07:41 +0000 (18:07 -0700)]
Use new PowerManager API.
Change-Id: I66165d9954e2d1da9204216382a05a873f1393f4
Jeff Brown [Wed, 15 Aug 2012 08:08:54 +0000 (01:08 -0700)]
Fix layer removal transaction.
Layers were not properly being removed because we were
setting the wrong transaction type flag at the time of
removal.
When layers are removed, we must use eDisplayTransactionNeeded,
not eTransactionNeeded, to ensure that the mLayersRemoved
flag is checked and the appropriate cleanup occurs.
Bug:
6970310
Change-Id: Id4b2897a34d4ac00aa0f92349c0ec6db95c1aaf7
Jesse Hall [Mon, 13 Aug 2012 21:47:01 +0000 (14:47 -0700)]
Don't crash when recovering from WM death
Bug:
6956162
Change-Id: I27244b960c77187b4c4cd7297989c4c872e94a3a
Jeff Brown [Tue, 14 Aug 2012 06:35:07 +0000 (23:35 -0700)]
Merge "Add a very simple helper function to log slow functions." into jb-mr1-dev
Mathias Agopian [Tue, 14 Aug 2012 01:32:13 +0000 (18:32 -0700)]
make sure to repaint the screen when unblank()ing
Change-Id: I38e3a8e6bb31ef3d2f1fcaec7490cb92a4427db2
Mathias Agopian [Tue, 14 Aug 2012 00:54:26 +0000 (17:54 -0700)]
xdpi / ydpi were reported as 0
Bug:
6975723
Change-Id: Ia7fa37ec11e2308804f5034959a37e508d292d31
Mathias Agopian [Mon, 13 Aug 2012 21:28:24 +0000 (14:28 -0700)]
Merge "improve [un]marshalling of non-binder objects" into jb-mr1-dev
Jesse Hall [Thu, 2 Aug 2012 00:10:25 +0000 (17:10 -0700)]
Add compile-time option to systrace GL-ES calls
Change-Id: Ibec103bbf159626ad9745d0e071192ad424bc0e9
Mathias Agopian [Mon, 13 Aug 2012 02:37:16 +0000 (19:37 -0700)]
improve [un]marshalling of non-binder objects
this change introduces a new class LightFlattenable<> which is
a protocol to flatten simple objects that don't require
binders or file descriptors; the benefit of this protocol is that
it doesn't require the objects to have a virtual table and give us
a consitant way of doing this.
we also introduce an implementation of this protocol for
POD structures, LightFlattenablePod<>.
Parcel has been update to handle this protocol automatically.
Sensor, Rect, Point and Region now use this new protocol.
Change-Id: Icb3ce7fa1d785249eb666f39c2129f2fc143ea4a
Jeff Brown [Sat, 11 Aug 2012 03:44:39 +0000 (20:44 -0700)]
Add a very simple helper function to log slow functions.
Change-Id: I2e2e072206d02b572a330dd25857c161b5b563bf
Mathias Agopian [Thu, 9 Aug 2012 23:29:12 +0000 (16:29 -0700)]
make multi-display more real
- displays are represented by a binder on the client side
- c++ clients can now create and modify displays
Change-Id: I203ea5b4beae0819d742ec5171c27568f4e8354b
Mathias Agopian [Fri, 10 Aug 2012 22:22:19 +0000 (15:22 -0700)]
screenshots could stop working after camera was used
once a secure window is put on screen the display
would retain its "secure" flag forever, preventing
screenshots from being taken.
Bug:
6933967
Change-Id: I5be8355145ca7d580d84552311642f8fa912fe6a
Mathias Agopian [Fri, 10 Aug 2012 21:36:40 +0000 (14:36 -0700)]
avoid crashing when we don't have an h/w composer
should fix the emulator
Bug:
6956162
Change-Id: I38247b59d276b8db078c4dc2caba7d3fb545912c
Mathias Agopian [Thu, 9 Aug 2012 02:42:09 +0000 (19:42 -0700)]
libgui includes refactoring
Change-Id: I1d24ec17f5003ec2abab5f7472daaff4cc4cc2d3
Mathias Agopian [Thu, 9 Aug 2012 01:35:12 +0000 (18:35 -0700)]
Add a display parameter to HWComposer where needed
- also replace C casts with C++ casts
- only the interface is changed, HWComposer still doesn't
fully handle multiple displays
Change-Id: I48eb89bff2edb76bf1d4d41f46802b9b2a7166a8
Mathias Agopian [Thu, 9 Aug 2012 01:51:15 +0000 (18:51 -0700)]
now able to set the layer stack on a DisplayDevice
Change-Id: Ia9691cf221b9444c243eb468d9e276a30e600b6b
Mathias Agopian [Fri, 10 Aug 2012 02:39:15 +0000 (19:39 -0700)]
improve Vector<> safety checks
- make errors that will always cause a memory corruption always fatal
(for eg: KeyedVector<>::editValue{For|At}() failure)
- make other errors fatal in debug mode, those that can be caught by
the caller.
- fix typos
Change-Id: I65cc7d81035c37ce2906fc4500c50e5d5b5c49eb
Jamie Gennis [Wed, 8 Aug 2012 23:13:20 +0000 (16:13 -0700)]
Merge "SurfaceTexture: Fix a fence fd leak." into jb-mr1-dev
Jamie Gennis [Wed, 8 Aug 2012 22:39:55 +0000 (15:39 -0700)]
SurfaceTexture: Fix a fence fd leak.
Bug:
6949010
Change-Id: I289992c964504b4fe5458dbd19b248a841ef043f
Mathias Agopian [Wed, 8 Aug 2012 22:32:02 +0000 (15:32 -0700)]
add /d/sync to dumpstate
Change-Id: I24f8f3e0420c2198ae3981fc067fb660898655e8
Keun young Park [Wed, 8 Aug 2012 19:25:15 +0000 (12:25 -0700)]
Merge "enable java/jni build in PDK if supported" into jb-mr1-dev
Keun young Park [Wed, 8 Aug 2012 00:09:19 +0000 (17:09 -0700)]
enable java/jni build in PDK if supported
- testFramerate requires platform java API
while all other tests only need SDK support
Change-Id: Iaefe23c41b3ace87522b5deefd6db2f5d80ed872
Jesse Hall [Tue, 31 Jul 2012 21:32:56 +0000 (14:32 -0700)]
Changes to support multi-display HWC
Change-Id: I07efff54f2980dcb013935747b03e099b8f1181b
Jamie Gennis [Tue, 7 Aug 2012 02:15:51 +0000 (19:15 -0700)]
Merge changes Ic3d35a93,I46ec942d into jb-mr1-dev
* changes:
SurfaceTexture: fix an out of bounds array access
surfaceflinger: refactor FrambufferSurface
Jamie Gennis [Tue, 7 Aug 2012 00:10:57 +0000 (17:10 -0700)]
SurfaceTexture: fix an out of bounds array access
Bug:
6879028
Change-Id: Ic3d35a9384c0a6dfa4000e7743a6f6859608b0bf
Jamie Gennis [Fri, 3 Aug 2012 03:11:05 +0000 (20:11 -0700)]
surfaceflinger: refactor FrambufferSurface
This change refactors the FramebufferSurface class to inherit from the new
ConsumerBase class.
Bug:
6620200
Change-Id: I46ec942ddb019658e3c5e79465548b171b2261f2
Greg Hackmann [Mon, 6 Aug 2012 20:55:56 +0000 (13:55 -0700)]
fix pdk build
Change-Id: Ia4db8e1e8ee18ac112bf13a5ab2a75edb08fc70f
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Mathias Agopian [Sun, 5 Aug 2012 19:41:16 +0000 (12:41 -0700)]
libutils cleanup: remove unused or seldom used code from misc.{cpp|h}
Change-Id: I72206f16619d81887e3b85603494563faab3b445
Mathias Agopian [Sun, 5 Aug 2012 08:23:51 +0000 (01:23 -0700)]
DisplayDevice doesn't need weak pointers or polymorphism
let's use a LightRefBase for now.
Change-Id: Ida068fa902343a8f89ffb6d34c2cd4627ab43c6c
Mathias Agopian [Sun, 5 Aug 2012 07:40:46 +0000 (00:40 -0700)]
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
Mathias Agopian [Sun, 5 Aug 2012 04:39:11 +0000 (21:39 -0700)]
DisplayDevice only needs ANativeWindow not SurfaceTextureClient
Change-Id: Ib5be5af8bede435c8d5d9fabf586d28d0e74c2cb
Mathias Agopian [Sun, 5 Aug 2012 04:10:38 +0000 (21:10 -0700)]
remove a dependency of DisplayDevice on the refresh rate
this remove a dependency (not all) on FramebufferSurface
Change-Id: Ie07ce70760cdcedfb41b5b41bea8da45637bf474
Mathias Agopian [Sun, 5 Aug 2012 03:22:32 +0000 (20:22 -0700)]
remove unneeded dependencies in libhardware
Change-Id: Ibb8d698d594216d0746b0e7270cf87d7e5acab2b
Mathias Agopian [Sun, 5 Aug 2012 03:09:03 +0000 (20:09 -0700)]
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
Mathias Agopian [Fri, 3 Aug 2012 04:27:56 +0000 (21:27 -0700)]
screen-off animation won't be handled by SF anymore
Change-Id: Idc41386804ae7d7eb981c36e1bc55c270870c8d0
Mathias Agopian [Fri, 3 Aug 2012 01:32:23 +0000 (18:32 -0700)]
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
Mathias Agopian [Thu, 2 Aug 2012 23:01:34 +0000 (16:01 -0700)]
don't filter when capturing a screenshot unless needed
bug:
6919952
Change-Id: Ia6fbe9bc7e533a64cfdd6ef7f0cd6b9f11feb947
Mathias Agopian [Thu, 2 Aug 2012 21:01:42 +0000 (14:01 -0700)]
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
Mathias Agopian [Wed, 1 Aug 2012 06:09:07 +0000 (23:09 -0700)]
rename DisplayHardware to DisplayDevice
Change-Id: I3f7250cd914e0da4f9ec2c9403587bbe12f3cc62
Mathias Agopian [Wed, 1 Aug 2012 05:59:38 +0000 (22:59 -0700)]
Layers are now sorted by layer-stack first, then by z-order
Change-Id: I7a82929df5ba87b9d88cc5be87e1a233bc4628e9
Mathias Agopian [Wed, 1 Aug 2012 02:01:53 +0000 (19:01 -0700)]
getting closer to final main composition loop
Change-Id: Icd63782366ffd11d9ea00c925ae5783ed7440cdb
Mathias Agopian [Tue, 31 Jul 2012 19:38:26 +0000 (12:38 -0700)]
get rid of global regions that should be tracked per display
Change-Id: I3b871860cc29f1b2fdcc22b0c577a6eae65d9296
Romain Guy [Thu, 2 Aug 2012 02:18:10 +0000 (19:18 -0700)]
Merge "Add missing break in switch statement" into jb-mr1-dev
Romain Guy [Thu, 2 Aug 2012 02:16:59 +0000 (19:16 -0700)]
Add missing break in switch statement
Change-Id: I6206cc9ca46c4e2f125d3d820256280586ad66a1
Dianne Hackborn [Thu, 2 Aug 2012 01:14:45 +0000 (18:14 -0700)]
Dalvik heap size for a 10" xhdpi tablet.
Change-Id: Ie47702cda764817e023464944cd6dc5352fc439e
Jamie Gennis [Wed, 1 Aug 2012 00:13:31 +0000 (17:13 -0700)]
Merge "libgui: enable EGL_fence_sync usage for exynos5" into jb-mr1-dev
Jamie Gennis [Tue, 31 Jul 2012 21:01:57 +0000 (14:01 -0700)]
libgui: enable EGL_fence_sync usage for exynos5
Bug:
6876502
Change-Id: I2ec2800881dcba9e4f6ff32ffa1341a2de01f0a2
Jesse Hall [Tue, 31 Jul 2012 23:17:52 +0000 (16:17 -0700)]
Merge "Move eglSwapBuffers out of HWComposer" into jb-mr1-dev
Jesse Hall [Tue, 31 Jul 2012 19:24:16 +0000 (12:24 -0700)]
Merge "Revert "Minimal changes to support multi-display HWC"" into jb-mr1-dev
Jesse Hall [Tue, 31 Jul 2012 19:16:31 +0000 (12:16 -0700)]
Revert "Minimal changes to support multi-display HWC"
This reverts commit
bddd724b178b1263c16e41b564165fcd0e93ff83
Change-Id: Ib7db20b5b3de4779b6e173473a33976ae398abd4
Jesse Hall [Tue, 31 Jul 2012 04:20:04 +0000 (21:20 -0700)]
Merge "Minimal changes to support multi-display HWC" into jb-mr1-dev
Jesse Hall [Mon, 30 Jul 2012 05:35:34 +0000 (22:35 -0700)]
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
Mathias Agopian [Mon, 30 Jul 2012 22:21:59 +0000 (15:21 -0700)]
Merge "log more info on fence sync_merge error" into jb-mr1-dev
Mathias Agopian [Mon, 30 Jul 2012 22:10:35 +0000 (15:10 -0700)]
log more info on fence sync_merge error
also fix a typo where the wrong value was passed to sterror.
Change-Id: I4df2abe582e14c8f816b65818f4593a6bd3c23ea
Ed Heyl [Sat, 28 Jul 2012 16:55:54 +0000 (09:55 -0700)]
Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev
Conflicts:
include/media/hardware/CryptoAPI.h
Change-Id: I84bf34edbef000558f088bbf1d1e5b55d6217d2e
The Android Open Source Project [Fri, 27 Jul 2012 22:45:33 +0000 (15:45 -0700)]
The Android Open Source Project [Fri, 27 Jul 2012 21:52:00 +0000 (14:52 -0700)]
Reconcile with jb-release
Change-Id: Ied4d1f919062ea2abeee45ce4ecbc92a105b8f3d
Jesse Hall [Thu, 26 Jul 2012 05:15:40 +0000 (22:15 -0700)]
Minimal changes to support multi-display HWC
Change-Id: I5efea78ac381c3e3118e6e92b508f336233ac319
Mathias Agopian [Thu, 26 Jul 2012 01:56:13 +0000 (18:56 -0700)]
get rid of the shared-memory control block
Change-Id: If814060aca1d2ff2619d4adcd57296983d207f7f
Mathias Agopian [Thu, 26 Jul 2012 04:12:12 +0000 (21:12 -0700)]
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
Mathias Agopian [Wed, 25 Jul 2012 05:46:10 +0000 (22:46 -0700)]
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
Mathias Agopian [Wed, 25 Jul 2012 04:08:59 +0000 (21:08 -0700)]
get rid of ro.sf.hwrotation, it's not used anymore
Change-Id: I2ee469ac89ecd65d7187be5cab08b5cc18f67cbe