Commit Graph

523 Commits

Author SHA1 Message Date
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
f87dcceb86 Merge "Wait until old ComposerClient is fully destroyed before recreating" into qt-dev am: d93c9f0c2d am: 5cb7cc40a7
am: 9c2e7c1cd2

Change-Id: I6251930043fbe98efb4c34735826d00719389655
2019-06-21 15:35:48 -07:00
Valerie Hau
5cb7cc40a7 Merge "Wait until old ComposerClient is fully destroyed before recreating" into qt-dev
am: d93c9f0c2d

Change-Id: I3bda1337b6c3fdea3c555f3887aa9a88dc04620c
2019-06-21 15:20:16 -07:00
Valerie Hau
bf967c9bdb Wait until old ComposerClient is fully destroyed before recreating
Possible race condition where EventCallbacks are registered before
old implementation deregisters on destruction.  Stems from fact that
strong pointer destruction does not mean the object has completely run
its destructor method

Bug: 135210708
Test: build, boot, VtsHalGraphicsComposerV2_1TargetTest
Change-Id: I0851f1197d8341854f5bdac5fbb08553fc32b710
2019-06-21 11:10:17 -07: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
Elliott Hughes
99894942f2 Remove -Wno-user-defined-warnings. am: 18ea3d2d5e am: 25769c2d3d am: f62cfc207f
am: ae0d307b51

Change-Id: I6d16eafcac82e6fbba9c9b724bc65aa7c2dbab67
2019-06-07 12:47:41 -07:00
Elliott Hughes
f62cfc207f Remove -Wno-user-defined-warnings. am: 18ea3d2d5e
am: 25769c2d3d

Change-Id: I4d646381b0ba63f00d3259b20b02df0d34c68cd6
2019-06-07 12:33:28 -07:00
Elliott Hughes
18ea3d2d5e Remove -Wno-user-defined-warnings.
Doesn't seem to be necessary.

Bug: http://b/134716967
Test: treehugger
Change-Id: I9617cf82c816ef072005f7baf2fceee9628313f5
2019-06-07 08:46:26 -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
ccc1805cb5 Merge "Put composer 2.3 in the right cpuset." into qt-dev
am: 862a9fdf6e

Change-Id: I1171130711329874233540dfd7d394d1de7d2a66
2019-05-13 12:51:42 -07:00
Peiyong Lin
a83af2b6fd Put composer 2.3 in the right cpuset.
the composer HAL should be in the system-background cpuset, but hwc 2.3 is not
in any cpuset. This patch restricts it to system-background.

BUG: 132559090
Test: Build, flash and boot.
Change-Id: I1739a6c049e195f6cc79b81fcba7a6fcb55b546a
2019-05-13 09:34:10 -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
248f72a9a0 Merge "Return display capability if getDisplayBrightnessSupport is not registered." into qt-dev 2019-05-08 17:59:55 +00:00
Valerie Hau
18af76ef9f Merge "Fix getDisplayCapabilitiesBasic VTS test" into qt-dev
am: 767a57fb19

Change-Id: I9477c6015409156e1d184ae70c15630e77f44025
2019-05-07 21:27:41 -07:00
TreeHugger Robot
767a57fb19 Merge "Fix getDisplayCapabilitiesBasic VTS test" into qt-dev 2019-05-08 03:17:43 +00:00
Valerie Hau
0db2322402 Merge "Fix setLayerCursorPosition test" into qt-dev
am: 34f36713bf

Change-Id: Ic4ebed51afcd11f766f82fa51658c0f871bca65a
2019-05-07 16:27:50 -07:00
TreeHugger Robot
34f36713bf Merge "Fix setLayerCursorPosition test" into qt-dev 2019-05-07 23:07:29 +00:00
Valerie Hau
66ea37f739 Merge "Fix setLayerCursorPosition Test" into qt-dev
am: 3da7baee06

Change-Id: I3a42c2d84d1cb76252ea808b6341b457d2f693c2
2019-05-07 13:11:46 -07:00
Valerie Hau
185d7a4b1f Fix setLayerCursorPosition test
Set composition type to Cursor

Bug: 132057336, 131181758
Test: VtsHalGraphicsComposerV2_1TargetTest
Change-Id: I03ae799358abcdbd0a1c39a13d30d76aa7712004
2019-05-07 12:35:49 -07:00
Valerie Hau
3da7baee06 Merge "Fix setLayerCursorPosition Test" into qt-dev 2019-05-07 19:10:24 +00:00
Valerie Hau
804857176a Fix getDisplayCapabilitiesBasic VTS test
Old test checked error code when calling getBrightnessSupport in the
getDisplayCapabilitiesBasic test.  However, it is possible that the
function is not implemented (UNSUPPORTED).  We want to return normally
and use the returned supported boolean to check this instead.

Bug: 132043561, 132056857
Test: VtsHalGraphicsComposerV2_3TargetTest
Change-Id: I94f8f39ba9129c4a8d939a5385538db3489c46b9
2019-05-07 11:52:27 -07:00
Valerie Hau
efe7621dac Fix setLayerCursorPosition Test
Bug: 131181758
Test: build, boot, VtsHalGraphicsComposerV2_1TargetTest
Change-Id: I70f4f8f64c16ce45eba70c2e47d3fa2913034eba
2019-05-07 08:06:05 -07:00
Valerie Hau
86a6f6e805 Merge "Call into validateBufferSize and getTransportSize" into qt-dev
am: 85b557fd1a

Change-Id: I367da83cd2e912d623698e28a6bda09a931aa33a
2019-05-06 09:29:05 -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
Valerie Hau
8e3fe149e1 Call into validateBufferSize and getTransportSize
After adding validateBufferSize and getTransportSize,
call into these functions if they have been implemented

This reverts commit 5e01b1411a.
Reason for revert: Merge once targets w/ gralloc0 dependency have been updated

Bug: 130669566
Test: build, boot
Change-Id: Ic20a62c5e73f517028a358548442d59c9cf91cdf
2019-04-24 21:46:01 +00:00
Valerie Hau
c04e71b89c Merge "Revert "Call into validateBufferSize and getTransportSize"" into qt-dev
am: a7904cd342

Change-Id: Ic407f3e433505dd9b6eb1024fd85e47e508b9a42
2019-04-23 16:24:51 -07:00
Valerie Hau
5e01b1411a Revert "Call into validateBufferSize and getTransportSize"
This reverts commit 69ee26a389.

Reason for revert: Break in Elfin

Bug: 130669566
Change-Id: Ia44fd087981770676a6887aa390c674c2855f4cb
2019-04-23 22:54:59 +00:00
Valerie Hau
95072f8c52 Merge "Call into validateBufferSize and getTransportSize" into qt-dev
am: 492399e5cd

Change-Id: I1d44634b47964a8ecb741b7e60c48de9025d2b9b
2019-04-23 15:22:18 -07:00
Valerie Hau
69ee26a389 Call into validateBufferSize and getTransportSize
After adding validateBufferSize and getTransportSize,
call into these functions if they have been implemented

Bug: 130669566
Test: build, boot
Change-Id: I445cb6122107a514bc0bf433a9e140dbe3122573
2019-04-22 17:50:02 -07:00
Steven Moreland
99712c08cc Update hidl makefiles for bpfmt
hidl-generated makefiles are now generated such that bpfmt(file) == file.

Bug: 67417008
Test: enable bpfmt hook
Change-Id: I53e5bf67a0d314e1b10c0ba0c7172a7af358ddcc
2019-04-18 18:13:05 -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
Peiyong Lin
65c7b60c65 Deprecate getDisplayBrightnessSupport.
Brightness is already a per display capability, we don't need this API.

BUG: 130313275
Test: build
Change-Id: I0a669aca19a2873df41bee82bd0e5e2775af8101
2019-04-15 14:04:10 -07:00
TreeHugger Robot
16b5d8a94a Merge "Fix composer@2.3 VTS tests." into qt-dev 2019-04-11 21:02:19 +00:00
Peiyong Lin
f13b305530 Fix composer@2.3 VTS tests.
Some required APIs must be implemented, and thus passthrough will always assume
the function pointers exist.

BUG: 130195295
Test: atest VtsHalGraphicsComposerV2_3Target
Change-Id: Ic2790363fcb116e66438697b1a2e64e71ffc8ac6
2019-04-10 16:25:05 -07:00
Marissa Wall
6952ddf596 mapper: support new usage and format
Update IMapper to use usage and format from
android.hardware.graphics.common@1.2. This enables support for
the usage HW_IMAGE_ENCODER and the format HSV_888 which is
already being defined and used.

Test: IMapper VTS tests
Bug: 79465976
Change-Id: I680beb6e5b1cd246c28d17f855f5c76a5831ce06
2019-04-10 12:29:05 -07:00
TreeHugger Robot
52f5328bd3 Merge "IMapper: change an error message" into qt-dev 2019-04-05 03:29:22 +00:00