OSDN Git Service
Andy McFadden [Fri, 11 Oct 2013 21:39:49 +0000 (21:39 +0000)]
Merge "Use black for blackout layer" into klp-dev
Andy McFadden [Fri, 11 Oct 2013 18:16:03 +0000 (11:16 -0700)]
Use black for blackout layer
SurfaceFlinger was rendering dark purple for secure content, which
showed up when we took a screen shot for the orientation change
animation. Use black instead.
Bug
11157921
Change-Id: I3895e8168891d49dc5b84eed599bcd0a303bb70a
Dave Burke [Fri, 11 Oct 2013 02:33:15 +0000 (02:33 +0000)]
Merge "Eliminate latency when resampling is disabled" into klp-dev
Aravind Akella [Fri, 11 Oct 2013 02:05:40 +0000 (02:05 +0000)]
Merge "Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection." into klp-dev
Michael Wright [Fri, 11 Oct 2013 01:54:12 +0000 (18:54 -0700)]
Eliminate latency when resampling is disabled
Since the latency was introduced to avoid egregious errors during
resampling, remove it when we aren't resampling.
Change-Id: Ia8e9a9afb1e16212fec81a8c9c661c598e1b0ebf
Jesse Hall [Thu, 10 Oct 2013 22:24:32 +0000 (22:24 +0000)]
Merge "Wake up disp sync thread when setting display period" into klp-dev
Jesse Hall [Thu, 10 Oct 2013 21:48:22 +0000 (14:48 -0700)]
Wake up disp sync thread when setting display period
Bug:
10624956
Change-Id: I272c15f319521bfbd1bb70451366c7dd84d60bf9
Aravind Akella [Tue, 8 Oct 2013 21:59:26 +0000 (14:59 -0700)]
Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection.
Change-Id: I4ef2bec80406c517903ab9782dc9eaf3fa8b7f36
Andy McFadden [Wed, 9 Oct 2013 23:38:02 +0000 (16:38 -0700)]
Fix blank / partial screenshots
The screen capture code wasn't waiting for the render to finish,
so sometimes you'd see an empty or partial image.
Bug
11131777
Change-Id: Ic64087322ce3bb15bb5f4fb1eb07579880fe6197
Ed Heyl [Tue, 8 Oct 2013 22:40:38 +0000 (15:40 -0700)]
merge in KQS81M
Jamie Gennis [Tue, 30 Jul 2013 22:10:32 +0000 (15:10 -0700)]
SurfaceFlinger: SW-based vsync events
This change adds the DispSync class, which models the hardware vsync event
times to allow vsync event callbacks to be done at an arbitrary phase offset
from the hardware vsync. This can be used to reduce the minimum latency from
Choreographer wake-up to on-screen image presentation.
Bug:
10624956
Change-Id: I8c7a54ceacaa4d709726ed97b0dcae4093a7bdcf
Alex Ray [Thu, 3 Oct 2013 20:09:37 +0000 (13:09 -0700)]
Add feature android.hardware.consumerir xml file
Bug:
10676690
Change-Id: I2cc62b9c97a71588c43ff96ca38d470976bde9b0
Marco Nelissen [Thu, 3 Oct 2013 16:34:51 +0000 (16:34 +0000)]
Merge "Allow blaming a single uid for work done" into klp-dev
Lajos Molnar [Thu, 3 Oct 2013 16:10:25 +0000 (16:10 +0000)]
Merge "media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams" into klp-dev
Marco Nelissen [Wed, 2 Oct 2013 19:42:20 +0000 (12:42 -0700)]
Allow blaming a single uid for work done
This lets audioflinger assign blame for wakelocks to a single uid.
Currently this is only used for recording wakelocks.
b/
10985160
Change-Id: Idc9adb22c29030010ac690d4cb95e7e7ea6b91e6
Jamie Gennis [Thu, 26 Sep 2013 00:21:56 +0000 (17:21 -0700)]
BufferQueue: fix a test crash
Bug:
10935880
Change-Id: If76e9fb055103bad0db7e6c16487532671573149
Jamie Gennis [Wed, 2 Oct 2013 17:36:48 +0000 (17:36 +0000)]
Merge "GLConsumer: start using EGL_ANDROID_image_crop" into klp-dev
Dave Burke [Wed, 2 Oct 2013 17:36:40 +0000 (17:36 +0000)]
Merge "only clear FB when asked for the opaque layer" into klp-dev
Jamie Gennis [Tue, 24 Sep 2013 00:22:10 +0000 (17:22 -0700)]
GLConsumer: start using EGL_ANDROID_image_crop
This change makes GLConsumer use the EGL_ANDROID_image_crop extension when
available on a device. The crop rectangle is passed to the EGL driver when
creating EGLImages, allowing the crop to be performed by the driver rather than
using the texture transform matrix.
Bug:
10897141
Change-Id: I63e9a5d5c85067376abc420e3639154468346311
Jesse Hall [Wed, 2 Oct 2013 14:54:03 +0000 (14:54 +0000)]
Merge "Treat composition frames with no layers as using GLES composition" into klp-dev
Jesse Hall [Wed, 2 Oct 2013 00:25:20 +0000 (17:25 -0700)]
Set the outbuf acquire fence after we actually have it.
In GLES-only mode, we don't have the outbuf acquire fence until after
GLES composition is done for the frame. We were setting the fence in
HWC's state immediately after dequeueing the buffer from the consumer,
before GLES had started. This fence got passed through HWC and on to
the consumer, so the consumer was reading the buffer before GLES was
done writing to it.
Now we update HWC's state just before set(), when we know we have the
right fence.
Bug:
11000763
Change-Id: Iea9db4c69634c352dc2d600f0bdb6bef2a432636
Mathias Agopian [Tue, 1 Oct 2013 22:36:52 +0000 (15:36 -0700)]
only clear FB when asked for the opaque layer
a layer need to be considered NOT opaque if it has a
plane-alpha.
Bug:
10846930
Change-Id: Ibd8981b63ede4560c7096bacc4cff46a7eb2a8bb
Jesse Hall [Mon, 30 Sep 2013 23:49:30 +0000 (16:49 -0700)]
Treat composition frames with no layers as using GLES composition
When there are no window layers for a display, SurfaceFlinger clears
the undefined region using GLES. Some of the places that check for
GLES composition weren't considering this special case, in particular:
- We were skipping the eglSwapBuffers() on these frames.
- We were putting VirtualDisplaySurface in HWC-only composition mode.
This change centralizes the logic for this special case.
Bug:
10957068
Change-Id: I2deaf2ed101e8ea76708862a6bb67751b6078794
Jesse Hall [Sat, 28 Sep 2013 05:10:47 +0000 (22:10 -0700)]
Fix two EGLConfig selection bugs
This fixes two bugs introduced by
Change-Id: Ia8cc084c02a0e3de910def024da8a08d02bbd89d
(a) There is no invalid EGLConfig value, in particular zero is valid.
Checking return values of eglGetConfigs and eglChooseConfig is the
only way to determine success.
(b) The "simple" EGLConfig query used as the emulator fallback should
not include EGL_RECORDABLE; the emulator doesn't have it.
Bug:
10935622
Change-Id: Ib798a24e7cf06a679811c46eaa45d39174a715ec
Mathias Agopian [Thu, 26 Sep 2013 19:41:22 +0000 (19:41 +0000)]
Merge "fix initialization of framebuffer target crop rect on hwc 1.3" into klp-dev
Mathias Agopian [Thu, 26 Sep 2013 03:44:34 +0000 (20:44 -0700)]
fix initialization of framebuffer target crop rect on hwc 1.3
Bug:
10936771
Change-Id: If283e5e231ca34b93e0b1784bb4e8e4c7bfd75de
Mathias Agopian [Thu, 26 Sep 2013 03:40:07 +0000 (20:40 -0700)]
fix crashers with wifi/virtual displays
Bug:
10647742
Change-Id: I4b8ed9da52ef95af3a3b3a04b98514a3776a674d
Eino-Ville Talvala [Thu, 19 Sep 2013 20:36:07 +0000 (13:36 -0700)]
GLConsumer: Add query for current frame number.
Surface the underlying frame number of the current texture.
Bug:
10830400
Change-Id: Ide3a7da12ea0aac54588beb6bf00dbfe2cd37653
Mathias Agopian [Fri, 20 Sep 2013 00:08:37 +0000 (17:08 -0700)]
reinstate black-screenshot debugging code
turned off by default.
Bug:
10809349
Change-Id: I3e6b8c7860e6b0e122b8f07de4020967cd1f005c
Mathias Agopian [Thu, 19 Sep 2013 22:29:30 +0000 (22:29 +0000)]
Merge "Fix GLES context version selection" into klp-dev
Eino-Ville Talvala [Thu, 19 Sep 2013 20:36:07 +0000 (13:36 -0700)]
GLConsumer: Add query for current frame number.
Surface the underlying frame number of the current texture.
Bug:
10830400
Change-Id: Ide3a7da12ea0aac54588beb6bf00dbfe2cd37653
The Android Automerger [Thu, 19 Sep 2013 13:01:50 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Mathias Agopian [Wed, 18 Sep 2013 23:20:26 +0000 (16:20 -0700)]
Fix GLES context version selection
Explicitly selects an ES 2.0 config first, then an ES 1.x config,
before attempting the fallback path for the emulator.
Bug:
10820214
Change-Id: Ia8cc084c02a0e3de910def024da8a08d02bbd89d
Mathias Agopian [Wed, 18 Sep 2013 06:45:22 +0000 (23:45 -0700)]
fix camera API 2.0 orientation
we add a flag to ANativeWindow::setBufferTransform that means
"apply the inverse rotation of the display this buffer is displayed
onto to".
Bug:
10804238
Change-Id: Id2447676271950463e8dbcef1b95935c5c3f32b2
The Android Automerger [Wed, 18 Sep 2013 04:11:23 +0000 (21:11 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 18 Sep 2013 00:39:56 +0000 (17:39 -0700)]
merge in klp-release history after reset to klp-dev
Mathias Agopian [Tue, 17 Sep 2013 22:55:18 +0000 (15:55 -0700)]
Fix build (tests)
Change-Id: I5b233ef448e5e7eec3818c6586dfea138b28f7b6
Mathias Agopian [Tue, 17 Sep 2013 21:31:13 +0000 (21:31 +0000)]
Merge "Make sure do disconnect from a BQ when its client dies." into klp-dev
Aravind Akella [Tue, 17 Sep 2013 18:17:50 +0000 (18:17 +0000)]
Merge "Fix for AOSP fusion sensors not handling multiple clients correctly." into klp-dev
Aravind Akella [Tue, 17 Sep 2013 17:49:26 +0000 (17:49 +0000)]
Merge "Sensor Batching Bug fixes." into klp-dev
Amith Yamasani [Tue, 17 Sep 2013 15:56:23 +0000 (15:56 +0000)]
Merge "Enable FEATURE_DEVICE_ADMIN for handheld devices" into klp-dev
The Android Automerger [Tue, 17 Sep 2013 13:01:01 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Jesse Hall [Tue, 17 Sep 2013 03:27:15 +0000 (03:27 +0000)]
Merge "Stop using default value for Surface producerControlledByApp parameter" into klp-dev
Mathias Agopian [Thu, 12 Sep 2013 02:35:45 +0000 (19:35 -0700)]
Make sure do disconnect from a BQ when its client dies.
Bug:
5679534
Change-Id: If447e8673df83fe0b1d6210641e0a48522501a53
Aravind Akella [Mon, 16 Sep 2013 22:37:41 +0000 (15:37 -0700)]
Fix for AOSP fusion sensors not handling multiple clients correctly.
Bug:
10786801
Change-Id: I7b938bc583a303a30237c3d93b5accbf64cc90b5
Jesse Hall [Mon, 16 Sep 2013 22:24:53 +0000 (15:24 -0700)]
Stop using default value for Surface producerControlledByApp parameter
Bug:
10785749
Change-Id: Ifbf9340e5eabe621a69e990ec3e05ac51f8db66a
Aravind Akella [Fri, 6 Sep 2013 00:03:38 +0000 (17:03 -0700)]
Sensor Batching Bug fixes.
i) SensorService dropping events. Increase SOCKET_BUFFER_SIZE in BitTube ctor.
ii) Call flush before every activate.
iii) Emulate flush for older devices. Add a trivial flush complete event when flush is called.
Bug:
10641596
Change-Id: I30d0f3948e830457143f16e157b6ad81908687ce
Jesse Hall [Sun, 15 Sep 2013 04:00:14 +0000 (21:00 -0700)]
Disable the egl_khr_gl_colorspace extension
Bug:
10777398
Change-Id: Ib50ea8b9d5d960537701b85929d6312304993a0f
Amith Yamasani [Mon, 16 Sep 2013 17:48:35 +0000 (10:48 -0700)]
Enable FEATURE_DEVICE_ADMIN for handheld devices
Bug:
9520957
Change-Id: I9c09dc726509db9e6d9ba4700255c74528b9f9fa
The Android Automerger [Thu, 12 Sep 2013 13:01:32 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Mathias Agopian [Tue, 10 Sep 2013 06:36:25 +0000 (23:36 -0700)]
fix a few problems with BitTube
BitTube used to send objects one at a time and didn't
handle errors properly.
We now send all the objects in one call, which means they
have to be read as a single batch as well. This changes the
BitTube API.
Update SensorService to the new API.
Also added an API to set the size of the send buffer.
Bug:
10641596
Change-Id: I77c70d35e351fdba0416fae4b7ca3b1d56272251
The Android Automerger [Mon, 9 Sep 2013 13:01:45 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Mathias Agopian [Fri, 6 Sep 2013 20:36:49 +0000 (13:36 -0700)]
fix a possible null dereference when eglMakeCurrent() fails
Bug:
10648797
Change-Id: Iee0be47f2646feb25de4ea199bbb9b707452916e
Mathias Agopian [Fri, 6 Sep 2013 02:09:42 +0000 (02:09 +0000)]
Merge "color blindness enhancement" into klp-dev
The Android Automerger [Thu, 5 Sep 2013 13:01:25 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Mathias Agopian [Mon, 2 Sep 2013 04:36:12 +0000 (21:36 -0700)]
color blindness enhancement
This is an attempt at improving the experience of
users with color vision impairement.
At this time this feature can only be enabled for
debugging:
adb shell service call SurfaceFlinger 1014 i32 PARAM
with PARAM:
0 : disabled
1 : protanomaly/protanopia simulation
2 : deuteranomaly/deuteranopia simulation
3 : tritanopia/tritanomaly simulation
11, 12, 13: same as above w/ attempted correction/enhancement
The enhancement algorithm tries to spread the "error"
such that tones that would otherwise appear similar can be
distinguished.
Bug:
9465644
Change-Id: I860f7eed0cb81f54ef9cf24ad78155b6395ade48
Dianne Hackborn [Thu, 5 Sep 2013 01:04:14 +0000 (18:04 -0700)]
Fix issue #
10422349: Limit/change the battery history data in batterystats
Use new compact option to include history when dumping battery stats.
Change-Id: I3833a88db76d8791bd5c2e8f6ff414af65472a42
Chong Zhang [Wed, 4 Sep 2013 22:07:46 +0000 (22:07 +0000)]
Merge "HDCP: add enums for HDCP module capabilities" into klp-dev
Chong Zhang [Tue, 3 Sep 2013 21:17:58 +0000 (14:17 -0700)]
HDCP: add enums for HDCP module capabilities
This change adds the enums for HDCP caps. An interface getCaps()
will be added later for querying whether HDCP module supports
encryption from a native buffer output from the encoder.
Bug:
10609422
Change-Id: Ib7fa14e7f4de1da90b46eaa174a7a05ec9dacbdc
The Android Automerger [Wed, 4 Sep 2013 13:01:18 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Aravind Akella [Wed, 4 Sep 2013 00:41:41 +0000 (00:41 +0000)]
Merge "Sensor batching. Changes to the native code." into klp-dev
Aravind Akella [Thu, 27 Jun 2013 19:04:23 +0000 (12:04 -0700)]
Sensor batching. Changes to the native code.
Bug:
10109508
Change-Id: I7333f3aac76125a8226a4c99c901fb904588df04
Mathias Agopian [Mon, 2 Sep 2013 04:35:36 +0000 (21:35 -0700)]
improve mat44 implementation
this will make it easier to create matrices of different sizes
Change-Id: I2c1771ba0823c42d737762e2dfc2cd47eb302767
The Android Automerger [Mon, 2 Sep 2013 13:01:13 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Mathias Agopian [Sat, 31 Aug 2013 01:30:10 +0000 (01:30 +0000)]
Merge changes I8283a989,I64add89a into klp-dev
* changes:
switch to use mat4
vector and matrix classes for graphics use
Jesse Hall [Fri, 30 Aug 2013 21:14:55 +0000 (21:14 +0000)]
Merge "Force async behavior for the virtual display output BufferQueue" into klp-dev
Jesse Hall [Thu, 29 Aug 2013 23:03:50 +0000 (16:03 -0700)]
Force async behavior for the virtual display output BufferQueue
Bug:
10551087
Change-Id: I40bbb2b87d64420939a0ea309254f281437dab56
The Android Automerger [Thu, 29 Aug 2013 13:01:02 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Mathias Agopian [Thu, 29 Aug 2013 01:13:56 +0000 (18:13 -0700)]
minor clean-up of the GLESRenderer
Change-Id: I978dea25b7687fbbbb283f09c24e115d9bad49a2
Mathias Agopian [Thu, 29 Aug 2013 01:11:46 +0000 (18:11 -0700)]
reset the gl viewport at each frame for each display
Bug:
10097128,
9506003
Change-Id: Ie0403a631e339a9134216224f3366f46ece58b53
Mathias Agopian [Wed, 28 Aug 2013 22:27:30 +0000 (15:27 -0700)]
remove adreno 130 workaround support
Change-Id: I8ea5ee65d405114b30cfaa44e1a0c971d1ef2a61
Mathias Agopian [Wed, 28 Aug 2013 22:22:29 +0000 (15:22 -0700)]
try to keep omap4 alive
Bug:
10527646
Change-Id: Iec572a910e932115cf4f2e1215142b10cd91bd6f
Mathias Agopian [Tue, 27 Aug 2013 03:42:07 +0000 (20:42 -0700)]
switch to use mat4
Change-Id: I8283a989cfd2b74d53958150bc90298bc083fee7
Mathias Agopian [Thu, 22 Aug 2013 06:10:41 +0000 (23:10 -0700)]
vector and matrix classes for graphics use
- this implements vec2, vec3, vec4, which are float vectors
of size 2, 3 and 4 respectively.
the code allows easy instantiation of vectors of a different
type via the tvec{2|3|4}<T> template classes.
- this also implements mat4 which is a float 4x4 matrix. the
tmat44<T> template class allows easy instantiation of a
4x4 matrix of a different value_type.
The vector types have some minimal support for the
glsl style swizzled access; for instance:
vec4 u;
vec3 v = u.xyz;
only .x, .xy, .xyz and their .stpq / .rgba equivalent are
supported.
most operators are supported on both vector and matrices:
arithmetic, unary, compound assignment and comparison
(bit-wise operators NOT supported).
- operations available on vectors include:
dot, length, distance, normalize and cross
- operations available on matrices include:
transpose, inverse, trace
- and a few utilities to create matrices:
ortho, frustum, lookAt
Change-Id: I64add89ae90fa78d3f2f59985b63495575378635
The Android Automerger [Mon, 26 Aug 2013 13:01:12 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Mathias Agopian [Sat, 24 Aug 2013 00:12:41 +0000 (00:12 +0000)]
Merge changes I34935d21,If423cd29 into klp-dev
* changes:
handle several vsync signal correctly
only use format compatible with CPU consumers
Mathias Agopian [Sat, 24 Aug 2013 00:12:05 +0000 (00:12 +0000)]
Merge "make sure SF initialization is ran at target priority and correct thread group" into klp-dev
Mathias Agopian [Fri, 23 Aug 2013 22:56:38 +0000 (15:56 -0700)]
make sure SF initialization is ran at target priority and correct thread group
SF can spawn threads (indirectly) during initialization
and we want those to be spawned at URGENT_DISPLAY_PRIORITY
(in theory they should set their own, but some code lives
in vendor libraries and doesn't).
Bug:
10430209
Change-Id: I5b3a8f979297de287614c8eafd8267bef1176e4b
Mathias Agopian [Fri, 23 Aug 2013 23:12:34 +0000 (16:12 -0700)]
fix DimLayer in GLES2.0 SF
DimLayer state wasn't initialized properly.
Bug:
10442967
Change-Id: I384c1d85c58c96ae29d5daa1fabee9f4ce003501
Jeff Brown [Fri, 23 Aug 2013 01:34:33 +0000 (18:34 -0700)]
Remove input flinger stubs. (DO NOT MERGE)
Bug:
10446930
Change-Id: I4dd46f539cd2a2e324dfc83b45ba2787f7404a4a
Jeff Tinker [Thu, 22 Aug 2013 23:08:09 +0000 (23:08 +0000)]
Merge "Add ability to test supported content types to MediaDrm" into klp-dev
Eino-Ville Talvala [Thu, 22 Aug 2013 19:23:27 +0000 (19:23 +0000)]
Merge "Surface: Fix controlledByApp parameter" into klp-dev
The Android Automerger [Thu, 22 Aug 2013 13:01:19 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Mathias Agopian [Thu, 22 Aug 2013 00:45:46 +0000 (17:45 -0700)]
handle several vsync signal correctly
Change-Id: I34935d2197ce8e914fef2f110896e47b44225ad2
Mathias Agopian [Wed, 21 Aug 2013 23:36:34 +0000 (16:36 -0700)]
only use format compatible with CPU consumers
EGL now picks the buffer format out of a small set
of formats compatible with CPU consumers instead of
using the EGL_NATIVE_VISUAL_ID.
Bug:
10194508
Change-Id: If423cd29601b7a3ace8670f4c73004132cfc4b31
Jeff Tinker [Wed, 21 Aug 2013 18:57:40 +0000 (11:57 -0700)]
Add ability to test supported content types to MediaDrm
bug:
10244066
Change-Id: I6666d0dbfdc6e791deb9a82c918255af4fa19816
Mathias Agopian [Wed, 21 Aug 2013 22:23:15 +0000 (15:23 -0700)]
screenshot layers wouldn't work in some cases
specifically when the display size and the screenshot window
size didn't match, the buffer would be rejected.
We simply fix this by setting the scalling mode to
"SCALE_TO_WINDOW".
Bug:
9992306
Change-Id: Ib821767899af330bb70d3cbbfa7d41b02794a075
Dmitry Shmidt [Wed, 21 Aug 2013 19:35:25 +0000 (19:35 +0000)]
Merge "dumpstate: Fix wifi list of networks dump" into klp-dev
Eino-Ville Talvala [Wed, 21 Aug 2013 18:53:37 +0000 (11:53 -0700)]
Surface: Fix controlledByApp parameter
Bug:
10425641
Change-Id: I1a47e2ce4ecbdb8e67030a5d9ddf6604c5e2497d
Mathias Agopian [Wed, 21 Aug 2013 18:55:19 +0000 (18:55 +0000)]
Merge "Fix a bug where non-cropped layer could be scaled incorrectly" into klp-dev
Dmitry Shmidt [Wed, 21 Aug 2013 17:58:29 +0000 (10:58 -0700)]
dumpstate: Fix wifi list of networks dump
Bug:
9056601
Change-Id: Ia0adb67afdf3d478033d0ee34bbb95e621e2fe51
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Jesse Hall [Wed, 21 Aug 2013 14:38:51 +0000 (14:38 +0000)]
Merge "Provide HWC prepare with a valid output buffer" into klp-dev
Jesse Hall [Wed, 21 Aug 2013 14:37:50 +0000 (14:37 +0000)]
Merge "Fix HWComposer dumping of float source crops" into klp-dev
Andy McFadden [Wed, 21 Aug 2013 14:31:34 +0000 (14:31 +0000)]
Merge "Fix virtual displays for HWC 1.0" into klp-dev
The Android Automerger [Wed, 21 Aug 2013 13:02:26 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev
Mathias Agopian [Wed, 21 Aug 2013 04:41:07 +0000 (21:41 -0700)]
Fix a bug where non-cropped layer could be scaled incorrectly
If a layer is not cropped but its bounds are outside of the
viewport (i.e.: clipped), the crop rectangle passed to
hw composer would be invalid because it started invalid
in the first place (to indicate "no crop").
Bug:
10410944
Change-Id: I4ae4d49a1adef0be7fa4304ecf84b1a5b7d03fe0
Jesse Hall [Tue, 20 Aug 2013 23:35:32 +0000 (16:35 -0700)]
Provide HWC prepare with a valid output buffer
We weren't dequeing and setting the output buffer until just before
set(). This didn't allow HWC to make decisions in prepare() based on
the output buffer format, dimensions, etc.
Now we dequeue the output buffer at the beginning of the composition
loop and provide it to HWC in prepare. In GLES-only rendering, we may
have to cancel the buffer and acquire a new one if GLES requests a
buffer with properties different than the one we already dequeued.
Bug:
10365313
Change-Id: I96b4b0a851920e4334ef05080d58097d46467ab8
Jesse Hall [Tue, 20 Aug 2013 23:11:50 +0000 (16:11 -0700)]
Fix HWComposer dumping of float source crops
Change-Id: I45a9344b5fab17ccb54bebd01382d738a03860e6
Andy McFadden [Tue, 20 Aug 2013 23:04:47 +0000 (16:04 -0700)]
Fix virtual displays for HWC 1.0
We weren't swapping the buffers.
Bug
10366404
Change-Id: I43eb7648231bedf24899da6fc0d9acc09e0b047e
Mathias Agopian [Tue, 20 Aug 2013 00:26:18 +0000 (17:26 -0700)]
SurfaceFlinger now runs in the process's main thread
it used to spawn its own thread and return the main thread
to the binder thread pool -- this was confusing the naming
of things in the kernel.
Bug:
10331839
Change-Id: I2d13a6d73409a38109300fcbe6a04b4c41cb5d00