OSDN Git Service
Dan Stoza [Mon, 1 Jun 2015 18:31:20 +0000 (18:31 +0000)]
am
75145aa2: Merge "SF: Reduce resync samples without present"
* commit '
75145aa2b77c348bce43c432c17b70f6dcb31c91':
SF: Reduce resync samples without present
Dan Stoza [Mon, 1 Jun 2015 18:31:19 +0000 (18:31 +0000)]
am
edcfe7c5: Merge "libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc"
* commit '
edcfe7c513a111890b7bd245cf10fa105e910277':
libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc
Dan Stoza [Mon, 1 Jun 2015 18:31:17 +0000 (18:31 +0000)]
am
c76683f5: Merge "Check that width and height parameters are small."
* commit '
c76683f51f6ad1f5493d9af43bf868601f474060':
Check that width and height parameters are small.
Dan Stoza [Mon, 1 Jun 2015 18:27:35 +0000 (18:27 +0000)]
Merge "SF: Reduce resync samples without present"
Dan Stoza [Fri, 29 May 2015 20:00:23 +0000 (13:00 -0700)]
SF: Reduce resync samples without present
Reduces the number of resync samples that DispSync will attempt to
collect without an intervening present from 12 to 4. The former value
was causing excessive power draw for some vendors' implementations, and
reducing it doesn't seem to harm anything.
Bug:
20724456
Change-Id: Ifd6e0490be67756ed001d509a38e8a36953b4618
(cherry picked from commit
9c64757f6530a0510f15f8bd75b1925a3001f83a)
Dan Stoza [Mon, 1 Jun 2015 18:25:50 +0000 (18:25 +0000)]
Merge "libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc"
Dan Stoza [Fri, 29 May 2015 19:48:04 +0000 (12:48 -0700)]
libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc
Applies GRALLOC_USAGE_ALLOC_MASK to the incoming usage bits before
calling alloc on the gralloc module. This filters out the new flag
GRALLOC_USAGE_FOREIGN_BUFFERS, which is used to send a hint to the
producer, but which does not affect the allocation of buffers.
Bug:
19801661
Change-Id: Ia37a3eddba2e97598e50ac3e10877430adfa9247
(cherry picked from commit
b8efdc40039e4900ae2c64fbdfa03906c867ec84)
Dan Stoza [Mon, 1 Jun 2015 18:18:42 +0000 (18:18 +0000)]
Merge "Check that width and height parameters are small."
Michael Lentine [Fri, 29 May 2015 00:43:06 +0000 (17:43 -0700)]
Check that width and height parameters are small.
The product of width and height should be less than UINT32_MAX (in practice
smaller). Adding the checks prevents overflows when allocating buffers.
Bug:
20726612
Change-Id: I9769edf0688a9bfe69906d49fa0540cadf4c49b0
(cherry picked from commit
1c4537e2e80aa776a61517be8b1605e36432287a)
Dan Stoza [Thu, 28 May 2015 21:40:29 +0000 (21:40 +0000)]
am
a8702c47: Merge "SurfaceFlinger: Tweak whitespace in DdmConnection"
* commit '
a8702c4765993f31a70243e4f89c251fe9911cde':
SurfaceFlinger: Tweak whitespace in DdmConnection
Dan Stoza [Thu, 28 May 2015 21:40:28 +0000 (21:40 +0000)]
am
5566d9db: Merge "Bypass surface flinger permission check for calls from system."
* commit '
5566d9db26e656a53ee9a5e87c0af997bb1a10d5':
Bypass surface flinger permission check for calls from system.
Dan Stoza [Thu, 28 May 2015 21:40:27 +0000 (21:40 +0000)]
am
13c04c27: Merge "surfaceflinger: Fix range check for getFormat"
* commit '
13c04c27622c7be474e9368211795bcec052dedb':
surfaceflinger: Fix range check for getFormat
Dan Stoza [Thu, 28 May 2015 21:25:10 +0000 (21:25 +0000)]
Merge "SurfaceFlinger: Tweak whitespace in DdmConnection"
Dan Stoza [Thu, 28 May 2015 21:23:54 +0000 (14:23 -0700)]
SurfaceFlinger: Tweak whitespace in DdmConnection
Change-Id: I99e7b09e4bc3611ffb790eddfbb9b3c8b9bc5d4c
Dan Stoza [Thu, 28 May 2015 21:21:27 +0000 (21:21 +0000)]
Merge "Bypass surface flinger permission check for calls from system."
Dan Stoza [Thu, 28 May 2015 21:20:59 +0000 (21:20 +0000)]
Merge "surfaceflinger: Fix range check for getFormat"
Dan Stoza [Thu, 28 May 2015 21:20:55 +0000 (21:20 +0000)]
am
20f7a6f0: Merge "Modify EGL to disconnect the window when the surface gets destroyed."
* commit '
20f7a6f004511486a2130030a4694ec2d2983c96':
Modify EGL to disconnect the window when the surface gets destroyed.
Jeff Brown [Sat, 11 Apr 2015 03:20:13 +0000 (20:20 -0700)]
Bypass surface flinger permission check for calls from system.
Early during the boot, before activity manager is ready to handle
permission checks, the system needs to be able to change the display
state. Added a hardcoded exemption for AID_SYSTEM (which already
has permission to talk to surface flinger anyhow).
Bug:
19029490
Change-Id: I6222edcab8e394e5fb6adf7a982be446e4505a1e
(cherry picked from commit
3bfe51d7901e99e7f122f76ed2708e2b67b71cf9)
Ajay Dudani [Sun, 3 May 2015 18:44:55 +0000 (11:44 -0700)]
surfaceflinger: Fix range check for getFormat
Fix potential buffer overflow error in getFormat with indices
greater than MAX_HWC_DISPLAYS.
Change-Id: I5e5b69d8d043e900f5e33ca9a62e94ae5f857b68
(cherry picked from commit
4e3e30c2d5a2a6f7dc4ee8696b1ac2a52dffd5dc)
Dan Stoza [Thu, 28 May 2015 21:10:35 +0000 (21:10 +0000)]
Merge "Modify EGL to disconnect the window when the surface gets destroyed."
Michael Lentine [Wed, 23 Jul 2014 17:19:41 +0000 (10:19 -0700)]
Modify EGL to disconnect the window when the surface gets destroyed.
Bug:
14445579
Change-Id: I1d263ff6cffcb6e448761fca7ca4b06466ad65aa
(cherry picked from commit
00699fa64197cc72a160d69e1f0003cdd43dc136)
Dan Stoza [Thu, 28 May 2015 21:08:24 +0000 (21:08 +0000)]
am
c2bdfb86: Merge "SF: Skip render-to-texture for color transforms"
* commit '
c2bdfb869427f840c37a977ca91c87ca75b89b0f':
SF: Skip render-to-texture for color transforms
Dan Stoza [Thu, 28 May 2015 21:08:23 +0000 (21:08 +0000)]
am
0af1e0fe: Merge "Add hotplug support for primary display."
* commit '
0af1e0feb6c3c693707fe5b970518713d0149741':
Add hotplug support for primary display.
Dan Stoza [Thu, 28 May 2015 21:08:20 +0000 (21:08 +0000)]
am
35283482: Merge "libgui: Fix surface damage on rotated buffers"
* commit '
35283482d0d82f7d264b77941aabe41dacfe3155':
libgui: Fix surface damage on rotated buffers
Dan Stoza [Thu, 28 May 2015 21:08:17 +0000 (21:08 +0000)]
am
0a70ed99: Merge "Fix surfaceflinger tests."
* commit '
0a70ed998cad67bf1c82e82d4229291c9dcc22ac':
Fix surfaceflinger tests.
Dan Stoza [Thu, 28 May 2015 21:08:15 +0000 (21:08 +0000)]
am
4ebb44e8: Merge "Fix libgui tests."
* commit '
4ebb44e8cc42231bc9c4588ec3432eae9770483a':
Fix libgui tests.
Dan Stoza [Thu, 28 May 2015 21:02:22 +0000 (21:02 +0000)]
Merge "SF: Skip render-to-texture for color transforms"
Dan Stoza [Thu, 28 May 2015 20:59:43 +0000 (20:59 +0000)]
Merge "Add hotplug support for primary display."
Dan Stoza [Thu, 28 May 2015 20:57:47 +0000 (20:57 +0000)]
Merge "libgui: Fix surface damage on rotated buffers"
Dan Stoza [Thu, 28 May 2015 20:55:43 +0000 (20:55 +0000)]
Merge "Fix surfaceflinger tests."
Dan Stoza [Thu, 28 May 2015 20:55:20 +0000 (20:55 +0000)]
am
10cb68fb: Merge "fix BufferItem flatten/unflatten alignment"
* commit '
10cb68fb971c899d7d1eb6c131ecf59761af6ddf':
fix BufferItem flatten/unflatten alignment
Dan Stoza [Thu, 28 May 2015 20:55:19 +0000 (20:55 +0000)]
am
1bdeb9d8: Merge "Refactor ConsumerBase and it\'s derived classes."
* commit '
1bdeb9d84f4c63a0fb6be2517aebe5de88a3bb45':
Refactor ConsumerBase and it's derived classes.
Jesse Hall [Thu, 28 May 2015 20:55:18 +0000 (20:55 +0000)]
am
5a606c3a: Merge "Fix EGL shim extension injection for GL ES 3 drivers."
* commit '
5a606c3ab9ead418709c0f63940b60347d11e925':
Fix EGL shim extension injection for GL ES 3 drivers.
Dan Stoza [Thu, 28 May 2015 20:55:17 +0000 (20:55 +0000)]
am
d19ad6fb: Merge "Add ConsumerBase::isAbandoned"
* commit '
d19ad6fb676f6934bf9208a47d33738234570145':
Add ConsumerBase::isAbandoned
Dan Stoza [Thu, 28 May 2015 20:54:05 +0000 (20:54 +0000)]
Merge "Fix libgui tests."
Dan Stoza [Thu, 28 May 2015 20:51:55 +0000 (20:51 +0000)]
Merge "fix BufferItem flatten/unflatten alignment"
Dan Stoza [Thu, 28 May 2015 20:48:47 +0000 (20:48 +0000)]
Merge "Refactor ConsumerBase and it's derived classes."
Jesse Hall [Thu, 28 May 2015 20:46:44 +0000 (20:46 +0000)]
Merge "Fix EGL shim extension injection for GL ES 3 drivers."
Dan Stoza [Thu, 28 May 2015 20:39:59 +0000 (20:39 +0000)]
Merge "Add ConsumerBase::isAbandoned"
Dan Stoza [Mon, 20 Oct 2014 22:46:09 +0000 (15:46 -0700)]
SF: Skip render-to-texture for color transforms
In cases where SurfaceFlinger is applying a color matrix (usually for
accessibility features), we previously would perform a render-to-
texture for the initial composition, and then apply the matrix during
a copy to the framebuffer. This changes that behavior to just apply the
matrix during composition without a render-to-texture pass.
This may result in a perceived change of the image in cases with alpha
blending, since the blending is performed at a different stage of the
pipeline and the system effectively performs non-linear blends.
However, neither this nor the prior render-to-texture pass is strictly
correct in that regard, and this approach is less error-prone and
likely faster.
Change-Id: I2110ff0374f61d76df7b087dde8a1ed98990440c
(cherry picked from commit
f008799d3753e52c10849824ff8146985ea66284)
Michael Lentine [Wed, 13 May 2015 01:04:26 +0000 (18:04 -0700)]
Add hotplug support for primary display.
When the primary is connected/disconnected on tv devices HWComposer updates
it's display parameters but doesn't destroy or recreate the display.
Bug:
18698244
Change-Id: I759c8f75d3e3a7462b85eb51973fb5072b71a702
(cherry picked from commit
10613dc3b565e95d3d5f459ec70fd2f6a77f807a)
Dan Stoza [Tue, 26 May 2015 20:22:27 +0000 (13:22 -0700)]
libgui: Fix surface damage on rotated buffers
Flips the width and height when the buffer comes in with a 90 degree
rotation so that performing the Y-flip from GL works correctly.
Bug:
20761426
Change-Id: I41c9edc8549c6cbdb534277b996ff20c59034582
(cherry picked from commit
0e65e6c283c96d514c5ecefbb46a976939cfa64a)
Michael Lentine [Thu, 21 May 2015 20:48:24 +0000 (13:48 -0700)]
Fix surfaceflinger tests.
Update the screenshot code and add correct return values to surface flinger's
capturescreenshot function.
Buf:
18138368
Change-Id: Ieb42d289088589f941502fbd69da7aa939265e07
(cherry picked from commit
5a16a62950de06d48769e29f0c68a154ed7a7a89)
Michael Lentine [Tue, 19 May 2015 22:23:43 +0000 (15:23 -0700)]
Fix libgui tests.
Update IGraphicsBufferProducerTest to the new maximum enum value which is now
NATIVE_WINDOW_BUFFER_AGE. Update SurfaceTextureGLToGL_test to use the correct
counts for GraphicsBuffer refs.
Buf:
18138368
Change-Id: Ie2f7e00b414d63100b16944e3ab36b1ffceecd57
(cherry picked from commit
d8ead0ccd4b700e43a78efe9b140d4a069dc343d)
Chong Zhang [Fri, 22 May 2015 17:54:25 +0000 (10:54 -0700)]
fix BufferItem flatten/unflatten alignment
bug:
21370100
Change-Id: Ia3991dc591c176bdbd1d78d1804aa22777525b62
(cherry picked from commit
47f674dfeca31b29810ecb90f1277918b67c4cf8)
Michael Lentine [Mon, 18 May 2015 20:41:23 +0000 (13:41 -0700)]
Refactor ConsumerBase and it's derived classes.
Move setDefaultBufferSize, setDefaultBufferFormat, and
setDefaultBufferDataSpace into ConsumerBase and remove them from
CpuConsumer and BufferItemConsumer.
Bug:
19977701
Change-Id: Ic68992464c5da6da7a41c4063a53029a69efcd1b
(cherry picked from commit
847f11e215e86b107ab50c1359fc7bc3cd7a3a11)
John Reck [Thu, 14 May 2015 22:55:11 +0000 (15:55 -0700)]
Add ConsumerBase::isAbandoned
Bug:
20105644
Change-Id: I21526b5397ea51a15500c44a99daa9d75fc4ea67
(cherry picked from commit
e478305181bb8dc8706361bc702256fe73f958de)
David Srbecky [Thu, 28 May 2015 18:53:21 +0000 (18:53 +0000)]
am
9405746d: Merge "Rename --include-cfi to --generate-debug-info."
* commit '
9405746db73609d8c7bd30ceafbed2ebe468e4d3':
Rename --include-cfi to --generate-debug-info.
David Srbecky [Thu, 28 May 2015 18:37:35 +0000 (18:37 +0000)]
Merge "Rename --include-cfi to --generate-debug-info."
David Srbecky [Thu, 28 May 2015 15:55:50 +0000 (16:55 +0100)]
Rename --include-cfi to --generate-debug-info.
This follows a change in dex2oat.
Change-Id: I6b2df1668fdd09d82cfe86e6e51360b954b6c8a9
Johan Euphrosine [Wed, 27 May 2015 21:41:20 +0000 (21:41 +0000)]
am
738fc3a7: Merge "framework/native/docs: remove doc footer for jd output"
* commit '
738fc3a722cc2c753b591298e70b0f86c481bba2':
framework/native/docs: remove doc footer for jd output
Johan Euphrosine [Wed, 27 May 2015 21:30:37 +0000 (21:30 +0000)]
Merge "framework/native/docs: remove doc footer for jd output"
Johan Euphrosine [Wed, 27 May 2015 17:13:35 +0000 (10:13 -0700)]
framework/native/docs: remove doc footer for jd output
Change-Id: Ib65a436f4846eb5c02e42c6f1cbda5eab58c68ab
Johan Euphrosine [Fri, 22 May 2015 22:37:05 +0000 (22:37 +0000)]
am
116e7aeb: Merge "frameworks/native/docs: add doxygen configuration"
* commit '
116e7aebb68bb0394eb12092db8282981012784e':
frameworks/native/docs: add doxygen configuration
Johan Euphrosine [Fri, 22 May 2015 22:28:24 +0000 (22:28 +0000)]
Merge "frameworks/native/docs: add doxygen configuration"
Alistair Strachan [Fri, 22 May 2015 21:10:09 +0000 (14:10 -0700)]
Fix EGL shim extension injection for GL ES 3 drivers.
The Android EGL shim injects GL_EXT_debug_marker into the ES driver
EXTENSIONS string for the OpenGL ES 1.x and 2.0/3.0/3.1 drivers if
the extension is not already provided. This feature is used by
GLES_trace.
In Open GL ES 3.0 it became possible to query an indexed version of
the EXTENSIONS string via GetStringi(). NUM_EXTENSIONS Gets were
also added to the specification (taken from Open GL).
If the shim does not have to inject the extension, then there is no
problem, as glGetString() and glGetStringi() / NUM_EXTENSIONS will
be consistent. However, if the Android EGL shim injects the
extension, NUM_EXTENSIONS and GetStringi() will report one less
extension than is really available.
Consistency between these methods is tested by the dEQP framework
with the dEQP-GLES3.functional.state_query.string.extensions test.
If the driver does not provide GL_EXT_debug_marker, this test
fails.
This change wraps all of the affected entry points so that the
wrapped driver extensions are never visible directly to dEQP,
eliminating the inconsistency.
Johan Euphrosine [Thu, 21 May 2015 08:15:34 +0000 (01:15 -0700)]
frameworks/native/docs: add doxygen configuration
Change-Id: I7803d9beceac46488869e4874f6f5f7a7925a796
Elliott Hughes [Sat, 16 May 2015 00:35:35 +0000 (00:35 +0000)]
am
e814b43c: Merge "Don\'t use TEMP_FAILURE_RETRY on close in frameworks/native."
* commit '
e814b43c581b16e144328c405a003ffece9ebf4d':
Don't use TEMP_FAILURE_RETRY on close in frameworks/native.
Elliott Hughes [Sat, 16 May 2015 00:26:09 +0000 (00:26 +0000)]
Merge "Don't use TEMP_FAILURE_RETRY on close in frameworks/native."
Elliott Hughes [Sat, 16 May 2015 00:05:40 +0000 (17:05 -0700)]
Don't use TEMP_FAILURE_RETRY on close in frameworks/native.
Bug: http://b/
20501816
Change-Id: Id13a62f02243c6c4831e2f47944dc34fa822f5b6
Dan Stoza [Thu, 14 May 2015 18:06:55 +0000 (18:06 +0000)]
am
553cbb25: Merge "SurfaceFlinger: Handle EGL errors more cleanly"
* commit '
553cbb254478e7875aa3e4a95838b1811095e328':
SurfaceFlinger: Handle EGL errors more cleanly
Dan Stoza [Thu, 14 May 2015 17:56:27 +0000 (17:56 +0000)]
Merge "SurfaceFlinger: Handle EGL errors more cleanly"
Dan Stoza [Thu, 14 May 2015 16:27:25 +0000 (09:27 -0700)]
SurfaceFlinger: Handle EGL errors more cleanly
Adds some more safety checking for cases where we get an error while
trying to create the EGLImage. The checking puts the Layer into a
failed state after detecting an error, since the shadow queue may no
longer be synchronized.
Bug:
20957332
Change-Id: I68b4c40eab3e58731b875ed5752f2c7d17f14bcb
(cherry picked from commit
65476f3332641066a99e22338bf5cf49ce4af642)
Hiroshi Yamauchi [Wed, 13 May 2015 22:59:45 +0000 (22:59 +0000)]
am
9188b4bb: Merge "Replace JNI primitive array critical calls with non-critical ones."
* commit '
9188b4bb5d44c219face5a4c1c681700cc838294':
Replace JNI primitive array critical calls with non-critical ones.
Hiroshi Yamauchi [Wed, 13 May 2015 22:47:42 +0000 (22:47 +0000)]
Merge "Replace JNI primitive array critical calls with non-critical ones."
Hiroshi Yamauchi [Wed, 13 May 2015 20:11:30 +0000 (13:11 -0700)]
Replace JNI primitive array critical calls with non-critical ones.
The glgen part.
(cherry pick commit
4e7de461c18278a31be83e7c9074a02fbb6e9475)
Bug:
19235243
Change-Id: I0d1e78acf39feb37a67e857216a6d52f4cede180
Dan Stoza [Wed, 13 May 2015 18:04:10 +0000 (18:04 +0000)]
am
f984bad9: Merge "Fix PTS handling for buffer replacement"
* commit '
f984bad94aa98f49a3959f3119114e94a547b9bf':
Fix PTS handling for buffer replacement
Dan Stoza [Wed, 13 May 2015 18:04:08 +0000 (18:04 +0000)]
am
bbb010b7: Merge "binder: add uint64 support to Parcel."
* commit '
bbb010b79cf824611cc6dfc5984333ac8f2177bd':
binder: add uint64 support to Parcel.
Dan Stoza [Wed, 13 May 2015 17:53:22 +0000 (17:53 +0000)]
Merge "Fix PTS handling for buffer replacement"
Dan Stoza [Wed, 13 May 2015 17:52:46 +0000 (17:52 +0000)]
Merge "binder: add uint64 support to Parcel."
Dan Stoza [Tue, 12 May 2015 19:56:16 +0000 (12:56 -0700)]
Fix PTS handling for buffer replacement
This changes the way that SurfaceFlinger's shadow buffer management
works such that instead of tracking the size of the shadow queue in the
BufferQueue, SF tracks the last frame number it has seen, and passes
that into the acquireBuffer call. BufferQueueConsumer then ensures that
it never returns a buffer newer than that frame number, even if that
means that it must return PRESENT_LATER for an otherwise valid buffer.
Change-Id: I3fcb45f683ed660c3f18a8b85ae1f8a962ba6f0e
(cherry picked from commit
a4650a50a0b35e9e4342d6600b6eb24fd94bb8e5)
Ronghua Wu [Mon, 16 Mar 2015 18:11:07 +0000 (11:11 -0700)]
binder: add uint64 support to Parcel.
Bug:
19620911
Change-Id: Ifce5319e4e35afd344dead67ab7ba1cd399476a3
(cherry picked from commit
2d13afdfa1f43973bf3cb917c7d6496a38baa446)
Dan Stoza [Tue, 12 May 2015 22:40:47 +0000 (22:40 +0000)]
am
bfe211f0: Merge "libgui: Always allow allocation on connect"
* commit '
bfe211f00a2b9032ddf04f549db0c9b82666b3be':
libgui: Always allow allocation on connect
Dan Stoza [Tue, 12 May 2015 22:33:38 +0000 (22:33 +0000)]
Merge "libgui: Always allow allocation on connect"
Johan Euphrosine [Tue, 12 May 2015 22:15:51 +0000 (22:15 +0000)]
am
b9009863: Merge "frameworks/native: document native types and enums"
* commit '
b9009863cb45acd7455c0ac873fb8e6a3e7a4f99':
frameworks/native: document native types and enums
Johan Euphrosine [Tue, 12 May 2015 22:05:21 +0000 (22:05 +0000)]
Merge "frameworks/native: document native types and enums"
Dan Stoza [Tue, 12 May 2015 21:55:15 +0000 (14:55 -0700)]
libgui: Always allow allocation on connect
This change places BufferQueue into a predictable state where
allocation is allowed whenever a producer connects. This allows clients
to disconnect and reconnect without having to worry about being locked
out of allocation.
Bug:
20554276
Change-Id: Ic0f920a3d4204f2cafdfa69e46f3bb4204571d7e
(cherry picked from commit
2b83cc920ac98498bee161e2b0e7befdfc82ca2b)
Johan Euphrosine [Sat, 28 Mar 2015 00:15:43 +0000 (17:15 -0700)]
frameworks/native: document native types and enums
Change-Id: Id94b610f27b87426abb30e13484cbd16990aa995
Dan Stoza [Tue, 12 May 2015 17:25:00 +0000 (17:25 +0000)]
am
38d7f755: Merge "libgui: Hook up onFrameReplaced"
* commit '
38d7f7550f5848b33b2e0a2048687fc22f708fda':
libgui: Hook up onFrameReplaced
Dan Stoza [Tue, 12 May 2015 17:18:11 +0000 (17:18 +0000)]
Merge "libgui: Hook up onFrameReplaced"
Dan Stoza [Mon, 11 May 2015 22:33:01 +0000 (15:33 -0700)]
libgui: Hook up onFrameReplaced
This completes the plumbing from ConsumerListener::onFrameReplaced into
SurfaceFlinger (and other consumers that may care).
Change-Id: I376e78ace95d6748e8662e6b4d47c0dfa697a300
(cherry picked from commit
dc13c5b85b099050c73297a19f1ef89308f7620b)
Jesse Hall [Mon, 11 May 2015 21:42:24 +0000 (21:42 +0000)]
am
364ed954: Merge "libEGL: whitelist the EGL_KHR_create_context_no_error extension"
* commit '
364ed9545382539ab9875555947bc18ec94bb82b':
libEGL: whitelist the EGL_KHR_create_context_no_error extension
Jesse Hall [Mon, 11 May 2015 21:31:44 +0000 (21:31 +0000)]
Merge "libEGL: whitelist the EGL_KHR_create_context_no_error extension"
Jesse Hall [Fri, 24 Apr 2015 08:40:42 +0000 (01:40 -0700)]
libEGL: whitelist the EGL_KHR_create_context_no_error extension
Allow EGL implementations to expose the
EGL_KHR_create_context_no_error extension if they wish.
https://www.khronos.org/registry/egl/extensions/KHR/EGL_KHR_create_context_no_error.txt
Change-Id: I3290ccc2a69a1fa0b00ec3f1aa4f876906c64bfb
Chris Craik [Thu, 7 May 2015 16:34:00 +0000 (16:34 +0000)]
am
05815996: Merge "Added Voltage and Current regulator ftrace events to atrace"
* commit '
05815996c965b99c4cc4ea96f6b6c4a9123cdf1c':
Added Voltage and Current regulator ftrace events to atrace
Chris Craik [Thu, 7 May 2015 16:20:52 +0000 (16:20 +0000)]
Merge "Added Voltage and Current regulator ftrace events to atrace"
Dan Stoza [Wed, 6 May 2015 17:01:06 +0000 (17:01 +0000)]
am
c4e98c40: Merge "SF: Apply pending transactions to new sidebands"
* commit '
c4e98c40deacb54ad7288337927506cb5798dfa5':
SF: Apply pending transactions to new sidebands
Dan Stoza [Wed, 6 May 2015 16:50:38 +0000 (16:50 +0000)]
Merge "SF: Apply pending transactions to new sidebands"
Dan Stoza [Tue, 5 May 2015 21:00:52 +0000 (14:00 -0700)]
SF: Apply pending transactions to new sidebands
When a Layer's sideband stream is set, apply any pending transactions.
Otherwise they would never be applied since sideband streams don't
trigger updates by pushing new buffers.
Bug:
20125898
Change-Id: I0c7a91cdf84e6205801f4ab64eee0b09e4c0b3e0
(cherry picked from commit
3b04e1383eca6cb1d43ebe23a421c427007690c7)
Dan Stoza [Mon, 4 May 2015 17:06:30 +0000 (17:06 +0000)]
am
e357f649: Merge "libgui: Clear frame number while freeing slot"
* commit '
e357f6494539cf40a87f77a85e9c0a694c331b86':
libgui: Clear frame number while freeing slot
Dan Stoza [Mon, 4 May 2015 16:57:53 +0000 (16:57 +0000)]
Merge "libgui: Clear frame number while freeing slot"
Dan Stoza [Fri, 1 May 2015 23:42:55 +0000 (16:42 -0700)]
libgui: Clear frame number while freeing slot
Clears the frame number of a slot when it is freed, since it is used
to determine if a released buffer is stale.
Bug:
20445852
Change-Id: I02415e7b25a1eafe7414d6eb1cedf62ac5543cd9
(cherry picked from commit
52937cd9a543fe66696c38ae50ec141aa70ec1e4)
Mark Salyzyn [Fri, 1 May 2015 22:02:12 +0000 (22:02 +0000)]
am
dfe7e7e6: Merge "dumpstate: report per-partition MMC performance"
* commit '
dfe7e7e63fa80a8a9050ea47f69a340e2f7e342d':
dumpstate: report per-partition MMC performance
Mark Salyzyn [Fri, 1 May 2015 21:48:51 +0000 (21:48 +0000)]
Merge "dumpstate: report per-partition MMC performance"
Dan Stoza [Fri, 1 May 2015 20:40:26 +0000 (20:40 +0000)]
am
bb58111c: Merge "SurfaceFlinger: Fix PTS on stale buffers"
* commit '
bb58111c22b41f605a8edb6599fd3df42f6d8e4e':
SurfaceFlinger: Fix PTS on stale buffers
Dan Stoza [Fri, 1 May 2015 20:28:47 +0000 (20:28 +0000)]
Merge "SurfaceFlinger: Fix PTS on stale buffers"
Dan Stoza [Tue, 28 Apr 2015 21:42:06 +0000 (14:42 -0700)]
SurfaceFlinger: Fix PTS on stale buffers
SurfaceFlinger's (Layer's) shadow copy of the BufferQueue queue was
getting out of sync for a few reasons. This change fixes these by
doing the following:
- Adds a check to re-synchronize the shadow copy every time we
successfully acquire a buffer by first dropping stale buffers before
removing the current buffer.
- Avoids trying to perform updates for buffers which have been rejected
(for incorrect dimensions) by SurfaceFlinger.
- Adds IGraphicBufferConsumer::setShadowQueueSize, which allows the
consumer to notify the BufferQueue that it is maintaining a shadow
copy of the queue and prevents it from dropping so many buffers
during acquireBuffer that it ends up returning a buffer for which the
consumer has not yet received an onFrameAvailable call.
Bug:
20096136
Change-Id: I78d0738428005fc19b3be85cc8f1db498043612f
Dan Stoza [Thu, 30 Apr 2015 22:21:02 +0000 (22:21 +0000)]
am
32d4b6c8: Merge "SurfaceFlinger: Limit to 4k Layers"
* commit '
32d4b6c8e122308a7ae296406f87a1df1b611a44':
SurfaceFlinger: Limit to 4k Layers
Dan Stoza [Thu, 30 Apr 2015 22:09:37 +0000 (22:09 +0000)]
Merge "SurfaceFlinger: Limit to 4k Layers"
Dan Stoza [Thu, 30 Apr 2015 22:08:00 +0000 (22:08 +0000)]
am
676d10b2: Merge "SurfaceFlinger: Fix integer overflow in Mesh ctor"
* commit '
676d10b2709059079823698cb6b16e71a97d6d8b':
SurfaceFlinger: Fix integer overflow in Mesh ctor