Commit graph

75 commits

Author SHA1 Message Date
Peiyong Lin
96ee56bcd8 Remove beginCommand variants with a helper template.
BUG: b/147365206
Test: boot
Change-Id: I30715fe3e1c221ba366bf521fbd531636136f0c9
2020-01-08 14:55:20 -08:00
Dan Shi
f2ee9c19df Convert VtsHalGraphicsComposerV2_2TargetTest to be parameterized test
Bug: 142397658
Test: atest VtsHalGraphicsComposerV2_2TargetTest
Change-Id: I85cfd932f420a73a4fbf1853313b8d0127157757
2019-12-03 12:31:26 -08:00
TreeHugger Robot
7a8f64c17b Merge "graphics: fix failed VTS cases" 2019-11-27 20:34:30 +00:00
Peiyong Lin
a5aedc3293 Clean up BeginCommand.
BUG: N/A
Test: build, flash and boot
Change-Id: Ife6132307152e271548a54e11a472751c52d95e4
2019-11-25 16:18:58 -08:00
Long Ling
0d3fe0857a graphics: fix failed VTS cases
Return BAD_DISPLAY or BAD_PARAMETER as expected.

Bug: 140158240
Test: run vts -m VtsHalGraphicsComposerV2_2Target
Change-Id: I0f5a7103bc134ed87984bd13248aee7597a95d68
2019-11-14 11:27:00 -08:00
Chong Zhang
86e1aebad1 [RenderEngine] Fix test build for RenderEngine refactor
Fix build after refactor of creation flags.

BUG: 142331374
Test: build, flash and boot
Change-Id: I59c2858f8e35426e2eb08c91e8797efd738a3922
2019-10-23 12:28:08 -07:00
Steven Moreland
82b84148c7 Remove libhwbinder/libhidltransport deps
Since these were combined into libhidlbase.

Bug: 135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I878a4d04e65ef13f3a0ebaf64177f673958d213c
2019-10-02 12:50:29 -07:00
Steven Moreland
38c46d0b98 Merge "Remove libhwbinder/libhidltransport deps" am: 6b62c58a9a am: 8c22c3862f am: 6684ee8c36
am: 9a5ffa3196

Change-Id: I3a80895d10767fe68e90a907312a83ded976cbcc
2019-09-06 16:06:13 -07:00
Steven Moreland
b3a4d3832e Remove libhwbinder/libhidltransport deps
Since these were combined into libhidlbase.

Bug: 135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I075670b64eebbbbd6a6ae0e84ad51bf1c6f5ba36
2019-09-06 01:07:02 +00:00
Xin Li
68464fb5a0 DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
Bug: 139893257
Change-Id: I7e48b5477b2edda72c940e05531782dd28a2f784
2019-08-23 06:45:16 +00:00
Marissa Wall
53aff11b36 composer-vts: support gralloc 4
Add support for gralloc 4.0 to composer-vts.

Bug: 136016160
Test: Compiles and boots

Change-Id: Ibfa802023ddeb3b4d09a7b69bbc796b67c4ee62d
2019-08-20 10:07:06 -07:00
Marissa Wall
a8c3130a34 composer: refactor ComposerResources into shared library
composer@2.x-hal is a header library. Any of the shared
libraries it depends on must also be included by anyone
who includes composer@2.x-hal. This means when we add a new
version of mapper, anyone who uses composer@2.x-hal must
also include the new version of the mapper. Vendors
that depend on composer@2.x-hal are broken every time we
add a new mapper.

This patch refactors ComposerResources into a seperate
shared library. ComposerResources contains all of the
mapper code. composer@2.x-hal will depend on the new
composer@2.x-resource hal. Everyone downstream must
also add the composer@2.x-resource file now. However,
they will not be broken again when we add a new mapper
version.

Bug: 136016160
Test: Compiles and boots

Change-Id: I208a954a941ed65938074cd3efb8a6893a2bc1eb
2019-08-16 10:48:37 -07:00
Adam Bodnar
d0aef4dfe5 Add more HWC vs RenderEngine tests to composer vts
Bug: 133411821
Test: build, boot, VtsHalGraphicsComposerV2_2TargetTest
Change-Id: I19322f75b098813b1e4acf31cb6bae9e15fb8915
2019-08-14 15:06:45 -07:00
Alec Mouri
45a70ce00e [VTS] Update RenderEngine dependencies.
Upstream change adds a new RenderEngine dependency, adding the dependency
here to fix compilation issue.

Bug: 136806342
Bug: 137191934
Test: builds
Change-Id: I8c097dd162afb79d36269741af00d0e69cf77c2a
2019-08-05 17:00:14 -07:00
Valerie Hau
92d1226f9c Setting layer dataspace to match the color mode
Bug: 135045017
Test: build, boot, VtsHalGraphicsComposerV2_2TargetTest
Change-Id: I7188c53ca92895a98da062a248f6b781202671b8
2019-07-22 10:29:40 -07:00
Valerie Hau
37d4f127c9 DO NOT MERGE: Fixing SRGB for devices that do not support SRGB color mode
Bug: 135375302
Test: build, boot, VtsHalGraphicsComposerV2_2TargetTest
Change-Id: Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585
Merged-In: Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585
(cherry picked from commit 2f3553e1ed)
2019-07-22 02:04:20 +00:00
Valerie Hau
37edd052ce Fixing client composition setup on non-SRGB color mode displays
Fixing client composition behavior to match SF - dataspace of client
composition is determined by the color mode of the display

Bug: 135045017
Test: build, boot, VtsHalGraphicsComposerV2_2TargetTest
Change-Id: I88371d173501875b59bf40092943cebff3d22b06
2019-07-12 09:14:39 -07:00
Felix
84af4f6e7e Merge "Add interface info to .rc files" am: 98d0f4d52c am: 37298a7616 am: 3531ec0183
am: bf481c99ed

Change-Id: Ie44e2aa87f7407a9820dc6f1ad6298b61bae34f3
2019-07-08 12:57:01 -07:00
Felix
37298a7616 Merge "Add interface info to .rc files"
am: 98d0f4d52c

Change-Id: Ie6cfbacd523c4b09f77bee3369ec8e88b3fa0419
2019-07-08 12:22:23 -07:00
Peiyong Lin
1b5692ea05 [Cleanup] Properly export lib headers.
Properly export lib headers to avoid copying everything when upgrade composer
version. Minor: Remove VTS team as OWNERS of non-VTS directory.

BUG: 135929065
Test: build and boot
Change-Id: I4c3544490fcf043ff6bda2312a00aed015d0d5fc
2019-07-02 18:23:14 -07:00
Adam Bodnar
5bf9dc69ac Validate Render Engine output in composer VTS 2.2
Bug: 133411821
Test: build, boot, VtsHalGraphicsComposerV2_2TargetTest
Change-Id: Ie95c197d702977738a75e29954c541fe1b7baa38
2019-07-02 12:18:18 -07:00
Valerie Hau
7c8eb68002 Add support for different color modes for readback
Bug: 135045017
Test: build, boot, VtsHalGraphicsComposerV2_2TargetTest
Change-Id: I07868d95120068bee1d98432888109313da33119
2019-06-26 15:21:04 -07:00
Adam Bodnar
a559b823fb Explicate SRGB in Composer VTS 2.2 Readback Tests
Bug: 136032929

Test: Build, boot, VtsHalGraphicsComposerV2_2TargetTest
Change-Id: Ic842e574e47baf231a4a41803dd2ee178ad2f6a4
2019-06-25 16:46:15 -07:00
Felix
551b8d15ce Add interface info to .rc files
Signed-off-by: Felix <google@ix5.org>
Change-Id: I6d70bbdb66c3dce280bf6908c3750316a6f6cf70
2019-06-25 20:00:07 +02:00
Valerie Hau
624ce4b638 Merge "Adding support for different Mapper versions in IComposer VTS tests" into qt-dev
am: 29594d2d02

Change-Id: Icd7b79a0a737c2b90a79a140168c15eaf3f50457
2019-06-20 13:14:35 -07:00
Valerie Hau
dca469c180 Adding support for different Mapper versions in IComposer VTS tests
Bug: 135139498
Test: build, boot, VtsHalGraphicsComposerV2_<1,2,3>TargetTest,
Change-Id: I05e2832c64d4c06eb4afd64c3323d7edbd19a5f4
Merged-In: I05e2832c64d4c06eb4afd64c3323d7edbd19a5f4
2019-06-19 17:14:24 -07:00
Valerie Hau
5bb66a6948 Merge "Adding support for different Mapper versions in IComposer VTS tests" 2019-06-19 23:12:47 +00:00
Valerie Hau
c1dc31340e Adding support for different Mapper versions in IComposer VTS tests
Bug: 135139498
Test: build, boot, VtsHalGraphicsComposerV2_<1,2,3>TargetTest,
Change-Id: I05e2832c64d4c06eb4afd64c3323d7edbd19a5f4
2019-06-19 13:56:04 -07:00
Steven Moreland
8762ba49cc Merge "libhidltransport users user libhidlbase" into qt-dev am: a27c627f51 am: 8943ce08bd
am: a750e7e5f5

Change-Id: I38f5495d70066a31023c2eb53c3c02486ead1d17
2019-06-14 16:46:01 -07:00
Steven Moreland
a750e7e5f5 Merge "libhidltransport users user libhidlbase" into qt-dev am: a27c627f51
am: 8943ce08bd

Change-Id: I8b93ac6a8b410256855ce4041dc4b7a17016d4de
2019-06-14 16:30:22 -07:00
Steven Moreland
0dc5f389f9 Merge "libhidltransport users user libhidlbase" into qt-dev
am: a27c627f51

Change-Id: I379a04a52e60260e0a73dc7720d3e315038a52ff
2019-06-14 16:18:47 -07:00
Steven Moreland
085a82ecb1 libhidltransport users user libhidlbase
libhidltransport symbols are being moved into libhidlbase in order to
optimize linking/memory usage. libhidltransport will no longer be
required in the future (however removing references to it will come
separately).

Bug: 134961554
Test: boot
Change-Id: Ibcc2db32d3bec1a786b60e11d4820ecd0605f403
2019-06-12 13:49:19 -07:00
Valerie Hau
b019fd7a9a Clean up Readback test
Readback will be used in RenderEngine testing.  Clean up test files and
extract common classes

Bug: 133411821
Test: build, boot, VtsHalGraphicsComposerV2_2TargetTest
Change-Id: I45b4666348ae0137dd2a7825b5cfd627a1e1aa58
2019-05-23 14:39:21 -07:00
Peiyong Lin
2007f2d931 Merge "Return display capability if getDisplayBrightnessSupport is not registered." into qt-dev
am: 248f72a9a0

Change-Id: I105e29926e146e4d7e9c6924fcb4588e57e1400b
2019-05-08 11:28:09 -07:00
Peiyong Lin
0686afa15a Return display capability if getDisplayBrightnessSupport is not registered.
If getDisplayBrightnessSupport is not registered, there are two possibilities,
one is it's not supported at all, the other is that the support is returned in
getDisplayCapabilities. And thus we need to check getDisplayCapabilities, and
we return UNSUPPORTED always in this case. This patch also allows
getPerFrameMetadataKeys to return UNSUPPORTED on non-HDR capable devices.

BUG: 131595097
Test: Build, boot.
Change-Id: Ied302b1ac702dd94e039f1081d5420395c1bfbf4
2019-05-01 16:58:13 -07:00
Steven Moreland
6d494b2346 Merge "Update hidl makefiles for bpfmt" am: ff0bd741ca
am: 96f40f7b02

Change-Id: Idbf030e4993067bdb8181321bca2de00c9b6f7ef
2019-04-18 14:34:45 -07:00
Steven Moreland
1ae4615d9f Update hidl makefiles for bpfmt
hidl-generated makefiles are now generated such that bpfmt(file) == file.

Bug: 67417008
Test: enable bpfmt hook
Change-Id: I1f69d292bc23a7cc293a66110cb02d597e1019ad
2019-04-17 09:38:50 -07:00
TreeHugger Robot
1be67b368a Merge changes from topic "IA/IM-3.0"
* changes:
  graphics: change composer 2.1 to support allocator/mapper 3.0
  graphics: rev IAllocator and IMapper
2019-01-15 23:21:27 +00:00
Marissa Wall
e20b112787 graphics: change composer 2.1 to support allocator/mapper 3.0
Change composer 2.1's ComposerResources to support the new major versions
of IAllocator and IMapper.

Bug: 120493579
Test: vts
Change-Id: I888364d302ba8c7f7ad30070dcad3ed738b4c663
2019-01-12 15:40:04 -08:00
Marissa Wall
889c94dabc graphics: update owners am: 104ecb9e60 am: af56d35175
am: 88d9ae03c4

Change-Id: I596f312798b61afe4a6f12d293e2de95b6e2d193
2019-01-11 10:51:25 -08:00
Marissa Wall
104ecb9e60 graphics: update owners
With olv@ no longer on the graphics team we need to update the
owners file to remove him and add new owners.

For composer the new owners are: lpy@ and vhau@
For allocator/mapper the new owner is: marissaw@

Test: N/A
Change-Id: Ied297e9446d480629155e1d9a96575ee518c2135
2019-01-10 14:27:55 -08:00
Keun Soo YIM
68ae05dd2d pack VTS cc_test binaries as general-tests
Test: make general-tests
Bug: 120093339
Merged-In: I363450d205868f900e4925ccff1430e2a569f2a4
Change-Id: I363450d205868f900e4925ccff1430e2a569f2a4
2018-12-07 10:49:56 -08:00
Keun Soo YIM
ff84c37bc1 pack VTS cc_test binaries as general-tests
Test: make general-tests
Bug: 120093339
Change-Id: I363450d205868f900e4925ccff1430e2a569f2a4
2018-11-27 16:11:41 -08:00
Valerie Hau
01c541c93f Removing USES_DISPLAY_RENDER_INTENTS check in ComposerClient.h
Test: ./VtsHalGraphicsComposerV2_2TargetTest
Change-Id: Ibe5800c22927c16619db864193594f70dc2a4b7f
2018-11-19 10:50:02 -08:00
Bill Yi
5989a2f631 Merge pi-dr1-dev to aosp-master
Change-Id: Ida0bc98526f4fc7a1c20f5bbd3210b2f6156d459
2018-10-19 12:20:42 -07:00
Chia-I Wu
0eafa742c6 graphics: composer@2.2 does not require mapper@2.1
Fix composer@2.2 VTS to not require mapper@2.1.  We will need a
better test infra before things get too complex.

Bug: 112248843
Test: manual
Change-Id: Ia71a102742fd26f14e8edf3f43f3351786350ccd
Merged-In: Ia71a102742fd26f14e8edf3f43f3351786350ccd
2018-10-18 11:22:09 -07:00
Valerie Hau
babe4eb0de Fixing Readback Test failures related to auto-succeed
Prior implementation failed to clear command reader, causing test to
fail in TearDown.  Transform Readback Tests failed to return if readback
was not supported, moved GTEST_SUCCEED into test body from SetUp

Bug: 111563608
Test: ./VtsHalGraphicsComposerV2_2TargetTest
Change-Id: I4647f94efa216b219d0ef345df1ec3aa81dab4c0
2018-10-05 11:29:06 -07:00
Valerie Hau
cfb29a4e7b Adding more Readback tests and refactoring
Bug: 111563608
Test: ./VtsHalGraphicsComposerV2_2TargetTest
--gtest_filter=GraphicsComposerReadbackTest.*

Change-Id: I0e4a8212bf08c2890747f99d5754f92821c2e2f4
2018-10-02 15:39:34 -07:00
Valerie Hau
cbe8e9ab03 Clearing reader and writer queues in executeCommands for HWC VTS Tests
Test: ./VtsHalGraphicsComposerV2_1TargetTest,
./VtsHalGraphicsComposerV2_2TargetTest

Change-Id: Ie47e486d191da30be47cde47d768d3cdde8e04e9
2018-09-17 10:58:03 -07:00
Valerie Hau
8d782cbd8f Adding unit tests for IComposerClient V2_2 VTS tests
Bug: 111563608
Test: ./VtsHalGraphicsComposerV2_2TargetTest
Change-Id: I081cb065e8a574e667e0f49fb7caac24c34c5535
2018-09-06 09:50:02 -07:00