OSDN Git Service
Robert Carr [Wed, 28 Jun 2017 00:12:38 +0000 (00:12 +0000)]
Merge "SurfaceFlinger: Last minute log removal." into oc-dev am:
56cca289cc am:
a75a975dc8
am:
8e73ea0c99
Change-Id: I704080d3be3170b4d3046e492d19b4e789be9177
Robert Carr [Wed, 28 Jun 2017 00:09:08 +0000 (00:09 +0000)]
Merge "SurfaceFlinger: Last minute log removal." into oc-dev am:
56cca289cc
am:
a75a975dc8
Change-Id: I1b4544d48d3248edc5621af1218b38a3ad0d9cae
Robert Carr [Wed, 28 Jun 2017 00:06:37 +0000 (00:06 +0000)]
Merge "SurfaceFlinger: Last minute log removal." into oc-dev
am:
56cca289cc
Change-Id: I07e2b1c1efd0cc8eec73467fdd4ef88bf36f081c
TreeHugger Robot [Tue, 27 Jun 2017 23:59:16 +0000 (23:59 +0000)]
Merge "SurfaceFlinger: Last minute log removal." into oc-dev
Dan Stoza [Tue, 27 Jun 2017 23:10:54 +0000 (23:10 +0000)]
Merge "libgui: New mutex for ConsumerBase frame callbacks" into oc-dev am:
fb672ba37b am:
f64e75d2f0
am:
8b961670ad
Change-Id: I6a7658f2c6cd4c4a5ed0afcb4711fe2d7216d383
Dan Stoza [Tue, 27 Jun 2017 23:10:33 +0000 (23:10 +0000)]
Merge "libgui: New mutex for ConsumerBase frame callbacks" into oc-dev am:
fb672ba37b am:
1813e093bd
am:
ba01bec3b4
Change-Id: I9d45dc2a97af80a3a7625c07a528b3a04bcc7bde
Dan Stoza [Tue, 27 Jun 2017 23:04:08 +0000 (23:04 +0000)]
Merge "libgui: New mutex for ConsumerBase frame callbacks" into oc-dev am:
fb672ba37b
am:
f64e75d2f0
Change-Id: Icf927506ab83ac03c754658625520eca4cd1b529
Dan Stoza [Tue, 27 Jun 2017 23:03:33 +0000 (23:03 +0000)]
Merge "libgui: New mutex for ConsumerBase frame callbacks" into oc-dev am:
fb672ba37b
am:
1813e093bd
Change-Id: I9ca3c8a6bb058177cf47e8d0f8ca5a38d003c686
Dan Stoza [Tue, 27 Jun 2017 23:01:03 +0000 (23:01 +0000)]
Merge "libgui: New mutex for ConsumerBase frame callbacks" into oc-dev
am:
fb672ba37b
Change-Id: I14c99a3137f086eca4e1c1ab2f8877ae6df88a4a
Dan Stoza [Tue, 27 Jun 2017 23:01:03 +0000 (23:01 +0000)]
Merge "libgui: New mutex for ConsumerBase frame callbacks" into oc-dev
am:
fb672ba37b
Change-Id: I90f2ebe102c40c70620ca12bda5000b455109d26
TreeHugger Robot [Tue, 27 Jun 2017 22:54:05 +0000 (22:54 +0000)]
Merge "libgui: New mutex for ConsumerBase frame callbacks" into oc-dev
Robert Carr [Tue, 27 Jun 2017 20:51:07 +0000 (13:51 -0700)]
SurfaceFlinger: Last minute log removal.
Whoops.
Test: Log removed!
Change-Id: I4593352cf565603a4507c6ef13504b167d882eec
Mengjiao Yang [Tue, 27 Jun 2017 19:22:40 +0000 (19:22 +0000)]
Merge "Fix percentile calculations"
TreeHugger Robot [Tue, 27 Jun 2017 18:28:27 +0000 (18:28 +0000)]
Merge "Fix a warning about redefining arraysize"
TreeHugger Robot [Tue, 27 Jun 2017 18:25:45 +0000 (18:25 +0000)]
Merge "Fix an incorrect format specifier in printf"
Sherry Yang [Thu, 15 Jun 2017 18:32:06 +0000 (11:32 -0700)]
Fix percentile calculations
Adjust max latency in running binderThroughputTest
to improve percentile accuracy. We used to use a fixed
max latency which is devided into time buckets to obtain
the round trip latency percentile. The actual latency,
however, can be much smaller than the max latency, which
results in measurements from all iterations ending up in
the same bucket and leads to inaccurate percentile
measurement. This is resolved by either performing a
training round (option -t), which sets the max latency to
two times the worst latency during training, or by providing
a max latency (option -m) in millisecond by the caller.
Use --help option to see usage.
Bug:
62660944
Change-Id: Iaa23837eb24b90012ae20c35f20caae33986b35a
Fixes:
62660944
Test: Running "binderThroughputTest -p -w 2 -i 10000 -s 0" on marlin-3.18 used to show the same percentile values for 50%, 90%, 95%, and 99%. Now with -t flag,percentile values are different.
Signed-off-by: Sherry Yang <sherryy@google.com>
Jiyong Park [Tue, 27 Jun 2017 08:11:43 +0000 (08:11 +0000)]
Merge "resolve merge conflicts of
40da4609e to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
am:
cbfbd85c8e
Change-Id: I54192e31782629a629231d0ef6f0a49788e9f6e7
Jiyong Park [Tue, 27 Jun 2017 08:07:13 +0000 (08:07 +0000)]
Merge "resolve merge conflicts of
40da4609e to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
Peng Xu [Tue, 27 Jun 2017 04:49:58 +0000 (04:49 +0000)]
Merge "Fix hidl_ssvc_poll thread issues" into oc-dr1-dev am:
d8ef90752b
am:
1f9e5b0710 -s ours
Change-Id: I1524b4deb01eda9c6b8644e90be17d26bb8491a1
Peng Xu [Tue, 27 Jun 2017 04:47:32 +0000 (04:47 +0000)]
Merge "Fix hidl_ssvc_poll thread issues" into oc-dr1-dev
am:
d8ef90752b
Change-Id: I713984531740a01f33335d516393a522b662d53c
TreeHugger Robot [Tue, 27 Jun 2017 04:43:20 +0000 (04:43 +0000)]
Merge "Fix hidl_ssvc_poll thread issues" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 02:23:38 +0000 (02:23 +0000)]
Merge "Fix signed/unsigned integer comparison warning"
TreeHugger Robot [Tue, 27 Jun 2017 01:54:39 +0000 (01:54 +0000)]
Merge "Fix trivial compiler warnings"
Jiyong Park [Tue, 27 Jun 2017 00:59:06 +0000 (09:59 +0900)]
resolve merge conflicts of
40da4609e to oc-dr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I0c4a9e0648674b78391e257f6a94bd1e325e1964
Jiyong Park [Tue, 27 Jun 2017 00:45:13 +0000 (00:45 +0000)]
Merge "libbinder: really make it available to vendors" am:
2bb661ca09
am:
99daab345f
Change-Id: Ief871803389339a3d423787502535c824f35e74e
Jiyong Park [Tue, 27 Jun 2017 00:42:42 +0000 (00:42 +0000)]
Merge "libbinder: really make it available to vendors"
am:
2bb661ca09
Change-Id: I58c2069544d39337b3a054a29fe8fdf98d00a33e
Treehugger Robot [Tue, 27 Jun 2017 00:35:48 +0000 (00:35 +0000)]
Merge "libbinder: really make it available to vendors"
George Burgess IV [Tue, 27 Jun 2017 00:13:09 +0000 (17:13 -0700)]
Fix signed/unsigned integer comparison warning
allowed_pending_fence_count is apparently an int32_t, which made clang
unhappy when compared with the size_t from calling size().
Cast size() to an int32_t, since I doubt we'll have > 2.1 billion FDs
open any time soon. :)
Bug: None
Test: mma. Warning is gone.
Change-Id: I895b2c6e1a6d5a42c692470f6a5c5fd22d55b2ff
George Burgess IV [Tue, 27 Jun 2017 00:03:20 +0000 (17:03 -0700)]
Fix an incorrect format specifier in printf
This was causing clang to complain:
buffer_hub_queue_producer.cpp:137:28: warning: format specifies type
'unsigned long long' but the argument has type 'uint64_t' (aka 'unsigned
long')
Bug: None
Test: mma. Warning is gone
Change-Id: I578c5a910727a578557777ca531ea17a3c90cee8
George Burgess IV [Mon, 26 Jun 2017 23:48:14 +0000 (16:48 -0700)]
Fix a warning about redefining arraysize
Simply removing the redeclaration yields new signed/unsigned conversion
warnings, since the previously-defined arraysize (from
android-base/macros.h) hands back a size_t.
Rather than #undef'ing and continuing on, it looks like we can
trivially get away without needing arraysize at all.
Bug: None
Test: mma. Warnings disappeared.
Change-Id: I56da4dfb0e29edec10d276147e7b5d99fc32c65b
Peng Xu [Sun, 25 Jun 2017 23:43:02 +0000 (16:43 -0700)]
Fix hidl_ssvc_poll thread issues
1) Patch poll wake up handling logic so that thread no longer quits
on spurious wake up.
2) Patch(simplify) thread initialization, so that it will not hang
on waiting for conditional variable.
Test: 1) send signal 3 to system_server, does not observe thread quit.
Test: 2) adb shell "stop;start" many times, every time thread starts.
Bug:
62933449
Bug:
62933799
Merged-In: Icb7477e9d75338b9742e144fc2687d5ced91e89e
Change-Id: Icb7477e9d75338b9742e144fc2687d5ced91e89e
Kalle Raita [Mon, 26 Jun 2017 23:15:06 +0000 (16:15 -0700)]
Fix trivial compiler warnings
Test: Compile & executed many of the tests on Marlin
Change-Id: I2d88922c5dcc88de0394c5bfade02ca1dd9d7b60
Peng Xu [Sun, 25 Jun 2017 23:43:02 +0000 (16:43 -0700)]
Fix hidl_ssvc_poll thread issues
1) Patch poll wake up handling logic so that thread no longer quits
on spurious wake up.
2) Patch(simplify) thread initialization, so that it will not hang
on waiting for conditional variable.
Test: 1) send signal 3 to system_server, does not observe thread quit.
Test: 2) adb shell "stop;start" many times, every time thread starts.
Bug:
62933449
Bug:
62933799
Change-Id: Icb7477e9d75338b9742e144fc2687d5ced91e89e
Jiyong Park [Fri, 14 Apr 2017 04:19:48 +0000 (21:19 -0700)]
libbinder: really make it available to vendors
Fixed a bug that vendor variant of the lib is not built due to missing
global include path.
Bug:
36426473
Bug:
36079834
Test: BOARD_VNDK_VERSION=current m -j libbinder.vendor successful
Change-Id: Ice32a23023d7fd9b78c084c3bef455f7008fe4da
Dan Stoza [Mon, 26 Jun 2017 21:27:18 +0000 (14:27 -0700)]
libgui: New mutex for ConsumerBase frame callbacks
Adds a new mutex to protect ConsumerBase's mFrameAvailableListener
separately from the main mMutex. This prevents deadlocks when trying
to perform callbacks in response to other calls that come through
ConsumerBase.
Bug:
62915791
Test: EncodeVirtualDisplayWithCompositionTest#
testRenderingMaxResolutionRemotely
Change-Id: I244dc2d83488e452d9690c0d7847c9ff15a95dbb
Steven Moreland [Mon, 26 Jun 2017 18:04:28 +0000 (18:04 +0000)]
Merge "libgui: export EGL headers." into oc-dr1-dev am:
be2e363c9e
am:
3806ea87d6
Change-Id: Id6c0664a5fa64aadc3a5360d9cd9ea9a97c2b78f
Steven Moreland [Mon, 26 Jun 2017 17:59:55 +0000 (17:59 +0000)]
Merge "libgui: export EGL headers." into oc-dr1-dev
am:
be2e363c9e
Change-Id: Id87eb01463f03ba0bcbe4948a93f3add60fc0b7e
TreeHugger Robot [Mon, 26 Jun 2017 17:54:11 +0000 (17:54 +0000)]
Merge "libgui: export EGL headers." into oc-dr1-dev
Jeff Vander Stoep [Sat, 24 Jun 2017 00:34:55 +0000 (00:34 +0000)]
Merge "Revert "libui: Load a.h.graphics.mapper passthrough service on library load"" into oc-dr1-dev am:
274f72eb9b
am:
01f4c4a3c6
Change-Id: I327b9cfb1a85502b719ea6704d631b9be2bb879d
Jeff Vander Stoep [Sat, 24 Jun 2017 00:28:22 +0000 (00:28 +0000)]
Merge "Revert "libui: Load a.h.graphics.mapper passthrough service on library load"" into oc-dr1-dev
am:
274f72eb9b
Change-Id: Ie94b3b6d08c4ca0a13902fd4ec71e4bc7808831f
TreeHugger Robot [Sat, 24 Jun 2017 00:04:43 +0000 (00:04 +0000)]
Merge "Revert "libui: Load a.h.graphics.mapper passthrough service on library load"" into oc-dr1-dev
TreeHugger Robot [Fri, 23 Jun 2017 23:35:54 +0000 (23:35 +0000)]
Merge "Convert tests to Android.bp"
Jeff Vander Stoep [Fri, 23 Jun 2017 18:41:04 +0000 (11:41 -0700)]
Revert "libui: Load a.h.graphics.mapper passthrough service on library load"
This reverts commit
75ca86f072f82d38b21e0a13234ecbc2c24cb6ab.
avc: denied { read } name="hw" scontext=u:r:cameraserver:s0
tcontext=u:object_r:system_file:s0 tclass=dir
avc: denied { read } name="hw" scontext=u:r:folio_daemon:s0
tcontext=u:object_r:system_file:s0 tclass=dir
avc: denied { read } name="hw" scontext=u:r:hal_imsrtp:s0
tcontext=u:object_r:system_file:s0 tclass=dir
avc: denied { read } name="hw" scontext=u:r:idmap:s0
tcontext=u:object_r:system_file:s0 tclass=dir
avc: denied { read } name="hw" scontext=u:r:mediaextractor:s0
tcontext=u:object_r:system_file:s0 tclass=dir
avc: denied { read } name="hw" scontext=u:r:mediametrics:s0
tcontext=u:object_r:system_file:s0 tclass=dir
avc: denied { read } name="hw" scontext=u:r:webview_zygote:s0
tcontext=u:object_r:system_file:s0 tclass=dir
Bug:
62353585
Bug:
62912747
Bug:
35197529
Test: build and boot device. Launch camera, take pictures.
Change-Id: Ic6884f7235edb9191034a285414eb93aa44ac23c
Kevin Schoedel [Fri, 23 Jun 2017 20:53:10 +0000 (20:53 +0000)]
Merge "Make VR HWC DPI a configurable property" into oc-dr1-dev am:
281a0c26c0
am:
c0df4a029b
Change-Id: Ib1c6fabbb4962b0e8895b6252de63713311ad1d4
Kevin Schoedel [Fri, 23 Jun 2017 20:48:10 +0000 (20:48 +0000)]
Merge "Make VR HWC DPI a configurable property" into oc-dr1-dev
am:
281a0c26c0
Change-Id: I3ec8cc3bea80ab946c7576f9de2c470ace2fb72f
TreeHugger Robot [Fri, 23 Jun 2017 20:39:03 +0000 (20:39 +0000)]
Merge "Make VR HWC DPI a configurable property" into oc-dr1-dev
Courtney Goeltzenleuchter [Wed, 3 May 2017 22:36:55 +0000 (16:36 -0600)]
Convert tests to Android.bp
Test: make
adb shell stop; adb sync; adb shell start
- wait for device to finish
adb shell /data/nativetest/angeles/angeles
adb shell /data/nativetest/test-opengl-configdump/test-opengl-configdump
adb shell /data/nativetest/EGL_test/EGL_test
adb shell /data/nativetest/test-opengl-fillrate/test-opengl-fillrate
adb shell /data/nativetest/test-opengl-filter/test-opengl-filter 3
adb shell /data/nativetest/test-opengl-filter/test-opengl-filter 3 pbuffer
adb shell /data/nativetest/test-opengl-finish/test-opengl-finish
adb shell /data/nativetest/test-opengl-gl2_basic/test-opengl-gl2_basic
adb shell /data/nativetest/test-opengl-gl2_copyTexImage/test-opengl-gl2_copyTexImage
adb shell /data/nativetest/test-opengl-gl2_yuvtex/test-opengl-gl2_yuvtex
adb shell /data/nativetest/test-opengl-gl_basic/test-opengl-gl_basic
adb shell /data/nativetest/test-opengl-gl2_perf/test-opengl-gl2_perf
adb shell /data/nativetest/test-opengl-gl_yuvtex/test-opengl-gl_yuvtex
adb shell /data/nativetest/test-opengl-gralloc/test-opengl-gralloc
Bug:
37512442
Change-Id: I5d7b974333f485570304728d0572e251bb576f7e
TreeHugger Robot [Fri, 23 Jun 2017 20:03:02 +0000 (20:03 +0000)]
Merge "atrace: Enable cgroup tracing"
Steven Moreland [Fri, 23 Jun 2017 19:53:00 +0000 (19:53 +0000)]
Merge "IWYU RegionHelper += <limits>" am:
bbf3096e22 am:
f08008db9f am:
836513bfbf
am:
43c8b437ac
Change-Id: Ic27a21f069eefbc93ba66db1bcb9d6e73f76dd64
Steven Moreland [Fri, 23 Jun 2017 19:42:54 +0000 (19:42 +0000)]
Merge "IWYU RegionHelper += <limits>" am:
bbf3096e22 am:
f08008db9f
am:
836513bfbf
Change-Id: I164150132bd6518e52894823b10d108e86eed81b
Steven Moreland [Fri, 23 Jun 2017 19:36:01 +0000 (19:36 +0000)]
Merge "IWYU RegionHelper += <limits>" am:
bbf3096e22
am:
f08008db9f
Change-Id: Ida5d67d96a8c3eb87f25202872b2c30ed5b6c25e
Steven Moreland [Fri, 23 Jun 2017 19:23:34 +0000 (19:23 +0000)]
Merge "IWYU RegionHelper += <limits>"
am:
bbf3096e22
Change-Id: I9dd08e98eee2924554b623f755869fac35a80605
TreeHugger Robot [Fri, 23 Jun 2017 19:20:22 +0000 (19:20 +0000)]
Merge "EGL: Add EGL_GL_scrgb extension"
Treehugger Robot [Fri, 23 Jun 2017 19:18:41 +0000 (19:18 +0000)]
Merge "IWYU RegionHelper += <limits>"
John Reck [Fri, 23 Jun 2017 19:13:34 +0000 (19:13 +0000)]
Disable setting saved_cmdline_size am:
ba54d5baf4 am:
acc79d7cfe
am:
085368a92a
Change-Id: Ica471df4a011bc3afb8b164dc16288c1bd7f26c2
John Reck [Fri, 23 Jun 2017 19:08:32 +0000 (19:08 +0000)]
Disable setting saved_cmdline_size am:
ba54d5baf4 am:
64dac11cc0
am:
4e0d0cba5c
Change-Id: I99df51ff5c01bc7d4adf5945e597f79e7c70988d
John Reck [Fri, 23 Jun 2017 19:08:31 +0000 (19:08 +0000)]
Disable setting saved_cmdline_size am:
ba54d5baf4
am:
acc79d7cfe
Change-Id: I8be566b029a6ec93334e7a4dd37eec12846b1f60
John Reck [Fri, 23 Jun 2017 19:04:01 +0000 (19:04 +0000)]
Disable setting saved_cmdline_size am:
ba54d5baf4
am:
64dac11cc0
Change-Id: I293be9ed5486024c479a0ef133086f825e259048
John Reck [Fri, 23 Jun 2017 19:02:13 +0000 (19:02 +0000)]
Disable setting saved_cmdline_size
am:
ba54d5baf4
Change-Id: Icd17c5257c03fd9e33114c5760ece6c21c74d025
John Reck [Fri, 23 Jun 2017 19:00:44 +0000 (19:00 +0000)]
Disable setting saved_cmdline_size
am:
ba54d5baf4
Change-Id: I447ad42ad4c245013e488701a61d8ce2348a368d
Steven Moreland [Fri, 23 Jun 2017 17:23:41 +0000 (10:23 -0700)]
IWYU RegionHelper += <limits>
Test: compiles when transitive dependency is removed
Bug:
35363681
Change-Id: Ia405e41102e6ded07720e424167df7e4d080581e
John Reck [Fri, 23 Jun 2017 16:44:08 +0000 (09:44 -0700)]
Disable setting saved_cmdline_size
Minimal revert of the addition of increasing
the saved_cmdline_size. This change
exposed kernel bugs that prevented
atrace from working.
Bug:
62375794
Test: manual
Change-Id: Ie946b9246ce9ba22af59dbf0b9fe8a59a5fa1f3f
Courtney Goeltzenleuchter [Fri, 23 Jun 2017 15:06:52 +0000 (09:06 -0600)]
EGL: Add EGL_GL_scrgb extension
Test: Android CTS
adb -d shell am start \
-n com.drawelements.deqp/android.app.NativeActivity \
-e cmdLine '"deqp --deqp-case=dEQP-EGL.functional.wide_color.* \
--deqp-log-filename=/sdcard/dEQP-Log.qpa"'
Bug:
62424735
Change-Id: I12a0bd64c01bcf314b4a73d8eb3151b09bf9f8ae
Courtney Goeltzenleuchter [Fri, 23 Jun 2017 02:44:47 +0000 (02:44 +0000)]
EGL: add color space validation am:
15f79786e1
am:
e175679b61
Change-Id: I447740c95434f84979a5d42faafd8f030e39789a
Courtney Goeltzenleuchter [Fri, 23 Jun 2017 02:40:16 +0000 (02:40 +0000)]
EGL: add color space validation
am:
15f79786e1
Change-Id: I05600bda5553b6e5f49a055f30cfef60db4fa9e8
Steven Moreland [Fri, 23 Jun 2017 00:50:49 +0000 (17:50 -0700)]
libgui: export EGL headers.
Many libgui headers use these headers so not exporting
these breaks BOARD_VNDK_VERSION=current builds.
Test: headers resolved with BOARD_VNDK_VERSION=current
Change-Id: I085faeda4f8ad8a07d91e81222b8031a0dd1858a
Courtney Goeltzenleuchter [Tue, 20 Jun 2017 14:12:54 +0000 (08:12 -0600)]
EGL: add color space validation
We want Android to support multiple color spaces as
that can be implemented entirely in the eglapi.cpp wrapper.
These additional dataspaces do not require special behavior
by the driver and may not recognize EGL_GL_COLORSPACE_DISPLAY_P3_EXT,
EGL_GL_COLORSPACE_DISPLAY_P3_LINEAR_EXT, and related attributes.
Therefor, need to filter out those attributes before calling
the driver.
In the future there may be new extensions that do require
driver support. When that happens we'll need to update
stripColorSpaceAttribute to treat that correctly.
Test: Android CTS
adb -d shell am start \
-n com.drawelements.deqp/android.app.NativeActivity \
-e cmdLine '"deqp --deqp-case=dEQP-EGL.functional.wide_color.* \
--deqp-log-filename=/sdcard/dEQP-Log.qpa"'
Bug:
62424735
Change-Id: I0f0867feb73055100636d326213183ef1f052b7c
(cherry picked from commit
eeaa52bc65b5cfaca1f0de44635b57919179df29)
TreeHugger Robot [Thu, 22 Jun 2017 22:11:16 +0000 (22:11 +0000)]
Merge "EGL: add color space validation"
Chia-I Wu [Thu, 22 Jun 2017 21:33:27 +0000 (21:33 +0000)]
Merge "surfaceflinger: discard stale commands" into oc-dev am:
f8ca9a0875 am:
3addef29f7
am:
a2d470b112
Change-Id: I3d59f6fe7851dfb59b99a73b9ffde187e29ab7b4
Fabien Sanglard [Thu, 22 Jun 2017 21:33:06 +0000 (21:33 +0000)]
Merge "LibGUI remove DEBUG" into oc-dev am:
be597daebd am:
45bf98c36e
am:
c7f641b011
Change-Id: I8e8951b15a95a05413aa44f3b7146cc67a5b02d9
Fabien Sanglard [Thu, 22 Jun 2017 21:32:43 +0000 (21:32 +0000)]
Disable skip Validate on client composition am:
269c236109 am:
0ff681ca77
am:
325193380d
Change-Id: Ia28ce44bc5b1b85b2fb42c2021ee0ac92a1e6639
Chia-I Wu [Thu, 22 Jun 2017 21:32:17 +0000 (21:32 +0000)]
Merge "surfaceflinger: discard stale commands" into oc-dev am:
f8ca9a0875 am:
49cdc635a2
am:
f37daee669
Change-Id: I433c7db5f0fd82d474dc5e4dac3dbdfe07a210a4
Fabien Sanglard [Thu, 22 Jun 2017 21:31:52 +0000 (21:31 +0000)]
Merge "LibGUI remove DEBUG" into oc-dev am:
be597daebd am:
d9517fe958
am:
70f644f329
Change-Id: Id489ee98cc82ad9023f75e6c56fec5efd81ad293
Fabien Sanglard [Thu, 22 Jun 2017 21:31:21 +0000 (21:31 +0000)]
Disable skip Validate on client composition am:
269c236109 am:
89283e56d6
am:
00ce8550c5
Change-Id: I52df65bd858b3765ea5c81bb8a6aaa8c98a498b7
Chia-I Wu [Thu, 22 Jun 2017 20:47:38 +0000 (20:47 +0000)]
Merge "surfaceflinger: discard stale commands" into oc-dev am:
f8ca9a0875
am:
3addef29f7
Change-Id: Ica0906d38bbf2df75f10a6108600c3c1646ab80d
Fabien Sanglard [Thu, 22 Jun 2017 20:47:14 +0000 (20:47 +0000)]
Merge "LibGUI remove DEBUG" into oc-dev am:
be597daebd
am:
45bf98c36e
Change-Id: Ic223a6dfb10324fbdd2b2609072a0088eff4fbd9
Fabien Sanglard [Thu, 22 Jun 2017 20:46:48 +0000 (20:46 +0000)]
Disable skip Validate on client composition am:
269c236109
am:
0ff681ca77
Change-Id: I7331077ef129e55aed38f10f19732a22eb842bd6
Chia-I Wu [Thu, 22 Jun 2017 20:15:00 +0000 (20:15 +0000)]
Merge "surfaceflinger: discard stale commands" into oc-dev am:
f8ca9a0875
am:
49cdc635a2
Change-Id: I84da842894b25f11b665bd3b4adf597b3aee94ef
Fabien Sanglard [Thu, 22 Jun 2017 20:14:32 +0000 (20:14 +0000)]
Merge "LibGUI remove DEBUG" into oc-dev am:
be597daebd
am:
d9517fe958
Change-Id: Id677c4ba2c28922c4a3f64fdc2b114d3e3031dbd
Fabien Sanglard [Thu, 22 Jun 2017 20:14:10 +0000 (20:14 +0000)]
Disable skip Validate on client composition am:
269c236109
am:
89283e56d6
Change-Id: Id8e05d219ef73616cdef7152008b487050f25373
Chia-I Wu [Thu, 22 Jun 2017 20:07:16 +0000 (20:07 +0000)]
Merge "surfaceflinger: discard stale commands" into oc-dev
am:
f8ca9a0875
Change-Id: I6b7ce1798d2fe753c577ff3baa954283c372b80c
Fabien Sanglard [Thu, 22 Jun 2017 20:06:51 +0000 (20:06 +0000)]
Merge "LibGUI remove DEBUG" into oc-dev
am:
be597daebd
Change-Id: Iece9f1428655c8674cf62a92ecb0a088ad74b629
Fabien Sanglard [Thu, 22 Jun 2017 20:06:31 +0000 (20:06 +0000)]
Disable skip Validate on client composition
am:
269c236109
Change-Id: I4c0a4a90ff0ca2e39075ad643d1892597301d3fd
Chia-I Wu [Thu, 22 Jun 2017 20:04:12 +0000 (20:04 +0000)]
Merge "surfaceflinger: discard stale commands" into oc-dev
am:
f8ca9a0875
Change-Id: Ief69f6fcf0c738612b14b94d65b3ae1555973d6c
Fabien Sanglard [Thu, 22 Jun 2017 20:03:13 +0000 (20:03 +0000)]
Merge "LibGUI remove DEBUG" into oc-dev
am:
be597daebd
Change-Id: I65756ce89b4a10d2df403f9f9a4ce2cacdaafda0
Fabien Sanglard [Thu, 22 Jun 2017 20:02:43 +0000 (20:02 +0000)]
Disable skip Validate on client composition
am:
269c236109
Change-Id: Ib0d2f8a9e59cf4618ed029fe35391f566d11bcfb
Chia-I Wu [Thu, 22 Jun 2017 19:59:35 +0000 (19:59 +0000)]
Merge "surfaceflinger: discard stale commands" into oc-dev
Fabien Sanglard [Thu, 22 Jun 2017 19:56:29 +0000 (19:56 +0000)]
Merge "LibGUI remove DEBUG" into oc-dev
Fabien Sanglard [Thu, 22 Jun 2017 18:35:16 +0000 (11:35 -0700)]
Disable skip Validate on client composition
SurfaceFlinger should not skip validate when GLComposition is
needed. This can happen when SF decides to force GLComposition
(like when a screen rotation occurs).
Bug:
62906801
Test: Manual
Change-Id: I248146eade395a124cb149773287abd88ae36511
Chia-I Wu [Thu, 22 Jun 2017 17:48:28 +0000 (10:48 -0700)]
surfaceflinger: discard stale commands
When we skip validate, we may have stale commands on the command
buffer. They should be discarded.
Bug:
62906801
Test: manual
Change-Id: Ie7921ba75ab2252b834cda6924e1fcfdf236f759
Fabien Sanglard [Thu, 22 Jun 2017 18:13:49 +0000 (11:13 -0700)]
LibGUI remove DEBUG
DEBUG_ONLY_CODE flag enables expensive checks such as
BufferQueueCore::validateConsistencyLocked() which when running
represents 15.1% of SurfaceFlinger total runtime. Enabling these
check for "eng" build only make "userdebug" build closer to "user".
Test: Manual
Bug:
62905241
Change-Id: I77065ecf4e62261c3f02b1cad9966d5c4845c639
Courtney Goeltzenleuchter [Tue, 20 Jun 2017 14:12:54 +0000 (08:12 -0600)]
EGL: add color space validation
We want Android to support multiple color spaces as
that can be implemented entirely in the eglapi.cpp wrapper.
These additional dataspaces do not require special behavior
by the driver and may not recognize EGL_GL_COLORSPACE_DISPLAY_P3_EXT,
EGL_GL_COLORSPACE_DISPLAY_P3_LINEAR_EXT, and related attributes.
Therefor, need to filter out those attributes before calling
the driver.
In the future there may be new extensions that do require
driver support. When that happens we'll need to update
stripColorSpaceAttribute to treat that correctly.
Test: Android CTS
adb -d shell am start \
-n com.drawelements.deqp/android.app.NativeActivity \
-e cmdLine '"deqp --deqp-case=dEQP-EGL.functional.wide_color.* \
--deqp-log-filename=/sdcard/dEQP-Log.qpa"'
Bug:
62424735
Change-Id: I0f0867feb73055100636d326213183ef1f052b7c
Fabien Sanglard [Thu, 22 Jun 2017 06:05:27 +0000 (06:05 +0000)]
Merge "Skip Validate am:
249c0ae80a am:
9837ce8210" into oc-dr1-dev-plus-aosp
am:
63a2dd22be
Change-Id: Ib21942a7796af217091acef7d81bddfb9a080a83
Fabien Sanglard [Thu, 22 Jun 2017 06:04:33 +0000 (06:04 +0000)]
Skip Validate am:
249c0ae80a am:
8976c6ae37
am:
01b1acff34
Change-Id: I0640bf048df5b3c251239e06066eeae2f8b44636
Android Build Merger (Role) [Thu, 22 Jun 2017 06:02:10 +0000 (06:02 +0000)]
Merge "Skip Validate am:
249c0ae80a am:
9837ce8210" into oc-dr1-dev-plus-aosp
Fabien Sanglard [Thu, 22 Jun 2017 06:01:34 +0000 (06:01 +0000)]
Skip Validate am:
249c0ae80a
am:
9837ce8210
Change-Id: If81e98cd140426c5cc33595205fd9d4c26bef044
Fabien Sanglard [Thu, 22 Jun 2017 06:01:00 +0000 (06:01 +0000)]
Skip Validate am:
249c0ae80a
am:
8976c6ae37
Change-Id: I400dfd8d484779e5523353b002164f4f5ea41e03
Fabien Sanglard [Thu, 22 Jun 2017 05:58:06 +0000 (05:58 +0000)]
Skip Validate
am:
249c0ae80a
Change-Id: I336fce473d21e5fdfb80ad8eb48f1df5a24497d8
Fabien Sanglard [Thu, 22 Jun 2017 05:57:15 +0000 (05:57 +0000)]
Skip Validate
am:
249c0ae80a
Change-Id: I55a564d600a422915f43111f4e02a10857512fcf
Fabien Sanglard [Tue, 20 Jun 2017 02:22:36 +0000 (19:22 -0700)]
Skip Validate
b/
37474580
b/
62806392
Test: marlin, ryu
Change-Id: I09e0c52cb7c914dcd883dc771d97a365c89f7037
OSDN Git Service
