OSDN Git Service
Mathias Agopian [Thu, 20 Sep 2012 13:08:09 +0000 (06:08 -0700)]
am
d56eff2f: fix typo in DisplayDevice logs
* commit '
d56eff2f49e64bb71863ffb866af8c3f686b96e9':
fix typo in DisplayDevice logs
Mathias Agopian [Wed, 19 Sep 2012 23:25:29 +0000 (16:25 -0700)]
fix typo in DisplayDevice logs
Change-Id: I593ef674f12073bd9d690946447031394ef9044e
Mathias Agopian [Wed, 19 Sep 2012 06:35:42 +0000 (23:35 -0700)]
am
3cdccc6f: Merge "fix a typo in SensorService" into jb-mr1-dev
* commit '
3cdccc6f852be345c43bdfbc2466aa17c1173c9c':
fix a typo in SensorService
Mathias Agopian [Wed, 19 Sep 2012 06:33:20 +0000 (23:33 -0700)]
Merge "fix a typo in SensorService" into jb-mr1-dev
Iliyan Malchev [Wed, 19 Sep 2012 03:30:07 +0000 (20:30 -0700)]
am
2398bc67: Merge "gui: conditionally set USE_NATIVE_FENCE_SYNC for msm8960" into jb-mr1-dev
* commit '
2398bc67bb04e9f087fd46455bf8ff1ce4eb510f':
gui: conditionally set USE_NATIVE_FENCE_SYNC for msm8960
Iliyan Malchev [Wed, 19 Sep 2012 03:28:04 +0000 (20:28 -0700)]
Merge "gui: conditionally set USE_NATIVE_FENCE_SYNC for msm8960" into jb-mr1-dev
Jeff Boody [Mon, 10 Sep 2012 16:24:07 +0000 (10:24 -0600)]
gui: conditionally set USE_NATIVE_FENCE_SYNC for msm8960
Change-Id: Ib7ad11597ef7c79162a0b0a49a1b8ae16d192c10
Signed-off-by: Iliyan Malchev <malchev@google.com>
Mathias Agopian [Wed, 19 Sep 2012 00:18:54 +0000 (17:18 -0700)]
fix a typo in SensorService
It shouldn't have caused much harm though.
Also log a warning when enabling a sensor
for a connection that is already enabled.
Change-Id: Ia4a052381e79183cd4cb1bedc7ba08e5228d7a38
Mathias Agopian [Tue, 18 Sep 2012 22:14:34 +0000 (15:14 -0700)]
am
1d12d8a8: improve logging of external displays
* commit '
1d12d8a8e61163b35cf42c51c558a67138014e82':
improve logging of external displays
Mathias Agopian [Tue, 18 Sep 2012 08:38:00 +0000 (01:38 -0700)]
improve logging of external displays
Change-Id: I041aebb7fc655aeca98bbf698d15e05d7c12cac9
Mathias Agopian [Tue, 18 Sep 2012 20:23:56 +0000 (13:23 -0700)]
am
6ab93290: suppress superfluous log
* commit '
6ab93290aeed63f139b0e77819ea889bbce9ec8b':
suppress superfluous log
Mathias Agopian [Tue, 18 Sep 2012 20:19:46 +0000 (13:19 -0700)]
suppress superfluous log
Change-Id: I838f2de4cf99e885833c4f42e2a69d6e3bb8eea5
Jesse Hall [Tue, 18 Sep 2012 19:21:45 +0000 (12:21 -0700)]
am
aeb76d16: Merge "Check that HWC exists before trying to use it" into jb-mr1-dev
* commit '
aeb76d160c530786d58d6a8b35d9b4a75a2279e3':
Check that HWC exists before trying to use it
Jesse Hall [Tue, 18 Sep 2012 19:16:13 +0000 (12:16 -0700)]
Merge "Check that HWC exists before trying to use it" into jb-mr1-dev
Jamie Gennis [Tue, 18 Sep 2012 19:14:51 +0000 (12:14 -0700)]
am
3941cb24: SurfaceTexture: default to doing GL sync
* commit '
3941cb240d438bfdebe24920bb2ada86456a0bf9':
SurfaceTexture: default to doing GL sync
Jesse Hall [Tue, 18 Sep 2012 18:39:40 +0000 (11:39 -0700)]
Check that HWC exists before trying to use it
Bug:
7185810
Change-Id: I1271d6ba397f3abf0ef166b8d03b9b26b72e28d7
Jamie Gennis [Mon, 17 Sep 2012 23:58:17 +0000 (16:58 -0700)]
SurfaceTexture: default to doing GL sync
This change makes updateTexImage default to performing the necessary
synchronization and adds an argument for SurfaceFlinger to disable that
synchronization so that it can be performed lazily.
Change-Id: I7c20923cc786634126fbf7021c9d2541aa77be5d
Bug:
6991805
Andy McFadden [Tue, 18 Sep 2012 17:10:14 +0000 (10:10 -0700)]
am
8dfa92fe: Plumb display name into SurfaceFlinger
* commit '
8dfa92fef9759a881e96ee58d59875d35023aab9':
Plumb display name into SurfaceFlinger
Andy McFadden [Tue, 18 Sep 2012 01:27:17 +0000 (18:27 -0700)]
Plumb display name into SurfaceFlinger
The Surface createDisplay() call takes a display name for debugging.
This change carries it through SurfaceFlinger and displays it in
the "dumpsys SurfaceFlinger" output.
Bug
7058158
Change-Id: I79f3474a8656ff1beb7b478e0dbf2c5de666118a
Mathias Agopian [Tue, 18 Sep 2012 09:32:47 +0000 (02:32 -0700)]
am
d870703d: fix external displays
* commit '
d870703d5566490cfdfb389d9336b2b8d3c6cc7a':
fix external displays
Mathias Agopian [Tue, 18 Sep 2012 08:21:55 +0000 (01:21 -0700)]
fix external displays
we were not calling eglSwapBuffers() on external displays
because they can't use HWC which caused us to think they
didn't have GLES composition.
Change-Id: I6cef4ae40b138412d2e6f2acda33c9d222b03a83
Mathias Agopian [Tue, 18 Sep 2012 07:04:32 +0000 (00:04 -0700)]
am
41cb1b5f: Merge changes I53d70510,If34a05f3 into jb-mr1-dev
* commit '
41cb1b5f673b7f73e7f781b9f51ed095085dfdcd':
add support hwc 1.1
refactor things a bit
Jamie Gennis [Tue, 18 Sep 2012 07:04:24 +0000 (00:04 -0700)]
am
f0f56f32: Merge "EGL: fix an extension string bug" into jb-mr1-dev
* commit '
f0f56f32bba418ebb42381cd63ba5da36f6fa228':
EGL: fix an extension string bug
Mathias Agopian [Tue, 18 Sep 2012 01:59:04 +0000 (18:59 -0700)]
Merge changes I53d70510,If34a05f3 into jb-mr1-dev
* changes:
add support hwc 1.1
refactor things a bit
Mathias Agopian [Fri, 14 Sep 2012 01:17:13 +0000 (18:17 -0700)]
add support hwc 1.1
Bug:
7124069
Change-Id: I53d705105c4ad8954d3f50ee4f4c8b7ec936b871
Jamie Gennis [Tue, 18 Sep 2012 01:51:55 +0000 (18:51 -0700)]
Merge "EGL: fix an extension string bug" into jb-mr1-dev
Jamie Gennis [Sun, 16 Sep 2012 21:02:20 +0000 (14:02 -0700)]
EGL: fix an extension string bug
This change fixes a bug where initializing EGL multiple times (eglTerminate
followed by eglInitialize) would cause extensions to show up in the extension
string multiple times.
Change-Id: I707a3da62ed30ef13835087167f84a08bc6addd7
Mathias Agopian [Thu, 13 Sep 2012 21:09:01 +0000 (14:09 -0700)]
refactor things a bit
- decouple GL and main display initialization
- ensure that each "supported" display has its own FramebufferSurface
- onScreenAcquired/Released now takes a display
Change-Id: If34a05f3dea40f6c79db77f4dde283a2580daac4
Elliott Hughes [Mon, 17 Sep 2012 19:13:28 +0000 (12:13 -0700)]
am
c8cff90d: Merge "Use a named constant rather than a magic number." into jb-mr1-dev
* commit '
c8cff90d49b6eeaf0290c16517ff49df185dbdcd':
Use a named constant rather than a magic number.
Elliott Hughes [Mon, 17 Sep 2012 19:11:24 +0000 (12:11 -0700)]
Merge "Use a named constant rather than a magic number." into jb-mr1-dev
Elliott Hughes [Mon, 17 Sep 2012 18:43:40 +0000 (11:43 -0700)]
Use a named constant rather than a magic number.
Change-Id: I86e8c91c6f5628df3eec38faf28598cc8cef2ea3
jp abgrall [Mon, 17 Sep 2012 18:03:29 +0000 (11:03 -0700)]
am
86ca50d8: am
e917bfbd: am
09a22fc2: Merge "Allow disable of dumpstate vibrate"
* commit '
86ca50d860fa256f5553ac7b313ba5ff0f120ef0':
Allow disable of dumpstate vibrate
jp abgrall [Mon, 17 Sep 2012 18:01:37 +0000 (11:01 -0700)]
am
e917bfbd: am
09a22fc2: Merge "Allow disable of dumpstate vibrate"
* commit '
e917bfbd19c265ef09c90f93f5dc175fc62259f5':
Allow disable of dumpstate vibrate
jp abgrall [Mon, 17 Sep 2012 17:58:38 +0000 (10:58 -0700)]
am
09a22fc2: Merge "Allow disable of dumpstate vibrate"
* commit '
09a22fc29d588b173e5c0dd2002ac2c44d45b7c6':
Allow disable of dumpstate vibrate
jp abgrall [Mon, 17 Sep 2012 17:21:31 +0000 (10:21 -0700)]
Merge "Allow disable of dumpstate vibrate"
John Michelau [Mon, 17 Sep 2012 16:20:19 +0000 (11:20 -0500)]
Allow disable of dumpstate vibrate
Change-Id: I747b757f4b5e2d6a472b7b2a19f8c1ca8a4b7fdd
Ben Cheng [Sun, 16 Sep 2012 23:25:21 +0000 (16:25 -0700)]
am
07e8134e: Merge "Print warnings when backwards timestamps are detected." into jb-mr1-dev
* commit '
07e8134e24e9ef7a3b2ade361ead5ce1b514c72f':
Print warnings when backwards timestamps are detected.
Ben Cheng [Sun, 16 Sep 2012 23:24:28 +0000 (16:24 -0700)]
Merge "Print warnings when backwards timestamps are detected." into jb-mr1-dev
Ben Cheng [Fri, 14 Sep 2012 21:45:34 +0000 (14:45 -0700)]
Print warnings when backwards timestamps are detected.
Bug:
7100774
Change-Id: I752fd1680b32ce33d17d6042d6c82e27d7ba9dd2
Andy McFadden [Sun, 16 Sep 2012 20:28:48 +0000 (13:28 -0700)]
Andy McFadden [Sun, 16 Sep 2012 19:54:28 +0000 (12:54 -0700)]
am
6905205c: Fix transform hints
* commit '
6905205c8d130b6ea3a813c1b9283492ed183367':
Fix transform hints
Andy McFadden [Sat, 15 Sep 2012 00:21:46 +0000 (17:21 -0700)]
New test
Added a test to confirm that the transform hint is being respected.
Bug:
7162482
Change-Id: I892fe962f8cf2759ff951b4f5065b9ac2732c3d1
Andy McFadden [Fri, 14 Sep 2012 23:10:11 +0000 (16:10 -0700)]
Fix transform hints
The hints were being set a little too late, so the pre-rotation stuff
wasn't quite working.
Bug
7054997
Change-Id: Id8d5c626db7a76f768ba762a145b315878ee08e6
Jeff Brown [Fri, 14 Sep 2012 02:42:12 +0000 (19:42 -0700)]
am
6e220a6c: Fix display projections when translated.
* commit '
6e220a6ce6971555b883f4852c6e5d4c7a617815':
Fix display projections when translated.
Jeff Brown [Fri, 14 Sep 2012 02:22:41 +0000 (19:22 -0700)]
Fix display projections when translated.
There are two different translations to apply in the logical
orientation, one before scaling and one after.
So translate, scale, translate then rotate.
Bug:
7139798
Change-Id: I0726991cadb62988390e77503dbbaed54f07bfe3
Andy McFadden [Thu, 13 Sep 2012 20:25:17 +0000 (13:25 -0700)]
Andy McFadden [Wed, 12 Sep 2012 23:59:59 +0000 (16:59 -0700)]
Minor tweaks
A couple of minor cleanups I stumbled over while looking at other
things.
Change-Id: I385ecfe1afefd577afbc59d7ef1d98d868073651
Jesse Hall [Thu, 13 Sep 2012 03:20:02 +0000 (20:20 -0700)]
am
a4383fd9: Merge "Initialize new HWC 1.2 fields" into jb-mr1-dev
* commit '
a4383fd9de407d16342cd1069f75d2f0207efc0f':
Initialize new HWC 1.2 fields
Jesse Hall [Thu, 13 Sep 2012 03:18:53 +0000 (20:18 -0700)]
Merge "Initialize new HWC 1.2 fields" into jb-mr1-dev
Jesse Hall [Thu, 13 Sep 2012 03:18:31 +0000 (20:18 -0700)]
am
fa32888f: Merge "Fix display projection transforms" into jb-mr1-dev
* commit '
fa32888f5822093f69522086d96ea2d493011a67':
Fix display projection transforms
Jesse Hall [Thu, 13 Sep 2012 03:16:28 +0000 (20:16 -0700)]
Merge "Fix display projection transforms" into jb-mr1-dev
Mathias Agopian [Thu, 13 Sep 2012 02:11:52 +0000 (19:11 -0700)]
am
a5be0cd4: Merge "don\'t call hwc with non-empty layer lists for blanked displays" into jb-mr1-dev
* commit '
a5be0cd4f360a415a65825e5956e80a374c09743':
don't call hwc with non-empty layer lists for blanked displays
Mathias Agopian [Thu, 13 Sep 2012 02:10:03 +0000 (19:10 -0700)]
Merge "don't call hwc with non-empty layer lists for blanked displays" into jb-mr1-dev
Mathias Agopian [Thu, 13 Sep 2012 01:01:27 +0000 (18:01 -0700)]
am
9ca6491b: Region::validate() cannot be called from addRectUnchecked()
* commit '
9ca6491bb701919a3f88fa7c43da284b13822ed6':
Region::validate() cannot be called from addRectUnchecked()
Mathias Agopian [Thu, 13 Sep 2012 00:56:29 +0000 (17:56 -0700)]
Region::validate() cannot be called from addRectUnchecked()
addRectUnchecked() is allowed to be in an invalid state
temporarily.
Change-Id: I6f5162b5c49f378978c070a77abba35023fe918c
Mathias Agopian [Thu, 13 Sep 2012 00:51:05 +0000 (17:51 -0700)]
am
8df840aa: Merge "strengthen region validation" into jb-mr1-dev
* commit '
8df840aa76bc1cd7bc924d32ed4c69a95b33059e':
strengthen region validation
Mathias Agopian [Thu, 13 Sep 2012 00:49:28 +0000 (17:49 -0700)]
Merge "strengthen region validation" into jb-mr1-dev
Mathias Agopian [Wed, 12 Sep 2012 22:34:57 +0000 (15:34 -0700)]
don't call hwc with non-empty layer lists for blanked displays
we now make sure to take the blanked state of a display into
account when we build its list of visible layers, this ensures
that we won't call prepare/set with a non-empty list when the
display is blanked.
Possibly fixes
7075380,
7103553,
7130187,
7016215
Bug:
7075380
Change-Id: I9fdd2e73d1b7621eaeca3d4ac2ae60d9fb1b3631
Mathias Agopian [Wed, 12 Sep 2012 01:56:23 +0000 (18:56 -0700)]
strengthen region validation
Change-Id: I75ee7bc4dd7a2f5357ac8994a23bc8b8bfb6eb44
Jamie Gennis [Wed, 12 Sep 2012 22:56:39 +0000 (15:56 -0700)]
am
e45b01f5: Merge "EGL: make max cache key size BoardConfig-able" into jb-mr1-dev
* commit '
e45b01f575e877b463ca2d2b124633c3a8997e82':
EGL: make max cache key size BoardConfig-able
Jamie Gennis [Wed, 12 Sep 2012 22:54:39 +0000 (15:54 -0700)]
Merge "EGL: make max cache key size BoardConfig-able" into jb-mr1-dev
Jesse Hall [Fri, 7 Sep 2012 18:20:56 +0000 (11:20 -0700)]
Initialize new HWC 1.2 fields
Also rename resolution* to width/height.
Change-Id: Ia5f0c50d3f0a349160f314a3257c3b985e13ef1d
Jesse Hall [Wed, 12 Sep 2012 20:49:10 +0000 (13:49 -0700)]
Fix display projection transforms
Bug:
7139798
Change-Id: I61aafe99180d85563c6880d16bc367fce80e6022
Andy McFadden [Wed, 12 Sep 2012 20:29:24 +0000 (13:29 -0700)]
am
2c7c8ba5: Merge "Fix emulator" into jb-mr1-dev
* commit '
2c7c8ba56ad9c0c08fde6f86771475f03a03e6fd':
Fix emulator
Andy McFadden [Wed, 12 Sep 2012 20:27:00 +0000 (13:27 -0700)]
Merge "Fix emulator" into jb-mr1-dev
Andy McFadden [Wed, 12 Sep 2012 20:24:04 +0000 (13:24 -0700)]
am
c2724309: Merge "Watch for SurfaceFlinger death" into jb-mr1-dev
* commit '
c272430960047de4e9b2f169fb053bd0aedce3b1':
Watch for SurfaceFlinger death
Andy McFadden [Wed, 12 Sep 2012 20:22:35 +0000 (13:22 -0700)]
Merge "Watch for SurfaceFlinger death" into jb-mr1-dev
Andy McFadden [Wed, 12 Sep 2012 20:14:51 +0000 (13:14 -0700)]
Fix emulator
Emulator has no HWC.
Change-Id: I7810b27034f6772823142e5bf877681db1c8ee49
Jamie Gennis [Wed, 12 Sep 2012 18:55:16 +0000 (11:55 -0700)]
EGL: make max cache key size BoardConfig-able
This change makes the maximum EGL blob cache key size configurable via a
BoardConfig.
Change-Id: Ic669cd25fc743662bd4f13aab62354fc3d54560c
Jamie Gennis [Wed, 12 Sep 2012 18:56:26 +0000 (11:56 -0700)]
am
a0931d65: Merge "SurfaceTexture: eglDestroySync after duping its fd" into jb-mr1-dev
* commit '
a0931d657551f5098f805fbdeeed2b060bbe6171':
SurfaceTexture: eglDestroySync after duping its fd
Jamie Gennis [Wed, 12 Sep 2012 18:54:52 +0000 (11:54 -0700)]
Merge "SurfaceTexture: eglDestroySync after duping its fd" into jb-mr1-dev
The Android Open Source Project [Wed, 12 Sep 2012 14:40:48 +0000 (07:40 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ib76f1e00f07e1ef8ce67ad3ca443edb5dcaa33d8
The Android Automerger [Wed, 12 Sep 2012 13:59:50 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Wed, 12 Sep 2012 03:54:09 +0000 (20:54 -0700)]
am
92def36f: Merge "fix typo in LayerBase::dump()" into jb-mr1-dev
* commit '
92def36f9f79973c6ca18fc66210b32e3901351d':
fix typo in LayerBase::dump()
Mathias Agopian [Wed, 12 Sep 2012 03:53:20 +0000 (20:53 -0700)]
Merge "fix typo in LayerBase::dump()" into jb-mr1-dev
Mathias Agopian [Wed, 12 Sep 2012 03:52:46 +0000 (20:52 -0700)]
fix typo in LayerBase::dump()
Change-Id: Ie4861a58baed003b7ef643931d41f6be3fbfd00c
Andy McFadden [Wed, 12 Sep 2012 00:02:51 +0000 (17:02 -0700)]
am
43601a2d: Reduce failure uncertainty
* commit '
43601a2dc320a271ff8c3765ff61414a07221635':
Reduce failure uncertainty
Andy McFadden [Tue, 11 Sep 2012 22:15:13 +0000 (15:15 -0700)]
Reduce failure uncertainty
This adds a trivial workaround for a one-shot boot time crash, plus
an explicit check and abort for a failure condition that currently
presents as a less obvious failure.
Bug:
7145521,
7147557
Change-Id: I548f6a9caa9f0bd5710aaecea0e1c6c7c8f2f281
Andy McFadden [Tue, 11 Sep 2012 17:04:55 +0000 (10:04 -0700)]
am
b0d1dd36: Reshuffle FramebufferSurface
* commit '
b0d1dd36f104c0b581674adc7f830cbf44b7db06':
Reshuffle FramebufferSurface
Andy McFadden [Mon, 10 Sep 2012 21:08:09 +0000 (14:08 -0700)]
Reshuffle FramebufferSurface
FramebufferSurface no longer speaks directly to the FB HAL. Now
everything goes through HWComposer (which may or may not be
connected to a hardware composer).
Added display index arg to some query methods.
Change-Id: Id3e157d2d4e3555d33afbb703e518b6e92e2d6d5
The Android Automerger [Tue, 11 Sep 2012 13:59:40 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
James Dong [Tue, 11 Sep 2012 00:53:43 +0000 (17:53 -0700)]
am
1fc4f80f: Add stack dump from drmserver process to bugreports
* commit '
1fc4f80fc38f782f128102795481924a97a2d3c5':
Add stack dump from drmserver process to bugreports
James Dong [Mon, 10 Sep 2012 23:08:48 +0000 (16:08 -0700)]
Add stack dump from drmserver process to bugreports
This would be helpful tracking down ANR issues in drmserver
o related-to-bug:
7132419
Change-Id: I7eceaa0c29af26bd0092110be6bddf8f4c063545
Jamie Gennis [Mon, 10 Sep 2012 21:49:42 +0000 (14:49 -0700)]
SurfaceTexture: eglDestroySync after duping its fd
This change adds a call to eglDestroySync after we've dup'd the fd for the
Android fence that the EGLSyncKHR object wraps.
Change-Id: I4fa6ece863260793630d70bb9a69d6284d05d99e
Jamie Gennis [Mon, 10 Sep 2012 20:33:19 +0000 (13:33 -0700)]
am
61e04b92: SurfaceTexture: use eglWaitSync
* commit '
61e04b92bdeafc6fca89052d14dab1bd0c384a71':
SurfaceTexture: use eglWaitSync
Jamie Gennis [Mon, 10 Sep 2012 00:48:42 +0000 (17:48 -0700)]
SurfaceTexture: use eglWaitSync
This change adds a compile-option to use eglWaitSyncANDROID to ensure that
texturing operations that access the current buffer of a SurfaceTexture do not
occur until the buffer is completely written. It also moves this
synchronization into a new SurfaceTexture method called doGLFenceWait and
changes SurfaceFlinger's Layer class to use that method rather than performing
its own wait on the fence.
Change-Id: I70afa88086ca7ff49a80e3cd03d423767db7cb88
Jamie Gennis [Mon, 10 Sep 2012 19:13:33 +0000 (12:13 -0700)]
am
010dd4fb: EGL: Add the EGL_ANDROID_wait_sync extension
* commit '
010dd4fb892aecf71e4631c22148fe57ef5b3958':
EGL: Add the EGL_ANDROID_wait_sync extension
The Android Automerger [Mon, 10 Sep 2012 13:59:29 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jamie Gennis [Mon, 10 Sep 2012 00:46:17 +0000 (17:46 -0700)]
EGL: Add the EGL_ANDROID_wait_sync extension
Change-Id: Ie9a78e07fcaf27c5c13797141ad3c692217607fb
Jamie Gennis [Sun, 9 Sep 2012 20:01:20 +0000 (13:01 -0700)]
am
605f90dc: Merge "SurfaceTexture: use EGL-created native fences" into jb-mr1-dev
* commit '
605f90dc867a18f1ea06203ffa70916f70820f92':
SurfaceTexture: use EGL-created native fences
Jamie Gennis [Sun, 9 Sep 2012 20:00:16 +0000 (13:00 -0700)]
Merge "SurfaceTexture: use EGL-created native fences" into jb-mr1-dev
Jamie Gennis [Thu, 6 Sep 2012 21:54:19 +0000 (14:54 -0700)]
SurfaceTexture: use EGL-created native fences
This change adds support for using Android fences that come from EGLSyncKHR
objects as the release fence for a buffer.
Change-Id: Ice192ce2ec001020f909a2018afdf0f17b24dec9
The Android Automerger [Sun, 9 Sep 2012 14:00:22 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jeff Brown [Sun, 9 Sep 2012 07:17:07 +0000 (00:17 -0700)]
am
4c05dd17: Ensure that viewport and frame are initialized.
* commit '
4c05dd175ee3bd5119eecf368742b6510a8cfa6c':
Ensure that viewport and frame are initialized.
Jeff Brown [Sun, 9 Sep 2012 07:07:17 +0000 (00:07 -0700)]
Ensure that viewport and frame are initialized.
onInitializeDisplays() was posting a transaction with changes
to the display projection. Unfortunately, it only set the
display orientation field and left viewport and frame
uninitialized.
The uninitialized values flowed downstream and found themselves
baked into a bogus DisplayDevice mGlobalTransform. That transform
was then applied to some Rects which were turned into Regions
that were them combined with other Regions.
Under certain situations, the uninitialized data might have
a largish value, resulting in the creation of Regions with
components in excess of the Region max-value limit of 0x7ffffff
(note that this is not INT_MAX). Later when performing a
binary operation using the Region, the Spanner would loop
indefinitely trying to figure out how to stuff a humongous
region inside of a max-value region. Not content to try
just once, the Spanner would continue trying again and
again, pegging the CPU and hanging surface flinger during boot.
Insanity soon followed.
Bug:
7130713
Change-Id: I0016f0c9662185be833474c212a1dd408096ae23
Jeff Brown [Fri, 7 Sep 2012 22:01:48 +0000 (15:01 -0700)]
am
4fb3999c: Fix display projection.
* commit '
4fb3999cea652617be5125f8a42c257467bf3c77':
Fix display projection.
Jeff Brown [Fri, 7 Sep 2012 19:55:10 +0000 (12:55 -0700)]
Fix display projection.
Change-Id: I0f253dc3759b99e05ff8344b0f513d8c289702e7
Andy McFadden [Fri, 7 Sep 2012 01:45:56 +0000 (18:45 -0700)]
Watch for SurfaceFlinger death
The ComposerService object wasn't watching for SurfaceFlinger
restarts, which doesn't usually matter because the app framework
restarts when SurfaceFlinger dies. However, mediaserver continues
to run, which means its ComposerService object was trying to use
a dead handle, and playback of DRM movies was failing.
This adds a DeathRecipient listener and some logic to re-establish
the SurfaceFlinger connection.
Bug
6645813
Change-Id: I07581b881d3835601aa57d5358c8259d93bc4515
Jamie Gennis [Fri, 7 Sep 2012 01:02:41 +0000 (18:02 -0700)]
am
b2725415: libgui: move fence handling into ConsumerBase
* commit '
b27254154642575dfb4bbfa79fbedde7d7ee23dd':
libgui: move fence handling into ConsumerBase
Jamie Gennis [Thu, 6 Sep 2012 03:09:05 +0000 (20:09 -0700)]
libgui: move fence handling into ConsumerBase
This change moves some common fence handling code into the base class for
BufferQueue consumer classes. It also makes the ConsumerBase class initialize
a buffer slot's fence with the acquire fence every time a buffer is acquired.
Change-Id: I0bd88bc269e919653b659bfb3ebfb04dd61692a0