platform/upstream/VK-GL-CTS.git
7 years agoMerge gerrit/vulkan-cts-1.0-dev into aosp/master am: 6c4fe5bd7a am: ebebe7d3b9 am...
Pyry Haulos [Tue, 22 Aug 2017 18:54:31 +0000 (18:54 +0000)]
Merge gerrit/vulkan-cts-1.0-dev into aosp/master am: 6c4fe5bd7a am: ebebe7d3b9 am: 99ddee4d78 am: 95e52cd9ec
am: 7a77e52d43

Change-Id: I4a496c17332afb3ffd03a7d92491322a14596dcb

7 years agoMerge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmal...
Tina Zhou [Tue, 22 Aug 2017 18:54:15 +0000 (18:54 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmallow-cts-dev am: a5af1b076f am: c1a3067570 am: effd4e62e5 am: 225502d2cc am: 4d04016fad am: 67dc3662e1 am: d64c35a5e6 am: 87a4ffcd07 am: 1094f351d1 am: 03feaffb1a am: efcf4f78ee
am: 74ef4ab285

Change-Id: I29e74330979d3b57f482b4f283c1467c59d5949f

7 years agoFix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA. am: ea5589c748 am...
Kenneth Graunke [Tue, 22 Aug 2017 18:53:54 +0000 (18:53 +0000)]
Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA. am: ea5589c748 am: 5613abd15f am: 1d0056de13 am: a4c8f24941 am: 1f1491167d am: 5ac1b7c804 am: f9ca1468a7 am: 9ee0dc70fc am: 62d5098093 am: e312424670 am: 9af7fa21c6
am: 7bf60302b5

Change-Id: Ibc1d7880fa423a2f9e630f3aa0aac5037577ccdb

7 years agoMerge "Fix internal format/type for 3D + depth/stencil negative API tests." into...
Tina Zhou [Tue, 22 Aug 2017 18:53:36 +0000 (18:53 +0000)]
Merge "Fix internal format/type for 3D + depth/stencil negative API tests." into marshmallow-cts-dev am: d962b86909 am: b5ef7ae649 am: 5702f3e5ae am: a8564b49db am: 3126b25e64 am: d1109cef09 am: bd34d84e25 am: 94862a44ee am: ec07f24c86 am: 5ed58f8a01 am: 4e8fdb91b5
am: ecdc707ec4

Change-Id: If50744cf102cd11d270c6ccc708b07397ef99967

7 years agoFix internal format/type for 3D + depth/stencil negative API tests. am: d2f3b468db...
Kenneth Graunke [Tue, 22 Aug 2017 18:53:18 +0000 (18:53 +0000)]
Fix internal format/type for 3D + depth/stencil negative API tests. am: d2f3b468db am: 1d20a4108b am: 200b407779 am: c6382e2e23 am: a9d8fe46b4 am: 4cf7816eac am: ca0f4e0cbb am: 84b462d0fb am: 7551b11773 am: 4fd6e71479 am: ca6b5e82b6
am: 4e6060126e

Change-Id: I87caa33e5330c5ae0711d3366947741b39e21d2c

7 years agoMerge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmal...
Tina Zhou [Tue, 22 Aug 2017 18:52:59 +0000 (18:52 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmallow-cts-dev am: a5af1b076f am: c2c27aa562 am: e5d1db1d75 am: 5eed9806da am: ac4f7241a1 am: 5fa7a52fee am: 9a321f7ce8 am: bffab895c0
am: 7e8b6796a2

Change-Id: Icb54b7c061cd1440635627e57de1522ba0385ac4

7 years agoFix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA. am: ea5589c748 am...
Kenneth Graunke [Tue, 22 Aug 2017 18:52:46 +0000 (18:52 +0000)]
Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA. am: ea5589c748 am: ab691d3f7e am: 5a273080f0 am: 6558869cb1 am: f9dac85ad7 am: d0e437bcd7 am: 6e33228e52 am: f91febb8f8
am: ca0848cd6d

Change-Id: I8f599f7520531811a1961712229f6383f4e5e284

7 years agoMerge "Fix internal format/type for 3D + depth/stencil negative API tests." into...
Tina Zhou [Tue, 22 Aug 2017 18:52:28 +0000 (18:52 +0000)]
Merge "Fix internal format/type for 3D + depth/stencil negative API tests." into marshmallow-cts-dev am: d962b86909 am: 080d0d5005 am: fa420a10e2 am: 54684887a6 am: 4c9703fccd am: ac60fa9f6c am: 0fa50ddbfb am: d815f2956a
am: dedab45cf8

Change-Id: Ic28c35dee7f4c23be6b27573a44621e8ed091531

7 years agoFix internal format/type for 3D + depth/stencil negative API tests. am: d2f3b468db...
Kenneth Graunke [Tue, 22 Aug 2017 18:52:14 +0000 (18:52 +0000)]
Fix internal format/type for 3D + depth/stencil negative API tests. am: d2f3b468db am: f5414b15bb am: 3a520ad416 am: 24aa8651ff am: 081007dbd3 am: 0209a8e015 am: c8400b10a3 am: 11b6b6353f
am: 1be822ebcd

Change-Id: Id18f2341a08c50fe4b8400cdbabdac55ad3f9a2b

7 years agoMerge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
Tina Zhou [Tue, 22 Aug 2017 18:51:57 +0000 (18:51 +0000)]
Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev am: 6cea9dbc62 am: fa02db7127 am: c099989faf am: 6570dc4744 am: 2cb5f272cf am: 1dabb154d5 am: a7d55ba5a8 am: ab0806ca20 am: 4b9b3cda97 am: 3cddb833e9 am: 0eb4e456b9
am: dc66ee85f1

Change-Id: I78db38565336bc29680261c5ed908d1ef5021467

7 years agoAdd the support to device connection via TCP/IP am: 4ccc9fd56c am: 548e356569 am...
Chun-Ta Lin [Tue, 22 Aug 2017 18:51:37 +0000 (18:51 +0000)]
Add the support to device connection via TCP/IP am: 4ccc9fd56c am: 548e356569 am: cceb936715 am: c627567fb6 am: 41db2c5a2a am: 71e9173e0f am: f1855db31d am: da8bbdcb87 am: a01270f22a am: 9f9439f10a am: 91dd1a43d2
am: 9560ef36a9

Change-Id: If6b2f829015110d39b3cfe4d51732077200a2dd5

7 years agoMerge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
Tina Zhou [Tue, 22 Aug 2017 18:51:16 +0000 (18:51 +0000)]
Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev am: 6cea9dbc62 am: 87d5ca1e30 am: 7ab3863a95 am: 889e4ea697 am: e82b53127b am: 2b6f277417 am: 4eb2933ecd am: 87d753030d
am: 3c63160390

Change-Id: Iea04b4304a30a16f60bb854f6c544d835a0640a4

7 years agoAdd the support to device connection via TCP/IP am: 4ccc9fd56c am: 7e2d9f83ff am...
Chun-Ta Lin [Tue, 22 Aug 2017 18:50:52 +0000 (18:50 +0000)]
Add the support to device connection via TCP/IP am: 4ccc9fd56c am: 7e2d9f83ff am: 1fcf1c0083 am: 6cab656d32 am: f6caf46da6 am: ba4c42a3d4 am: a91e820425 am: 2d0071593e
am: 29dc0b5601

Change-Id: I3506a93f603d8521bdf363c5da7872362fc54b5e

7 years agoAdd runtime to CtsDeqpTestCases am: bf0076a424 am: dc61e9cf25 am: b2c1391b7b am:...
Aaron Holden [Tue, 22 Aug 2017 18:50:30 +0000 (18:50 +0000)]
Add runtime to CtsDeqpTestCases am: bf0076a424 am: dc61e9cf25 am: b2c1391b7b am: 7e127cca59 am: 3b7ad55647 am: 08aa70d2e1 am: 87aab30098
am: d953d1d2cf

Change-Id: I1689ba71914f65c7f50f30a1252dc895f5b52e4f

7 years agoDo not remove old SPIR-V binaries before running vk-build-programs am: b28ca98dd6...
Pyry Haulos [Tue, 22 Aug 2017 18:50:13 +0000 (18:50 +0000)]
Do not remove old SPIR-V binaries before running vk-build-programs am: b28ca98dd6 am: 799a2912dc am: f252de8900 am: 44272886a5
am: ea499cffd5

Change-Id: Ia5393c881ce8ae8161a1e4c897b9cb4555525dae

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: c9061d1b52 am: 3e3c5a179e...
Pyry Haulos [Tue, 22 Aug 2017 18:49:52 +0000 (18:49 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: c9061d1b52 am: 3e3c5a179e am: 249f158858 am: 1c1ca2aea2
am: 5fa25468f3

Change-Id: I1fa8b7359186148cbc72bdb049bcd7e01ce32c1c

7 years agoMerge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmal...
Tina Zhou [Tue, 22 Aug 2017 18:49:16 +0000 (18:49 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmallow-cts-dev am: a5af1b076f am: c1a3067570 am: effd4e62e5 am: 225502d2cc am: 4d04016fad am: 67dc3662e1 am: d64c35a5e6 am: 87a4ffcd07 am: 1094f351d1 am: 5d63743a35 am: a1b92b6629
am: 2cd0a51dff

Change-Id: Ie579618f0c936d201a57ed72470f556cd161f278

7 years agoFix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA. am: ea5589c748 am...
Kenneth Graunke [Tue, 22 Aug 2017 18:48:54 +0000 (18:48 +0000)]
Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA. am: ea5589c748 am: 5613abd15f am: 1d0056de13 am: a4c8f24941 am: 1f1491167d am: 5ac1b7c804 am: f9ca1468a7 am: 9ee0dc70fc am: 62d5098093 am: c32e4661f4 am: d6c2c7e3ec
am: 419280b223

Change-Id: I6061fbcebba6c6a59b02f80b225f7d449276a951

7 years agoMerge "Fix internal format/type for 3D + depth/stencil negative API tests." into...
Tina Zhou [Tue, 22 Aug 2017 18:48:34 +0000 (18:48 +0000)]
Merge "Fix internal format/type for 3D + depth/stencil negative API tests." into marshmallow-cts-dev am: d962b86909 am: b5ef7ae649 am: 5702f3e5ae am: a8564b49db am: 3126b25e64 am: d1109cef09 am: bd34d84e25 am: 94862a44ee am: ec07f24c86 am: f7f5ebb64f am: cb58846360
am: cdb2188db6

Change-Id: I35cbd64a9ab0152edbae7f281b7adb7ba2f87d17

7 years agoFix internal format/type for 3D + depth/stencil negative API tests. am: d2f3b468db...
Kenneth Graunke [Tue, 22 Aug 2017 18:48:15 +0000 (18:48 +0000)]
Fix internal format/type for 3D + depth/stencil negative API tests. am: d2f3b468db am: 1d20a4108b am: 200b407779 am: c6382e2e23 am: a9d8fe46b4 am: 4cf7816eac am: ca0f4e0cbb am: 84b462d0fb am: 7551b11773 am: 74de83305b am: be0897e375
am: 4761de18a4

Change-Id: I251ae582f114fca2e9c976055a427a07eb39cffa

7 years agoMerge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmal...
Tina Zhou [Tue, 22 Aug 2017 18:47:58 +0000 (18:47 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmallow-cts-dev am: a5af1b076f am: c2c27aa562 am: e5d1db1d75 am: 5eed9806da am: ac4f7241a1 am: 5fa7a52fee am: 1a64a06d85 am: d7549d5820
am: a018587f17

Change-Id: I0de435189751a73f7a566c5ed1dc7f8d49c05936

7 years agoFix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA. am: ea5589c748 am...
Kenneth Graunke [Tue, 22 Aug 2017 18:47:43 +0000 (18:47 +0000)]
Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA. am: ea5589c748 am: ab691d3f7e am: 5a273080f0 am: 6558869cb1 am: f9dac85ad7 am: d0e437bcd7 am: 11905e704d am: 9264518ac0
am: 9fd02961a0

Change-Id: Ib6c2deffb6fe5a10d600703b9921560eecd4372e

7 years agoMerge "Fix internal format/type for 3D + depth/stencil negative API tests." into...
Tina Zhou [Tue, 22 Aug 2017 18:47:27 +0000 (18:47 +0000)]
Merge "Fix internal format/type for 3D + depth/stencil negative API tests." into marshmallow-cts-dev am: d962b86909 am: 080d0d5005 am: fa420a10e2 am: 54684887a6 am: 4c9703fccd am: ac60fa9f6c am: 4471efc917 am: 1027374bcb
am: 483f1c32d6

Change-Id: I214192106a477b6ddf0b7ed81a14a984e8eaad45

7 years agoFix internal format/type for 3D + depth/stencil negative API tests. am: d2f3b468db...
Kenneth Graunke [Tue, 22 Aug 2017 18:47:12 +0000 (18:47 +0000)]
Fix internal format/type for 3D + depth/stencil negative API tests. am: d2f3b468db am: f5414b15bb am: 3a520ad416 am: 24aa8651ff am: 081007dbd3 am: 0209a8e015 am: d0280b2a59 am: 2fb1860fe7
am: 0e4bb636b7

Change-Id: Ifc3606075c4a514cee89df3f24102bf8fd654a76

7 years agoMerge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmal...
Tina Zhou [Tue, 22 Aug 2017 18:46:56 +0000 (18:46 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmallow-cts-dev am: a5af1b076f am: c2c27aa562 am: 3dda7ae2d2 am: 68289ab9d7 am: 9116124d63 am: 6b756fb6c2
am: f92dfc438c

Change-Id: Ie6b73cbf1c7b5b8ce3c43a1ed64cdd28b076dc98

7 years agoFix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA. am: ea5589c748 am...
Kenneth Graunke [Tue, 22 Aug 2017 18:46:39 +0000 (18:46 +0000)]
Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA. am: ea5589c748 am: ab691d3f7e am: d131139629 am: fe70f6f1db am: 8392b8aa99 am: 674221ac33
am: f63e79f56a

Change-Id: I910338e36f2020cd86f4d6e326dc81b68e990cff

7 years agoMerge "Fix internal format/type for 3D + depth/stencil negative API tests." into...
Tina Zhou [Tue, 22 Aug 2017 18:46:21 +0000 (18:46 +0000)]
Merge "Fix internal format/type for 3D + depth/stencil negative API tests." into marshmallow-cts-dev am: d962b86909 am: 080d0d5005 am: e5f339cae5 am: d7a4a648f5 am: a01fd2a043 am: aa14c3049e
am: 7baaa148df

Change-Id: Id5e799d3be384628ae3046d2ff8157e7e7c231df

7 years agoFix internal format/type for 3D + depth/stencil negative API tests. am: d2f3b468db...
Kenneth Graunke [Tue, 22 Aug 2017 18:45:58 +0000 (18:45 +0000)]
Fix internal format/type for 3D + depth/stencil negative API tests. am: d2f3b468db am: f5414b15bb am: 7098357b48 am: a660b9fc59 am: 4c20e47b95 am: 345a4506b6
am: 76bd78b3d9

Change-Id: I23be5946a2ae86876031859fd94a83a3d0b40f87

7 years agoMerge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
Tina Zhou [Tue, 22 Aug 2017 18:45:43 +0000 (18:45 +0000)]
Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev am: 6cea9dbc62 am: fa02db7127 am: c099989faf am: 6570dc4744 am: 2cb5f272cf am: 1dabb154d5 am: a7d55ba5a8 am: ab0806ca20 am: 4b9b3cda97 am: 3cc5c51830 am: 1afe927bb0
am: 98ebd8d961

Change-Id: Ic135ed17dd8003c82b431276382a080ac8355a03

7 years agoAdd the support to device connection via TCP/IP am: 4ccc9fd56c am: 548e356569 am...
Chun-Ta Lin [Tue, 22 Aug 2017 18:45:30 +0000 (18:45 +0000)]
Add the support to device connection via TCP/IP am: 4ccc9fd56c am: 548e356569 am: cceb936715 am: c627567fb6 am: 41db2c5a2a am: 71e9173e0f am: f1855db31d am: da8bbdcb87 am: a01270f22a am: 4596ed3ac8 am: 0ff897b3a8
am: 9cd628225a

Change-Id: I975b3072ed639151d11ac7bdff44609ceb5636ee

7 years agoMerge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
Tina Zhou [Tue, 22 Aug 2017 18:45:17 +0000 (18:45 +0000)]
Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev am: 6cea9dbc62 am: 87d5ca1e30 am: 7ab3863a95 am: 889e4ea697 am: e82b53127b am: 2b6f277417 am: 97f422dfa4 am: de7d1acf8f
am: 228dfe6ecd

Change-Id: I3db25b442467b43fad0962268e0d74ac2a9b4f58

7 years agoAdd the support to device connection via TCP/IP am: 4ccc9fd56c am: 7e2d9f83ff am...
Chun-Ta Lin [Tue, 22 Aug 2017 18:44:55 +0000 (18:44 +0000)]
Add the support to device connection via TCP/IP am: 4ccc9fd56c am: 7e2d9f83ff am: 1fcf1c0083 am: 6cab656d32 am: f6caf46da6 am: ba4c42a3d4 am: 356db64cc0 am: 6305f11672
am: bea6537d03

Change-Id: Ibfb86d06342642fc8106ec4b1eb00f4333daa695

7 years agoMerge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev...
Tina Zhou [Tue, 22 Aug 2017 18:44:37 +0000 (18:44 +0000)]
Merge "Add the support to device connection via TCP/IP" into marshmallow-cts-dev am: 6cea9dbc62 am: 87d5ca1e30 am: 42149e7b88 am: ed2847e325 am: 2be672f23c am: 95d7aaf93a
am: c354904afb

Change-Id: I48fe8cbcf8e3a3cb2a9590828254ddc4f2e1d710

7 years agoAdd the support to device connection via TCP/IP am: 4ccc9fd56c am: 7e2d9f83ff am...
Chun-Ta Lin [Tue, 22 Aug 2017 18:44:15 +0000 (18:44 +0000)]
Add the support to device connection via TCP/IP am: 4ccc9fd56c am: 7e2d9f83ff am: a2c0c6be9d am: 1459961551 am: 02ac9c36cf am: f7dc524378
am: 33ce8c221e

Change-Id: I5a934382bfd023a0ce9ef89e03a405a0eeeb9665

7 years agoMerge "Build Deqp runner out of TF source"
Julien Desprez [Tue, 22 Aug 2017 18:43:36 +0000 (18:43 +0000)]
Merge "Build Deqp runner out of TF source"
am: b3d08079e8

Change-Id: Id49e57be10f4e76e548353067543d92a1e1ef823

7 years agoAdd runtime to CtsDeqpTestCases am: bf0076a424 am: dc61e9cf25 am: b2c1391b7b am:...
Aaron Holden [Tue, 22 Aug 2017 18:43:20 +0000 (18:43 +0000)]
Add runtime to CtsDeqpTestCases am: bf0076a424 am: dc61e9cf25 am: b2c1391b7b am: 7e127cca59 am: 3b7ad55647 am: 93c809e3de am: e30caa8acb
am: 5cacd0af39

Change-Id: I7dc81c160e59f796b3b4a44d27b67761c64eaffd

7 years agoAdd runtime to CtsDeqpTestCases am: bf0076a424 am: ac5e3c7c2d am: 1ee10d6a16 am:...
Aaron Holden [Tue, 22 Aug 2017 18:43:06 +0000 (18:43 +0000)]
Add runtime to CtsDeqpTestCases am: bf0076a424 am: ac5e3c7c2d am: 1ee10d6a16 am: 6890f381ac am: e4bdb0334b
am: 7a1b12f4ca

Change-Id: I6f69a2c91ee9420b83aca932bfa03d7318700ae8

7 years agoMerge "Add runtime to CtsDeqpTestCases"
Aaron Holden [Tue, 22 Aug 2017 18:42:52 +0000 (18:42 +0000)]
Merge "Add runtime to CtsDeqpTestCases"
am: d019912a4b

Change-Id: I32bacadb7ff5fe6730401296c868acc088c325f0

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 8bff020a8a am: c047913d3d...
Pyry Haulos [Tue, 22 Aug 2017 18:42:12 +0000 (18:42 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 8bff020a8a am: c047913d3d am: f16b3558e6 am: 2ca88576a8
am: 5ae2308375

Change-Id: I0df96e232eacd5c725eb0ed55acf0af3ff047bb2

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 43e50db72d am: ae92b0c427...
Pyry Haulos [Tue, 22 Aug 2017 18:41:51 +0000 (18:41 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 43e50db72d am: ae92b0c427 am: c133ee71ca am: f50a42b81b
am: 43504e99d2

Change-Id: Ic3505c2eca7370451f5243c88a77bc41e226932c

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 812d768b55 am: 8e32ffdbc2...
Pyry Haulos [Tue, 22 Aug 2017 18:41:28 +0000 (18:41 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 812d768b55 am: 8e32ffdbc2 am: df58e82c56
am: 6d74db8369

Change-Id: Ia80c952dd9e5e591708ec5b39c6adaf4ac612dcb

7 years agoMerge "Check for EXT_color_buffer_float in read_pixels_fbo_format_mismatch" into...
Tina Zhou [Tue, 22 Aug 2017 18:41:05 +0000 (18:41 +0000)]
Merge "Check for EXT_color_buffer_float in read_pixels_fbo_format_mismatch" into nougat-cts-dev am: 544e0e3b1d am: af005183c6 am: 3af556fa23 am: 4b09d218b7 am: ca2cf0c2cf am: 233e7457a7
am: ccf3f69c8a

Change-Id: I2c66ef4f71050c210ccddb3e42a8a98b892a34db

7 years agoCheck for EXT_color_buffer_float in read_pixels_fbo_format_mismatch am: 37e360591e...
Pyry Haulos [Tue, 22 Aug 2017 18:40:33 +0000 (18:40 +0000)]
Check for EXT_color_buffer_float in read_pixels_fbo_format_mismatch am: 37e360591e am: b403d93667 am: 7d57783e07 am: 2c96ee9d1e am: bf7e838fac am: 219cf679ff
am: cacc636e9f

Change-Id: I73a10918dcd4eae19719db8ae746899fa814776f

7 years agoMerge "CP: Use empty region when buffer age is not supported" into nougat-cts-dev...
Tina Zhou [Tue, 22 Aug 2017 18:40:13 +0000 (18:40 +0000)]
Merge "CP: Use empty region when buffer age is not supported" into nougat-cts-dev am: b82263e2ad am: bde74aec80 am: c3471eb1c7 am: 6389ecabb6 am: 1e0c7ca177 am: 58df8ce64e
am: 073154dfee

Change-Id: I60397d071e9a698304f5e6b94482efefdd1c9172

7 years agoCP: Use empty region when buffer age is not supported am: 8230646213 am: 3e8d57ed32...
Kalle Raita [Tue, 22 Aug 2017 18:39:55 +0000 (18:39 +0000)]
CP: Use empty region when buffer age is not supported am: 8230646213 am: 3e8d57ed32 am: 24169a1c92 am: 5f95cd5862 am: 8dff8112ff am: 5c28f2b581
am: 6fa1960402

Change-Id: I008de61d086daa1ee04baebb876ca2cc17b6cbd8

7 years agoMerge "Fix deStrnlen fall-back implementation" into nougat-cts-dev am: a04db6628e...
Tina Zhou [Tue, 22 Aug 2017 18:39:38 +0000 (18:39 +0000)]
Merge "Fix deStrnlen fall-back implementation" into nougat-cts-dev am: a04db6628e am: 4e28a717a1 am: 9bcd2cdcae am: 63dabf3db4 am: f05d10eaf2 am: 4a8439bd62
am: 0621c907c0

Change-Id: If0bcb212097a0be4a9ef8b30cd3aa9d94098df99

7 years agoFix deStrnlen fall-back implementation am: 54ebe093a9 am: 7595269a79 am: a1e1fe14f0...
Pyry Haulos [Tue, 22 Aug 2017 18:39:18 +0000 (18:39 +0000)]
Fix deStrnlen fall-back implementation am: 54ebe093a9 am: 7595269a79 am: a1e1fe14f0 am: e21b847ac0 am: 071f3960da am: 7eaa5cb36c
am: 96676328c7

Change-Id: I470ecaa5aeee650a35f52fd283c5394da2f59104

7 years agoMerge "Remove a few preprocessor cases testing undefined behavior" into nougat-cts...
Tina Zhou [Tue, 22 Aug 2017 18:39:02 +0000 (18:39 +0000)]
Merge "Remove a few preprocessor cases testing undefined behavior" into nougat-cts-dev am: 4275d2099c am: 6fd85eb3eb am: 2ba9b99e0a am: ff244078e9 am: 297c3f45f7 am: 405981b3ee
am: f329d4e8c8

Change-Id: I0281806a1c628d8d3beea78dcaa805e2988ea969

7 years agoRemove a few preprocessor cases testing undefined behavior am: e5f7483417 am: b9a2f1b...
Pyry Haulos [Tue, 22 Aug 2017 18:38:47 +0000 (18:38 +0000)]
Remove a few preprocessor cases testing undefined behavior am: e5f7483417 am: b9a2f1b768 am: d280df3576 am: 5655cfc165 am: 7f6529bea6 am: ca36b82b31
am: e381cec4d9

Change-Id: Ib4670a11b2aac261de13418c19ea56eed3e0dfe0

7 years agoMerge "Check for EXT_color_buffer_float in read_pixels_fbo_format_mismatch" into...
Tina Zhou [Tue, 22 Aug 2017 18:38:03 +0000 (18:38 +0000)]
Merge "Check for EXT_color_buffer_float in read_pixels_fbo_format_mismatch" into nougat-cts-dev am: 544e0e3b1d am: 05e378a71d am: 618ea5cfea am: 32b5b828d5
am: f380291785

Change-Id: Idce2b1e6e94ac9a7ca37122836d8430ee2383b6f

7 years agoCheck for EXT_color_buffer_float in read_pixels_fbo_format_mismatch am: 37e360591e...
Pyry Haulos [Tue, 22 Aug 2017 18:37:48 +0000 (18:37 +0000)]
Check for EXT_color_buffer_float in read_pixels_fbo_format_mismatch am: 37e360591e am: 101d60fc56 am: feb5fa2e2d am: 6ede2d6d32
am: b9d3aee115

Change-Id: I1afcc86ff568093238dc7ccb32bcf0bc7df6adb8

7 years agoMerge "CP: Use empty region when buffer age is not supported" into nougat-cts-dev...
Tina Zhou [Tue, 22 Aug 2017 18:37:35 +0000 (18:37 +0000)]
Merge "CP: Use empty region when buffer age is not supported" into nougat-cts-dev am: b82263e2ad am: a2ce844bcb am: 82380ac1e2 am: 9027f9b8a4
am: f1ab474d07

Change-Id: I78ad3463b34adb1dc51f4d2fb3a58964ec609734

7 years agoCP: Use empty region when buffer age is not supported am: 8230646213 am: 5997f85ae1...
Kalle Raita [Tue, 22 Aug 2017 18:37:20 +0000 (18:37 +0000)]
CP: Use empty region when buffer age is not supported am: 8230646213 am: 5997f85ae1 am: 61e8a65852 am: 11a76fa000
am: 9ec536d1e1

Change-Id: I3206ed8f12720dd90d17dafb52c4a7a3390cd1b9

7 years agoMerge "Fix deStrnlen fall-back implementation" into nougat-cts-dev am: a04db6628e...
Tina Zhou [Tue, 22 Aug 2017 18:36:55 +0000 (18:36 +0000)]
Merge "Fix deStrnlen fall-back implementation" into nougat-cts-dev am: a04db6628e am: b484689e86 am: b7b7984913 am: d12482a525
am: ccb8fde217

Change-Id: If0dc13f5f66dad71be6926a44cdaa96216dde9fc

7 years agoFix deStrnlen fall-back implementation am: 54ebe093a9 am: d4fee8c43b am: 778bc2435a...
Pyry Haulos [Tue, 22 Aug 2017 18:36:38 +0000 (18:36 +0000)]
Fix deStrnlen fall-back implementation am: 54ebe093a9 am: d4fee8c43b am: 778bc2435a am: 583765b8b2
am: 859833aab0

Change-Id: Id50efa7c952aeb588cd03c886e7f68e822bf9e67

7 years agoMerge "Remove a few preprocessor cases testing undefined behavior" into nougat-cts...
Tina Zhou [Tue, 22 Aug 2017 18:36:22 +0000 (18:36 +0000)]
Merge "Remove a few preprocessor cases testing undefined behavior" into nougat-cts-dev am: 4275d2099c am: 75cbc40ebf am: 6ef846f260 am: 99e0f4ab5e
am: 18dcbb32ef

Change-Id: I4f03e156e1ac6972c1f4327749a3c699cf7580a7

7 years agoresolve merge conflicts of e5f7483 to master am: c4598ea31b am: 8e2e181bd6 am: cd63b8bc85
Pyry Haulos [Tue, 22 Aug 2017 18:36:05 +0000 (18:36 +0000)]
resolve merge conflicts of e5f7483 to master am: c4598ea31b am: 8e2e181bd6 am: cd63b8bc85
am: e713959f89

Change-Id: I2b1ca5f8b99ea1162fd71d0e729e377604086a9b

7 years agoMerge "Check for shader type support in negative precise tests" into nougat-cts-dev...
Tina Zhou [Tue, 22 Aug 2017 18:35:51 +0000 (18:35 +0000)]
Merge "Check for shader type support in negative precise tests" into nougat-cts-dev am: c30d04b8e7 am: 3766bd80e2 am: 298ccacd02 am: 39fb3ed56c am: 7d8ad93b46 am: 7398574447
am: 533566c569

Change-Id: I542b32d0d7e22d672805f6c12f98a757ad4a70e6

7 years agoCheck for shader type support in negative precise tests am: 4a3a2d79a0 am: dd142e90db...
Pyry Haulos [Tue, 22 Aug 2017 18:35:38 +0000 (18:35 +0000)]
Check for shader type support in negative precise tests am: 4a3a2d79a0 am: dd142e90db am: def3338070 am: 6dee5b33a4 am: 5d2d0738a7 am: 9911b7cbe5
am: a01df562fa

Change-Id: I1c1afb8b97f35254d22ad7aaacad442d9953277f

7 years agoMerge "Check for shader type support in negative shader directive tests" into nougat...
Tina Zhou [Tue, 22 Aug 2017 18:35:23 +0000 (18:35 +0000)]
Merge "Check for shader type support in negative shader directive tests" into nougat-cts-dev am: a3513e86ff am: 5b8758faed am: 17116fd375 am: 8ab480579c am: 2e202ebf40 am: 7ea4640e9e
am: 9627603c6d

Change-Id: I41734946eae685047f83ec3bcf85c48d44208a25

7 years agoCheck for shader type support in negative shader directive tests am: cf6e6ab134 am...
Pyry Haulos [Tue, 22 Aug 2017 18:35:05 +0000 (18:35 +0000)]
Check for shader type support in negative shader directive tests am: cf6e6ab134 am: b9611b0106 am: 86ccb86120 am: cd315fa2d3 am: a4d11f02f8 am: f5b5eae442
am: 848bbeaee8

Change-Id: I3420e52a466376d76437df277ca5bebb8afe5b76

7 years agoMerge "Check for shader type support in negative precise tests" into nougat-cts-dev...
Tina Zhou [Tue, 22 Aug 2017 18:34:33 +0000 (18:34 +0000)]
Merge "Check for shader type support in negative precise tests" into nougat-cts-dev am: c30d04b8e7 am: 5d4bf790d7 am: c5237d7240 am: b2429a3bf2
am: 8db9edd40f

Change-Id: I9587fd7c889b757c1766a6dd6e6989aff5a0ceee

7 years agoCheck for shader type support in negative precise tests am: 4a3a2d79a0 am: 09137b73d2...
Pyry Haulos [Tue, 22 Aug 2017 18:34:19 +0000 (18:34 +0000)]
Check for shader type support in negative precise tests am: 4a3a2d79a0 am: 09137b73d2 am: 21efe91dfc am: 39ac26a1e7
am: ce93ba4342

Change-Id: I321cefdf0520d6b2db06ba185f566941a8b00957

7 years agoMerge "Check for shader type support in negative shader directive tests" into nougat...
Tina Zhou [Tue, 22 Aug 2017 18:34:07 +0000 (18:34 +0000)]
Merge "Check for shader type support in negative shader directive tests" into nougat-cts-dev am: a3513e86ff am: 6fa068040b am: 444946b13a am: a2f17e5e54
am: 5b8c86ea92

Change-Id: Id7fc06cc78039de161a4ceec108dd78d785325b4

7 years agoCheck for shader type support in negative shader directive tests am: cf6e6ab134 am...
Pyry Haulos [Tue, 22 Aug 2017 18:33:53 +0000 (18:33 +0000)]
Check for shader type support in negative shader directive tests am: cf6e6ab134 am: 3dd07d23f6 am: 29d64a978d am: 83815b4221
am: d108cb3faf

Change-Id: Ifbc875c100bdf35a528747a4318abecb7e28e35d

7 years agoFix -Wc++11-narrowing warnings am: 41460f757d am: 90b58859d2 am: f2ca32c7af
Colin Cross [Tue, 22 Aug 2017 18:33:39 +0000 (18:33 +0000)]
Fix -Wc++11-narrowing warnings am: 41460f757d am: 90b58859d2 am: f2ca32c7af
am: dc163299e9

Change-Id: I0c44dab71a70ea04a4e2e91fb8772a169f089513

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 5f69b27051 am: 399f8849cf...
Pyry Haulos [Tue, 22 Aug 2017 18:33:27 +0000 (18:33 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 5f69b27051 am: 399f8849cf am: fabd9f85b1
am: 9265197311

Change-Id: Ic2309f6d074825c627da75283f9add3fa05dcafc

7 years agoMerge "Only Windows has strnlen_s." am: 6d40724402 am: a0e2e2b4be am: 294fcf964c...
Elliott Hughes [Tue, 22 Aug 2017 18:33:13 +0000 (18:33 +0000)]
Merge "Only Windows has strnlen_s." am: 6d40724402 am: a0e2e2b4be am: 294fcf964c am: da2bd89612
am: cb418c345c

Change-Id: Icc2fb533a54ede2a190afd884fdebf29882d9be3

7 years agoCherry-pick image_format_properties changes from upstream am: 43227ff1db am: 2ede225b...
Pyry Haulos [Tue, 22 Aug 2017 18:32:51 +0000 (18:32 +0000)]
Cherry-pick image_format_properties changes from upstream am: 43227ff1db am: 2ede225b00 am: 12ead731f2 am: e14b1813e4 am: 2c374ee3a2 am: 21b557d3c3
am: 043191f5ad

Change-Id: I089f3bb3e64e7945468a03fb035f7f0838975050

7 years agoCherry-pick image_format_properties changes from upstream am: 43227ff1db am: 40996a98...
Pyry Haulos [Tue, 22 Aug 2017 18:32:37 +0000 (18:32 +0000)]
Cherry-pick image_format_properties changes from upstream am: 43227ff1db am: 40996a98a2 am: 3edf5fa179 am: 2e3f075e22 am: 91762df407
am: e6f0b0e41d

Change-Id: Iae16e8a7ff0467d44a27f01a3b29d14c2516f526

7 years agoCherry-pick image_format_properties changes from upstream am: 43227ff1db am: 2ede225b...
Pyry Haulos [Tue, 22 Aug 2017 18:32:16 +0000 (18:32 +0000)]
Cherry-pick image_format_properties changes from upstream am: 43227ff1db am: 2ede225b00 am: 6b6e193ea7 am: 94316bd1db
am: 42b75f6993

Change-Id: Id066ba0e162ed18c6db284b1f8b70a2775396884

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 984f29db76 am: 26c200ccb2...
Pyry Haulos [Tue, 22 Aug 2017 18:32:01 +0000 (18:32 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 984f29db76 am: 26c200ccb2 am: 853e372b40 am: 1319ab2985
am: 3342f78603

Change-Id: Ibd49a7e885e0f192abd4d4efe9b2b35294714f29

7 years agoRevert "DO NOT MERGE Check only valid usages in image format query tests" am: 2a98f95...
Pyry Haulos [Tue, 22 Aug 2017 18:31:45 +0000 (18:31 +0000)]
Revert "DO NOT MERGE Check only valid usages in image format query tests" am: 2a98f95c03 am: 6897aa1d74  -s ours am: 113a395a8c  -s ours
am: 98a0e7017a  -s ours

Change-Id: I83da3cfba139f8992e98ec0a221e52116cbeee30

7 years agoDO NOT MERGE Check only valid usages in image format query tests am: c41d4d8427 am...
Mika Isojrvi [Tue, 22 Aug 2017 18:31:33 +0000 (18:31 +0000)]
DO NOT MERGE Check only valid usages in image format query tests am: c41d4d8427 am: 10bd378424  -s ours am: c7a8034995  -s ours
am: 1143c73d02  -s ours

Change-Id: I41fcee52b94e3ff71932463ced77857ea05937a8

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 2f2ce0f048 am: ea762c3174...
Pyry Haulos [Tue, 22 Aug 2017 18:31:17 +0000 (18:31 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 2f2ce0f048 am: ea762c3174 am: 54fec9051e am: 7de6e0f3dd
am: 12568ee7fd

Change-Id: I12dbc1c0ca6b861b37b9f5168617d69226dfd35e

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: c85249943b am: c5b63ae362...
Pyry Haulos [Tue, 22 Aug 2017 18:31:02 +0000 (18:31 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: c85249943b am: c5b63ae362 am: 49c86a205b am: f03289c1cf
am: c27db44702

Change-Id: Ie5ce6ec390de11dffc5e48bd4ed3775d6e8f4c12

7 years agoAdd license to a few utility scripts am: f85b5c9705 am: b30ed56bec am: 824fd20932...
Pyry Haulos [Tue, 22 Aug 2017 18:30:47 +0000 (18:30 +0000)]
Add license to a few utility scripts am: f85b5c9705 am: b30ed56bec am: 824fd20932 am: 94a8958855
am: 46e9b2768f

Change-Id: Iaabd5db4c31949a44c4fea798d2b87f409a4f7bb

7 years agoMerge "Get rid of indirection when adding module directories in build" am: fb175316d0...
Pyry Haulos [Tue, 22 Aug 2017 18:30:34 +0000 (18:30 +0000)]
Merge "Get rid of indirection when adding module directories in build" am: fb175316d0 am: 25272a76cb am: 54b623bd05 am: 958ecd3143
am: 56687324bc

Change-Id: Ife161ecc6aab6f3e064ae2776cd82bd48ba2a7be

7 years agoMerge "Remove few obsolete target files" am: 082248137d am: 6798ebf3c7 am: 9db4f9ce9a...
Pyry Haulos [Tue, 22 Aug 2017 18:30:19 +0000 (18:30 +0000)]
Merge "Remove few obsolete target files" am: 082248137d am: 6798ebf3c7 am: 9db4f9ce9a am: 89ccd0912b
am: 3bde1037f1

Change-Id: I1914948350c6b265b935a39e981a74336ffb8a5b

7 years agoMerge "Add license header to main CMake files" am: e2b5873fd8 am: a6f3496c76 am:...
Pyry Haulos [Tue, 22 Aug 2017 18:30:04 +0000 (18:30 +0000)]
Merge "Add license header to main CMake files" am: e2b5873fd8 am: a6f3496c76 am: 5f34112b30 am: 3b110e4995
am: 8c03813598

Change-Id: Ic979fa90a81251b58889b961f2ef97b1fa62590c

7 years agoMerge "Be more civil in comments" am: 775f724bcc am: c678e93e1c am: a1669de8bd am...
Pyry Haulos [Tue, 22 Aug 2017 18:29:44 +0000 (18:29 +0000)]
Merge "Be more civil in comments" am: 775f724bcc am: c678e93e1c am: a1669de8bd am: 29fff31289
am: f4b3d48ba2

Change-Id: Ia2e6dfe96b3e9a702f9d1aba71132d60a4927810

7 years agoRemove obsolete cmake toolchain files am: 2e95c38041 am: c196d5602f am: 2f6f15d081...
Pyry Haulos [Tue, 22 Aug 2017 18:29:24 +0000 (18:29 +0000)]
Remove obsolete cmake toolchain files am: 2e95c38041 am: c196d5602f am: 2f6f15d081 am: 64ba23bee4
am: 8be5509f1d

Change-Id: I959424d0d02b05b10770482c6f2ea9ed201a8ff9

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: d04e72de0b am: eac76634d8...
Pyry Haulos [Tue, 22 Aug 2017 18:29:08 +0000 (18:29 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: d04e72de0b am: eac76634d8 am: ee7ef1e2e9 am: f3d24e55d9
am: 6c60542c23

Change-Id: I5448311acc22c4dcfc553a17bdcd351babe2e8ed

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: b3729a6431 am: 1e31d89c2a...
Pyry Haulos [Tue, 22 Aug 2017 18:28:56 +0000 (18:28 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: b3729a6431 am: 1e31d89c2a am: d1438e5585 am: f1fdce7bb4
am: 3dbc293d8b

Change-Id: I5d8b6783616995d1b6c02e8c349b41d9f3f3acae

7 years agoUse LDR decompression in reference for SRGB ASTC formats. am: 4db2fa91a1 am: 723b0851...
Mika Isojrvi [Tue, 22 Aug 2017 18:28:41 +0000 (18:28 +0000)]
Use LDR decompression in reference for SRGB ASTC formats. am: 4db2fa91a1 am: 723b085184 am: 3cbc836706 am: 2ffe1e252e
am: 8c42018db1

Change-Id: I8467a6bf9b6164cc91a90ec9fe02fd3048315470

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 1a6d3c9ee7 am: 1d692218d3...
Pyry Haulos [Tue, 22 Aug 2017 18:28:29 +0000 (18:28 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 1a6d3c9ee7 am: 1d692218d3 am: 927151c175 am: 96a56feb11
am: 4fa5bb8303

Change-Id: I839b89f855df6bc6354b31ef0b5a7e65dae82154

7 years agoDO NOT MERGE Allow old behavior in image format property tests am: a25304112b am...
Pyry Haulos [Tue, 22 Aug 2017 18:28:16 +0000 (18:28 +0000)]
DO NOT MERGE Allow old behavior in image format property tests am: a25304112b am: a9ae8b26a2 am: 6ae5082e37  -s ours
am: 7c87437844  -s ours

Change-Id: I76fd7c2ace7ae558018ae83d725c92b17ccdf28e

7 years agoMerge "Use tradefed AbiUtils"
Julius D'souza [Tue, 22 Aug 2017 18:28:03 +0000 (18:28 +0000)]
Merge "Use tradefed AbiUtils"
am: a571ae0f5d

Change-Id: Iee320688f05bdccbd6e40a0bab93e6e71d699072

7 years agoMerge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:...
Daniel Xie [Tue, 22 Aug 2017 18:27:47 +0000 (18:27 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am: ec5c5c216e am: 7664fa49e5 am: 05ad37b721 am: f5ba8f9e42 am: de490e515f
am: 36d502c6ab

Change-Id: Id626e6c068e27f2761ec8d61c0b1b20b415fe683

7 years agoresolve merge conflicts of b172f9e to master am: ed8e08ff82 am: 657bfbfb71 am: 29baf2...
Pyry Haulos [Tue, 22 Aug 2017 18:26:41 +0000 (18:26 +0000)]
resolve merge conflicts of b172f9e to master am: ed8e08ff82 am: 657bfbfb71 am: 29baf28a2f am: cc191e57bf
am: 843e8d6309

Change-Id: I295ed4a196593e358bffc99579fb5d302e3fefbb

7 years agoMerge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:...
Daniel Xie [Tue, 22 Aug 2017 18:26:18 +0000 (18:26 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am: ec5c5c216e am: c992a8ba9d am: 9ddfc1fee2 am: f46c3bd1eb am: b97db8c198 am: 6f7cf16a63
am: f6554f3007

Change-Id: Ib4232dc564d3dbbc9e4df8eff01a379a71d0e68a

7 years agoCP: Split load/store image tests into sub-groups am: b172f9eb57 am: 8afe1d6b23 am...
Kalle Raita [Tue, 22 Aug 2017 18:25:51 +0000 (18:25 +0000)]
CP: Split load/store image tests into sub-groups am: b172f9eb57 am: 8afe1d6b23 am: 26df49710f am: 03af70d91b am: b989b67715 am: b37b57916c
am: 336fcaca0e

Change-Id: I8f6ff966523657aef74c5df29a303edcb1f2c43a

7 years agoMerge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:...
Daniel Xie [Tue, 22 Aug 2017 18:25:34 +0000 (18:25 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am: ec5c5c216e am: c992a8ba9d am: 9c2b1c4012 am: b260761fb8
am: faa5670151

Change-Id: Id6fabf0f9312aac73c3efeba1d77e5bbbab809e4

7 years agoresolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp am: 0d151184d5 am: f47f5ecf0b
Pyry Haulos [Tue, 22 Aug 2017 18:25:16 +0000 (18:25 +0000)]
resolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp am: 0d151184d5 am: f47f5ecf0b
am: 47091c824b

Change-Id: Ic42562aad89852a5d04f8830d67d5ca7010bd42f

7 years agoMerge "Remove use of varargs.h from deString.c." am: ca988480be am: 6140614e6d am...
Jamie Madill [Tue, 22 Aug 2017 18:24:58 +0000 (18:24 +0000)]
Merge "Remove use of varargs.h from deString.c." am: ca988480be am: 6140614e6d am: 895dcf4469 am: 29fce3bfff
am: cd345ef77f

Change-Id: I7661500b5257d22b4f3fb24cb25614925e359dcc

7 years agoMerge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts...
Daniel Xie [Tue, 22 Aug 2017 18:24:42 +0000 (18:24 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am: 84173082ee am: e9835d0aa0 am: dcf24e8326 am: 910b6e1307 am: 3e8cc8637b
am: 4bb2e99278

Change-Id: Ic1ecf0b0ac4a730d487c5d7192107807c56b3d6b

7 years agoCP: Require 'master' config to be supported in Android CTS am: 03d217bb53 am: 5eaf6f9...
Pyry Haulos [Tue, 22 Aug 2017 18:24:23 +0000 (18:24 +0000)]
CP: Require 'master' config to be supported in Android CTS am: 03d217bb53 am: 5eaf6f98bd am: ca2f7af916 am: 82f012b41b am: a0b233c828
am: 46e3804f97

Change-Id: I6b9167e37a548a71b0049dac7c8f035304a763fa

7 years agoMerge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts...
Daniel Xie [Tue, 22 Aug 2017 18:24:07 +0000 (18:24 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am: 1ad2703e25 am: 913aabf8c3 am: 88682bbc44 am: 870b5a5ef2 am: 03f1d2f94f
am: 35c1af2289

Change-Id: Ia03cefcc10810f79954f2d5079f53b0cffc7fffb

7 years agoCP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am: 521bb16575 am: 8d8aa8f7...
Pyry Haulos [Tue, 22 Aug 2017 18:23:53 +0000 (18:23 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am: 521bb16575 am: 8d8aa8f78a am: e893539121 am: b371b20cf3 am: d970510833
am: 54ee11db1c

Change-Id: I1f608af1d3bf7b154b6e35810e5271284d9d53a6

7 years agoMerge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev...
Daniel Xie [Tue, 22 Aug 2017 18:23:38 +0000 (18:23 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev am: 451fa7c581 am: 65b5f9fa73 am: bc61735bb8 am: 9103405f3c am: ec637cb60b
am: 9ddb7ea57e

Change-Id: Ie71ee09ee374589b25cb0deae38102cafa716ac2