Haixia Shi [Tue, 22 Aug 2017 17:51:53 +0000 (17:51 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409 am:
d7b53b803a am:
da87d1a895 am:
fbd60126d8 am:
9f9397285c am:
b275e16083 am:
0611665e73 am:
df2f8439ac
am:
592cf678d9
Change-Id: I69901115a5a1ffaa6fe7eb4deaf76cd792f9e087
Unsuk Jung [Tue, 22 Aug 2017 17:51:10 +0000 (17:51 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338 am:
9ebe97f0a6 am:
7172745842 am:
9cb847787f am:
572542e25a am:
5aa10fb844 am:
42f4fbc400
am:
b4b7d5ea04
Change-Id: Iea922638c64765cae0c51e0cd36917cdf5e43b10
Haixia Shi [Tue, 22 Aug 2017 17:50:08 +0000 (17:50 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409 am:
635f454667 am:
cb0a43030f am:
aa3b3981d6 am:
1c5c354bea am:
375105a676 am:
3d3da7bab5
am:
3cd8cf7826
Change-Id: Ic0fe66d30e21a2434afcdf1e2660c76da9c40da1
Unsuk Jung [Tue, 22 Aug 2017 17:49:29 +0000 (17:49 +0000)]
Merge "Don't require supported binary formats in negative tests." into marshmallow-cts-dev am:
3aa5258338 am:
9ebe97f0a6 am:
7172745842 am:
229e5bb911 am:
1a01b7413f
am:
a63153b4c6
Change-Id: I5a755c6c047161e0c3b1ade3da70582eb485ba1f
Haixia Shi [Tue, 22 Aug 2017 17:48:55 +0000 (17:48 +0000)]
Don't require supported binary formats in negative tests. am:
7cd59a4409 am:
635f454667 am:
cb0a43030f am:
2b00aba040 am:
982ac86b00
am:
8c41e4699b
Change-Id: I8141312fa3b3be614a3d99a3f1d39057896df021
Kalle Raita [Tue, 22 Aug 2017 17:48:33 +0000 (17:48 +0000)]
Merge "Use empty region when buffer age is not supported" am:
04ff065bb8 am:
bcf725ead2 am:
714643aa8f am:
e43e265968
am:
ff6943ff76
Change-Id: Ifa467caaa0da3f0794a19b3ab8e817b1b68cadb5
Pyry Haulos [Tue, 22 Aug 2017 17:48:07 +0000 (17:48 +0000)]
Merge "Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" am:
d4591cd2d7 am:
28bca4db95 am:
2d88a7be92 am:
4a3c6e8b0b
am:
12dd3ee90b
Change-Id: Iba2bc9053a69a84a7565b943420e7af8f6b870ae
Pyry Haulos [Tue, 22 Aug 2017 17:47:41 +0000 (17:47 +0000)]
Reduce max iter count in alloc_callback_fail.device am:
3b17fd4c4e am:
e7119d922a am:
fac3b6f0f1 am:
25fb6cebb7
am:
c509f4c57f
Change-Id: I3770f8d449ef79990fc26dfe3e1b39c76db0e793
Daniel Xie [Tue, 22 Aug 2017 17:47:24 +0000 (17:47 +0000)]
Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts-dev am:
b9c3777b77 -s ours am:
245bd3ffc4 -s ours am:
26f19c81f9 am:
a39ebfe9c3 am:
0e802c4e0e am:
d0b2b3957f am:
32653a6bff -s ours
am:
125394f08a -s ours
Change-Id: Ibae97018e2399d9fbfde4e831ac4c2c7d34b0589
Jarkko Pyry [Tue, 22 Aug 2017 17:47:11 +0000 (17:47 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours am:
b136cc9a59 -s ours am:
92c0bc5e13 am:
fa9b0a2d1d am:
54c18e5ac4 am:
1465834a6f am:
44e736e1a3 -s ours
am:
28512eb821 -s ours
Change-Id: I860b4544992f144121c1898bca87c6fb55fb6b01
Daniel Xie [Tue, 22 Aug 2017 17:46:54 +0000 (17:46 +0000)]
Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev am:
98dd6ac745 am:
5dee7d519c am:
ad2ff2cee6 am:
1c0e65455b am:
bfb286324f am:
e4bb5c7380 am:
78da664fe3
am:
c9a28c5854
Change-Id: I21fbb557831633b9a8f12cd57a9d717d5bb496af
Stphane Marchesin [Tue, 22 Aug 2017 17:46:29 +0000 (17:46 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
9a9c641a84 am:
1369e6796f am:
2021e578a5 am:
e99b668de1 am:
82930763b9 am:
201aaabe6a
am:
912f515db3
Change-Id: Iaac1acdf8163b2291b509ec589489d8c61d90759
Haixia Shi [Tue, 22 Aug 2017 17:45:59 +0000 (17:45 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
a7afa30111 am:
dbeebd4714 am:
bf408ea638 am:
4fbb89056a am:
380c4214d7 am:
d5987b434e
am:
df399e17d7
Change-Id: Ib25cacf68a6ce5b4dbb8ac6671e93acc11b2b4ba
Pyry Haulos [Tue, 22 Aug 2017 17:45:37 +0000 (17:45 +0000)]
Limit VkInstance count in object_management.multithreaded* am:
fe2c3850aa am:
f4fc7b5325 am:
a4ba868448 am:
5cc580a901
am:
bdc8a088e1
Change-Id: I5882689ce9e073795b7c401868086b3215784a20
Daniel Xie [Tue, 22 Aug 2017 17:45:23 +0000 (17:45 +0000)]
Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts-dev am:
b9c3777b77 -s ours am:
245bd3ffc4 -s ours am:
26f19c81f9 am:
57bef37373 am:
11f3112a88 -s ours
am:
810e5b7f36 -s ours
Change-Id: I0b36668636ccbf1a5f791c86cbc2be23acb051ea
Jarkko Pyry [Tue, 22 Aug 2017 17:45:10 +0000 (17:45 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours am:
b136cc9a59 -s ours am:
92c0bc5e13 am:
6a9945d0ea am:
74ce10a66a -s ours
am:
27c4c0770c -s ours
Change-Id: I3f8cec1cf8e7082c5046c00603ee02414cb4e1a0
Daniel Xie [Tue, 22 Aug 2017 17:44:22 +0000 (17:44 +0000)]
Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev am:
98dd6ac745 am:
5dee7d519c am:
ad2ff2cee6 am:
d3d8d1f780 am:
baad168d2d
am:
dc19c7434c
Change-Id: If92b461561aedd0ae7017644bbf6e48b9860d871
Stphane Marchesin [Tue, 22 Aug 2017 17:44:09 +0000 (17:44 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
9a9c641a84 am:
1369e6796f am:
a13a4a71c6 am:
0fefe2c6dd
am:
fbec8e0884
Change-Id: I7a1fdd084d2d875b5843303399b80448fb0e4009
Haixia Shi [Tue, 22 Aug 2017 17:43:46 +0000 (17:43 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
a7afa30111 am:
dbeebd4714 am:
4f82e0a41d am:
1f472a5ac7
am:
6f5adea6e6
Change-Id: I3396fcc74e21326e073d6dfe0a26a3d7f1f1639c
Pyry Haulos [Tue, 22 Aug 2017 17:43:31 +0000 (17:43 +0000)]
Do not test VkDevice, VkInstance creation OOM paths in WSI tests am:
2dd2c2dc56 am:
a5e0f24431 am:
de4fd3d929 am:
1e7173fc56
am:
4fceeee261
Change-Id: Ic46d5d472032524285a350fadf8a16074157a345
Pyry Haulos [Tue, 22 Aug 2017 17:43:17 +0000 (17:43 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
a18cb02cb8 am:
c1ec0ab210 am:
e009aa14ff am:
adbdbcd51f
am:
c42e5ed1bb
Change-Id: Ic364291d9e8ca4aad14cef9b61be8a0c8ddcec24
Pyry Haulos [Tue, 22 Aug 2017 17:42:57 +0000 (17:42 +0000)]
Require 'master' config to be supported in Android CTS am:
e232a6e83c am:
9fcccc3d5e am:
814861d962 am:
984f215b5a
am:
9b98b25ebc
Change-Id: I4d3ce08455331ced67da83b10d0eb295ba375fb2
Aaron Holden [Tue, 22 Aug 2017 17:42:45 +0000 (17:42 +0000)]
Merge "Copy collect-tests-only option in DeqpTestRunner" into nyc-mr1-dev am:
b9152fed9f am:
f20ead93a0 am:
2297e749d9
am:
d3df95e783
Change-Id: Iab0238a84d7e2084752c92481d32a472775b40ce
Aaron Holden [Tue, 22 Aug 2017 17:42:11 +0000 (17:42 +0000)]
Copy collect-tests-only option in DeqpTestRunner am:
ab73207152 am:
f7a6073043 am:
224b9e83c7
am:
780e5eb3f9
Change-Id: Idfbdeda00ad132ef4436b6cd97dc463323651b6f
Kalle Raita [Tue, 22 Aug 2017 17:41:57 +0000 (17:41 +0000)]
Split load/store image tests into sub-groups am:
90763f1f7d am:
0630204ed0 am:
1ac83f0744 am:
918c2463df
am:
088026dcbd
Change-Id: I6e7d1c37eb64d98033862dbeea0a1fee773fce98
Pyry Haulos [Tue, 22 Aug 2017 17:41:41 +0000 (17:41 +0000)]
Merge upstream-vulkan-cts-1.0-dev into master am:
c641c2e631 am:
ff17828d24 am:
cac2638e0b am:
9093b91cc6
am:
d80cc10978
Change-Id: I4b5e6ce6a693153c5973fd9498edd67bb78a0d47
Pyry Haulos [Tue, 22 Aug 2017 17:41:26 +0000 (17:41 +0000)]
Exclude new AOSP tests from Vulkan CTS mustpass am:
2856c4a882 am:
e7411e4375 am:
c944a160f3 am:
f92a0057e1
am:
386e18193c
Change-Id: Ib1b05874aaa163309ded5f15e4dd8a74bdb581ae
Pyry Haulos [Tue, 22 Aug 2017 17:41:14 +0000 (17:41 +0000)]
Merge "Add script for build- and sanity-checking source code" am:
032db4ee79 am:
332b86e954 am:
5c1193ac0e am:
360456a9e2
am:
f2f091b553
Change-Id: Ie151cd12e21a1155cf73f888f8b2c98a8ce21ce8
Collin Baker [Tue, 22 Aug 2017 17:40:59 +0000 (17:40 +0000)]
Merge "Fix const-correctness in texture filtering test cases" am:
201bdd03b9 am:
a7654e4aa7 am:
1b5b849a13 am:
3c5c0f29f4
am:
67ccf173ed
Change-Id: I6842dfdd5ab404611cb282622154afa348481bce
Pyry Haulos [Tue, 22 Aug 2017 17:40:44 +0000 (17:40 +0000)]
Merge "Fix ext check in EXT_draw_buffers_indexed negative tests" am:
316e998b08 am:
0d795e0b74 am:
b4dc232687 am:
47fc8fa835
am:
bcfff5f7bd
Change-Id: I6502df773f9610f960d048d977768bd8787e6ea4
Pyry Haulos [Tue, 22 Aug 2017 17:40:32 +0000 (17:40 +0000)]
Merge "Do not rewrite .inl files if existing content is identical" am:
522806fb48 am:
dc0e613e09 am:
5abad2aa10 am:
5115651099
am:
e729842534
Change-Id: I42b3964efb053f6b0b8d395bb94b4d836150acde
Pyry Haulos [Tue, 22 Aug 2017 17:40:18 +0000 (17:40 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
68e9111d15 am:
0e5e3a7b7d am:
29ad585c71 am:
ee64653c61
am:
d443f1996a
Change-Id: I23b55718da770db6043f43f8957e0fcd6cf04884
Pyry Haulos [Tue, 22 Aug 2017 17:40:03 +0000 (17:40 +0000)]
Merge "MSVC: set exception handling model" am:
ac343841e4 am:
199e67724d am:
2aed524afb am:
9e8e7fab52
am:
9af3b4b634
Change-Id: If1d42b10bd8d81a6c98ab3f893a8d9cb20633840
Kalle Raita [Tue, 22 Aug 2017 17:39:50 +0000 (17:39 +0000)]
Merge "Tex array negative test fixes for FBTextureLayer" am:
13e9c5295c am:
78a609ac42 am:
e3ceb38d90 am:
bf994843a1
am:
f938ebb83a
Change-Id: Ied7055454b1b25d8bede71aea6d281fcbb41467e
Collin Baker [Tue, 22 Aug 2017 17:39:34 +0000 (17:39 +0000)]
Merge "Fix implicit conversion to bool" am:
95d03db971 am:
5c51a0e9ab am:
8dff83a942 am:
4bdc401b1f
am:
20d96f559b
Change-Id: Ic742f8a8b1f5acb7344f1ed869eb5fe8e6e519ba
Pyry Haulos [Tue, 22 Aug 2017 17:39:22 +0000 (17:39 +0000)]
fetch_souces.py: cache extracted hash and only extract if necessary am:
30e2e7b423 am:
bb1518d839 am:
c62f0007f6 am:
8c45816a40
am:
bd35fe0f97
Change-Id: I8a3e43a1e649618cba3e29db97529903e3bc849b
Pyry Haulos [Tue, 22 Aug 2017 17:39:07 +0000 (17:39 +0000)]
Merge "Improvements to sample verification code" am:
9e25446699 am:
a0931a720d am:
2b6ecc3f84 am:
3e59e6fe91
am:
1416b8427a
Change-Id: I0e775a4c9c753ed945a3ca023ec1a740ca7633a1
Pyry Haulos [Tue, 22 Aug 2017 17:38:52 +0000 (17:38 +0000)]
Merge "Let linker find libm on unix" am:
0ae9f0d744 am:
c38f0231db am:
af0d09d5ba am:
da711466fe
am:
6dfd9480c3
Change-Id: Ia57b674c228631f67c37a10451bd46441cbcce4f
Pyry Haulos [Tue, 22 Aug 2017 17:38:32 +0000 (17:38 +0000)]
Merge "Use 3rd party cflags in zlib" am:
12289a3151 am:
4cbe6899d2 am:
2b871a5022 am:
584b9fabc1
am:
4deb3cab68
Change-Id: Id70c2fec16048ad5072584e97d7a60a219c65c67
Pyry Haulos [Tue, 22 Aug 2017 17:38:08 +0000 (17:38 +0000)]
Merge "Fix deUint64 -> size_t warning in deSha1" am:
2a7d53ca19 am:
17a3ef9c00 am:
6bf3e1cb65 am:
828b476e7a
am:
85a8945553
Change-Id: I1fd1cb2d6e65bdf67b1c7b1756614950af4f148b
Pyry Haulos [Tue, 22 Aug 2017 17:37:36 +0000 (17:37 +0000)]
Fix clang launch control builds am:
2011fb57b8 am:
c91abc37d2 am:
5801dce433 am:
10fc41e1d1
am:
7707290337
Change-Id: I46be67979e5188b03797e4b051796308645ae3cc
Pyry Haulos [Tue, 22 Aug 2017 17:37:12 +0000 (17:37 +0000)]
Merge "Modify deqp install script to accept build-root" am:
98faf68f01 am:
4dafa58484 am:
f8f1a31678 am:
4261897184
am:
ba012e1c5b
Change-Id: Ie5df96f77da7e7901d838959f9573fde3ccf18c8
Pyry Haulos [Tue, 22 Aug 2017 17:36:51 +0000 (17:36 +0000)]
Merge "Enable -Werror in launch control builds" am:
5d3110410c am:
84d16a0eb4 am:
478283f842 am:
3e535537e5
am:
47a4cc4afc
Change-Id: I4c8a99271a3553e8d2c117dcf34e5262bf70557b
Pyry Haulos [Tue, 22 Aug 2017 17:36:37 +0000 (17:36 +0000)]
Merge "Merge upstream-vulkan-cts-1.0-dev into master" am:
553f24edf2 am:
ecfd015f05 am:
51879177a6 am:
d7a232b7bb
am:
698d9be9c4
Change-Id: I7e6df1b840110c5e7f6d114c0ad836f208615ac4
Pyry Haulos [Tue, 22 Aug 2017 17:36:19 +0000 (17:36 +0000)]
Merge upstream-vulkan-cts-1.0-dev into master am:
fb20fc5f5d am:
c0d5f3c3bd am:
93a21800dd am:
8019cb7387
am:
f9135a42f1
Change-Id: Ia18a0bac3ccb8d058728eb3d415de5e230b0cc54
Collin Baker [Tue, 22 Aug 2017 17:36:04 +0000 (17:36 +0000)]
Quick fix for warning in vktSampleVerifier.cpp am:
5bffef48d5 am:
cddd73d649 am:
6e53a18230 am:
4ecd6f333f
am:
1b1cf8779b
Change-Id: I2fefdc9d10d50f72479a4873030d5a594a7a9843
Mika Isojrvi [Tue, 22 Aug 2017 17:35:24 +0000 (17:35 +0000)]
Add support for rendering vertex combined sampled images. am:
5fe6837872 am:
6003e58af4 am:
673aaf7079 am:
b1e6beaaaa
am:
1a62ada5ff
Change-Id: I59b28e18f42f4bd36efc35c54fc9f0d699d3238c
Pyry Haulos [Tue, 22 Aug 2017 17:35:02 +0000 (17:35 +0000)]
Fix geometry shader support check am:
83470b2dcb am:
276e8bac4c am:
d3c11ad0b0 am:
22fd4e6f44
am:
bbaab7ec9f
Change-Id: I1a0af158cbdda4f6d96c7e71e824b515ad063689
Mika Isojärvi [Tue, 22 Aug 2017 17:34:49 +0000 (17:34 +0000)]
Update mustpass list. am:
fc145f5198 am:
de3b7ebf4d am:
888de2570b am:
08b189c546
am:
8e0c54c449
Change-Id: Ie91c3d4db5c3d8fa3a5931bd785d2ed9b452dc86
Mika Isojärvi [Tue, 22 Aug 2017 17:32:32 +0000 (17:32 +0000)]
Add support for rendering vertex storage images. am:
cb6eb243c9 am:
62768ad130 am:
707ceeb7cf am:
d2d821fd2d
am:
88fc806f0b
Change-Id: Ie7257fa1ae4ba38c02dde0375a455d9714c51017
Mika Isojärvi [Tue, 22 Aug 2017 17:31:52 +0000 (17:31 +0000)]
Add support for rendering vertex storage texel buffers. am:
b214c63910 am:
11d666264a am:
26ed604750 am:
bf5a6c3559
am:
a3762678b6
Change-Id: Ic6a574e85cb1f0783947ab3c9b69bb7d184c117f
Mika Isojärvi [Tue, 22 Aug 2017 17:31:31 +0000 (17:31 +0000)]
Add vertex storage buffers to pipeline barrier tests. am:
7da6a1a373 am:
f59346fb51 am:
e86a141a32 am:
d4106a60c0
am:
d50c8bef5f
Change-Id: Ia9d3b02292ccce902df5a9f0afcdc8d08ae4b2b5
Mika Isojärvi [Tue, 22 Aug 2017 17:31:18 +0000 (17:31 +0000)]
Add support for rendering vertex uniform texel buffers am:
2e5fc5db2b am:
d0f428f62a am:
b36342af95 am:
bdb0ef31ee
am:
903370fb7c
Change-Id: Ib20314d381517a0b10a202e4a6157d443972458b
Mika Isojärvi [Tue, 22 Aug 2017 17:31:00 +0000 (17:31 +0000)]
Add vertex uniform buffers to pipeline barrier tests. am:
da19a054c2 am:
490d86c2cb am:
36a205ed7e am:
26d98dcce7
am:
205f491df8
Change-Id: Ide8ce2b837e7a60021af58ef300c63af65926fef
Mika Isojärvi [Tue, 22 Aug 2017 17:30:35 +0000 (17:30 +0000)]
Merge "Split RenderBuffer class into RenderVertexBuffer and RenderIndexBuffer." am:
92f15137d6 am:
70554ff097 am:
9d58952197 am:
4ed16eb734
am:
25dbdcb639
Change-Id: I685f84f69b032df4236452fdfe2c1fd7e0e807d3
Mika Isojärvi [Tue, 22 Aug 2017 17:30:32 +0000 (17:30 +0000)]
Split RenderBuffer class into RenderVertexBuffer and RenderIndexBuffer. am:
6c7a842e61 am:
230cacdd3a am:
5057f4b3fa am:
3e6593f8c2
am:
44776863af
Change-Id: Ie53f4f82ca43decd299a2e8874c9c158ca18cf87
Collin Baker [Tue, 22 Aug 2017 17:30:19 +0000 (17:30 +0000)]
Merge "Fix warnings in texture_filtering tests" am:
083240d0d8 am:
49f5c1f518 am:
2386c56d97 am:
9547ebbc4e
am:
3af10c88cf
Change-Id: I1cf4af30594ce25b14ad8770219127cf0fe6bb1b
Mika Isojärvi [Tue, 22 Aug 2017 17:30:05 +0000 (17:30 +0000)]
Merge "Fix image layout in pipeline barrier tests" am:
f61183a55c am:
a42dcee85a am:
fb0de07694 am:
417bb5b04a
am:
07fcfcaa7f
Change-Id: Ibe6cb65f6eb7a1d52f0a2b192c88082f49f93847
Chih-Hung Hsieh [Tue, 22 Aug 2017 17:29:14 +0000 (17:29 +0000)]
Suppress the google-explicit-constructor warning locally. am:
bded0f944e am:
a33c79fccc am:
46d16db55d am:
11d130b7bf
am:
627caea064
Change-Id: Ic20e5da4d0d410f49b1538825fd398b3517ad8fd
Jarkko Pöyry [Tue, 22 Aug 2017 17:28:50 +0000 (17:28 +0000)]
Merge \\\\\\\\"DO NOT MERGE CP vertex array test and warning fixes\\\\\\\\" into marshmallow-cts-dev am:
b9c3777b77 -s ours am:
7bc41121c1 am:
3acfedf2ab am:
19de695b8d am:
f0e6d6563c -s ours am:
17c2446a15 am:
45a8f91070 am:
449abdbd00 am:
697b769d40 -s ours
am:
5982c681cd -s ours
Change-Id: Iee63a827b5b71c794f54c800c79b29effb558423
Jarkko Pyry [Tue, 22 Aug 2017 17:28:19 +0000 (17:28 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours am:
f840c5347f am:
0556e60e67 am:
da626715a4 am:
7d47fbfc18 -s ours am:
20df90f956 am:
e88b68aa9b am:
82252671f0 am:
58bfc529b7 -s ours
am:
ba83c9e1a7 -s ours
Change-Id: Id196ac02467ac6c62183c55304042566ccace4b2
Daniel Xie [Tue, 22 Aug 2017 17:28:04 +0000 (17:28 +0000)]
Merge \\\\\\\"DO NOT MERGE CP vertex array test and warning fixes\\\\\\\" into marshmallow-cts-dev am:
b9c3777b77 -s ours am:
7bc41121c1 am:
3acfedf2ab am:
19de695b8d am:
f0e6d6563c -s ours am:
17c2446a15 am:
c0a305c1de am:
68a23d5f7d -s ours
am:
1433edc217 -s ours
Change-Id: If5506acc65d83615c5c2d702e1d7c4669b1be62c
Jarkko Pöyry [Tue, 22 Aug 2017 17:27:45 +0000 (17:27 +0000)]
DO NOT MERGE CP vertex array test and warning fixes am:
c63640e53a -s ours am:
f840c5347f am:
0556e60e67 am:
da626715a4 am:
7d47fbfc18 -s ours am:
20df90f956 am:
3186329afc am:
a6b2611d6c -s ours
am:
566787163e -s ours
Change-Id: If8754e6b9d70403de1e459c62cd15456bde382ea
Chih-Hung Hsieh [Tue, 22 Aug 2017 17:27:33 +0000 (17:27 +0000)]
Fix misc-macro-parentheses warnings in deqp. am:
dc795cd4f3 am:
ca03927b03 am:
4c73adfb72 am:
ec21a1f127
am:
e6ed762b8a
Change-Id: I78e7ea2ac5d6ae11c734cad19229ab7ff23007c1
Stéphane Marchesin [Tue, 22 Aug 2017 17:27:15 +0000 (17:27 +0000)]
Merge \\\\\\\\\"Fix GLES2 format mismatch\\\\\\\\\" into marshmallow-cts-dev am:
98dd6ac745 am:
514fc784d3 am:
d2cc27ecd9 am:
fc19d21caf am:
1fb5b8e2d7 am:
730e4b0592 am:
5b2c510e5d am:
03e844fda9 am:
74d432ebde
am:
c0ccba0ca8
Change-Id: I7f9ce1665a06f912556b304da44c653f29865d06
Stphane Marchesin [Tue, 22 Aug 2017 17:26:23 +0000 (17:26 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
17f31733fd am:
e3284ec499 am:
ea8731ac09 am:
44569cffe2 am:
a327815593 am:
e7d3f86b22 am:
eeb0911e79 am:
e19ecde7a3
am:
0028e4afc3
Change-Id: Ia97c13b981836ff6d6810c615325d78aebfa085f
Collin Baker [Tue, 22 Aug 2017 17:26:09 +0000 (17:26 +0000)]
Texture filtering tests in Vulkan am:
8b0f318ec6 am:
4cc35b2fc5 am:
4d7aefa9a2 am:
cf6d23b91a
am:
9c508f83be
Change-Id: Ia61dc30fe6cc3bac8f84e64e3d5c122071975715
Daniel Xie [Tue, 22 Aug 2017 17:25:56 +0000 (17:25 +0000)]
Merge \\\\\\\\"Fix GLES2 format mismatch\\\\\\\\" into marshmallow-cts-dev am:
98dd6ac745 am:
514fc784d3 am:
d2cc27ecd9 am:
fc19d21caf am:
1fb5b8e2d7 am:
730e4b0592 am:
19512b6573 am:
daac041499
am:
cb36f63af9
Change-Id: Ie10247e35b4dec9089d0ddbfc4ab0057572f1a3b
Stéphane Marchesin [Tue, 22 Aug 2017 17:25:41 +0000 (17:25 +0000)]
Fix GLES2 format mismatch am:
4b80682693 am:
17f31733fd am:
e3284ec499 am:
ea8731ac09 am:
44569cffe2 am:
a327815593 am:
2a8a85901c am:
676bd39285
am:
59cd4a8b50
Change-Id: I386d1c816bbc6e57423efba9665dc3b7c0ea510f
Haixia Shi [Tue, 22 Aug 2017 17:25:27 +0000 (17:25 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
f8083c0977 am:
5e52d6630c am:
10a0d7d015 am:
2c65c609ed am:
3cb59cec28 am:
c82316692f am:
8dae51d1ca am:
3afdb5f0fc
am:
10a56d1581
Change-Id: I7dbe81df103632dd5e00052aafbebb4c3e31caf5
Haixia Shi [Tue, 22 Aug 2017 17:25:10 +0000 (17:25 +0000)]
Increase no-data timeout to 5 seconds. am:
d00b71cbc3 am:
f8083c0977 am:
5e52d6630c am:
10a0d7d015 am:
2c65c609ed am:
3cb59cec28 am:
2af72c5fd8 am:
fbd6751573
am:
56b718bd46
Change-Id: I1d035f52bd81233c9b4af5964455661f70582aca
Pablo Ceballos [Tue, 22 Aug 2017 17:24:54 +0000 (17:24 +0000)]
Merge \\\\"Don\\\\'t rely on framebuffer contents after eglSwapBuffers\\\\" am:
e241ee2d69 am:
b10a8056a2 am:
734fb85f88 am:
5bed856e33
am:
99c1f35ebd
Change-Id: If80544d515853e6dff58969510fd5c3a598cc054
Pyry Haulos [Tue, 22 Aug 2017 17:24:37 +0000 (17:24 +0000)]
Update Android CTS mustpass am:
df293b49cd am:
41db7dc40e am:
af4a755613 am:
e298b3119f
am:
0feac2b829
Change-Id: I9fedc393dcf38d0ef87aee9c479047aa2ed8db38
Pyry Haulos [Tue, 22 Aug 2017 17:24:20 +0000 (17:24 +0000)]
Merge upstream vulkan-cts-1.0-dev into AOSP master am:
20a7a532b4 am:
79572f8a12 am:
525d453974 am:
c21b16a1b8
am:
d2c54444de
Change-Id: Ic16bb2c002c4730b018157eb26ac3ba4cb5f779c
Pyry Haulos [Tue, 22 Aug 2017 17:24:07 +0000 (17:24 +0000)]
DO NOT MERGE revert CTS integration build changes am:
62875f6b9f -s ours am:
38cac339a5 -s ours am:
15a29b8c84 am:
c11c115754 -s ours
am:
464564dd4a -s ours
Change-Id: I1e1dbefc3c15c4b5d36874a35c26b4f72675191f
Pablo Ceballos [Tue, 22 Aug 2017 17:23:54 +0000 (17:23 +0000)]
Merge "Don't rely on framebuffer contents after eglSwapBuffers"
am:
76f784eaea
Change-Id: Iaf6597cb67fb8b76a3c7fbdcda612735e5db7c02
Pyry Haulos [Tue, 22 Aug 2017 17:23:41 +0000 (17:23 +0000)]
Merge \\\"Add mipmap.2d.projected tests back to mustpass\\\" am:
0a874f4a2c am:
0a50a55ba5 am:
496c09f666
am:
36803c418b
Change-Id: I562dc62172c514e823ac066965a20b1da37ca2b0
Julius D'souza [Tue, 22 Aug 2017 17:23:23 +0000 (17:23 +0000)]
Merge \\\"switch to default Trade Federation ABI class\\\" am:
e3235bbd8d am:
98e547b2b2 am:
dc0ce84bc8
am:
b93b009dcf
Change-Id: I74e92f6a5b8ce856978ac6924029fb3b108ce68f
Mika Isojärvi [Tue, 22 Aug 2017 17:23:07 +0000 (17:23 +0000)]
Merge changes I219c2b3a,I7af6fe67 am:
01cc5733ba am:
7d8ddf4d02 am:
822f089731
am:
80354cd561
Change-Id: I22f7a641721ebb02f8ef97fc6c99873500de3dc3
Pyry Haulos [Tue, 22 Aug 2017 17:22:45 +0000 (17:22 +0000)]
Fix license header in testlog.xls am:
e1c6368ea8 am:
0c8837f1e3 am:
fc25428102
am:
2cc908b5c8
Change-Id: I871122edb7592d52414c95814dc59c5430a24e2e
Julien Desprez [Tue, 22 Aug 2017 17:22:25 +0000 (17:22 +0000)]
Merge \\\\"Fix build with new Interface am:
af51a2acde am:
3b9fe61b5e\\\\" into nyc-mr1-dev-plus-aosp am:
114f46a0dc am:
2dc4d39d70 am:
a198339517 am:
49723e9172
am:
59e8008a6e
Change-Id: Ia936964fa28c92d1a829f14e443ccd3c3e17a769
Julien Desprez [Tue, 22 Aug 2017 17:22:05 +0000 (17:22 +0000)]
Fix build with new Interface am:
af51a2acde am:
cee1bcdedd am:
93f94f0d2e am:
244b38f434 am:
6829dca527 am:
6cdd09e692
am:
765ee043e4
Change-Id: I6d8dda9417d92209579df536a9431f9e4fb7deff
Julien Desprez [Tue, 22 Aug 2017 17:21:47 +0000 (17:21 +0000)]
Update TF interface for filters am:
fa50dbbefa am:
0a44c2b7c9 am:
797bdc12ba am:
88e3da40a0 am:
ef8287e6f6 am:
0ebae95af0
am:
7b3886f742
Change-Id: I63cb75820d75ea89b224ec530e94589a6f9cbb44
Julien Desprez [Tue, 22 Aug 2017 17:21:29 +0000 (17:21 +0000)]
Update TF interface for filters am:
fa50dbbefa am:
bec18ccfde am:
047ff644a7 am:
f5907ad07c am:
ba1e8d722a am:
7fcd2c08fe
am:
81a6a02eba
Change-Id: I7aa7563027b0e8abe05688bc6f526726551d8e08
Xin Li [Tue, 22 Aug 2017 17:21:11 +0000 (17:21 +0000)]
Merge goog/master@c8da37c into stage-aosp- am:
38365a1634 am:
e1fb5fe7df am:
82d89acd57 am:
dd0641f583 am:
061e03a696 am:
c6f9dd4de1
am:
90ff3617d5
Change-Id: I2aa4fee5f66a65b28e062157e9199b8a40371b8e
Mika Isojrvi [Wed, 16 Aug 2017 23:58:28 +0000 (23:58 +0000)]
Fix texture mip level size in framebuffer fetch tests
am:
be0d165a5d
Change-Id: I3fcbe493a87c270e64b6c3e3ed3fa8329d877d1b
Mika Isojärvi [Wed, 16 Aug 2017 20:40:22 +0000 (13:40 -0700)]
Fix texture mip level size in framebuffer fetch tests
Bug:
64280744
Test: Ran tests with multiple Google devices
Change-Id: I369a3c9b16270655332d5a608207f0da2633e0fe
james.glanville [Wed, 16 Aug 2017 19:02:41 +0000 (19:02 +0000)]
Merge "Use safe glFramebufferTexture* function"
am:
ec5ccbe144
Change-Id: Ic1a4ef9c96f1d2ea1500f175d5c7d601240cb17d
Michael Chock [Wed, 16 Aug 2017 19:02:25 +0000 (19:02 +0000)]
Merge "Do not use degenerate frames in EGL tests"
am:
f5971fe17f
Change-Id: Id81232def28656d87c26d69853ac54383e360327
Treehugger Robot [Wed, 16 Aug 2017 18:59:45 +0000 (18:59 +0000)]
Merge "Use safe glFramebufferTexture* function"
Treehugger Robot [Wed, 16 Aug 2017 18:59:42 +0000 (18:59 +0000)]
Merge "Do not use degenerate frames in EGL tests"
Alexander Galazin [Wed, 16 Aug 2017 18:41:58 +0000 (18:41 +0000)]
Merge "Report tests using Draw*BaseVertex as NotSupported"
am:
f96636fdfa
Change-Id: I1f262d8f3a4c772b3903653fb5e5080cd65bd868
Treehugger Robot [Wed, 16 Aug 2017 18:36:54 +0000 (18:36 +0000)]
Merge "Report tests using Draw*BaseVertex as NotSupported"
Alexander Galazin [Wed, 16 Aug 2017 18:18:24 +0000 (18:18 +0000)]
Merge "Fix error double accounting in fuzzyCompare()"
am:
0cf17c4bf8
Change-Id: Ie3cd66fceec9ac3a73d5d5fb237baf62660ed049
Treehugger Robot [Wed, 16 Aug 2017 18:06:52 +0000 (18:06 +0000)]
Merge "Fix error double accounting in fuzzyCompare()"
Michael Chock [Mon, 14 Aug 2017 18:55:14 +0000 (11:55 -0700)]
Do not use degenerate frames in EGL tests
The dEQP-EGL.functional.buffer_age.* and
dEQP-EGL.functional.partial_update.* tests use randomly-generated frames
for rendering. The test allows the generation of frames with a width or
height of 0, but the tcu::PixelBufferAccess interface does not permit
0-sized subregions (see assertions inside getSubregion overloads in
tcuTextureUtil.cpp).
Skip the rendering of degenerate frames in the reference renderer, as
they are unsupported but would not affect the rendering if they were.
Change-Id: I3977c3c293715db633dde74132e56b5d9303ab28
james.glanville [Wed, 16 Aug 2017 10:50:19 +0000 (11:50 +0100)]
Use safe glFramebufferTexture* function
glFramebufferTexture() is only supported when GL_EXT_geometry_shader is
present. Use glFramebufferTextureLayer() instead so that testing is
possible on unextended ES3.1 contexts.
Components: AOSP
Affects:
dEQP-GLES31.functional.shaders.framebuffer_fetch.basic.framebuffer_texture_level
Alexander Galazin [Wed, 16 Aug 2017 09:36:01 +0000 (11:36 +0200)]
Report tests using Draw*BaseVertex as NotSupported
Draw*BaseVertex methods were added in GLES 3.2.
Report tests using these methods as NotSupported if
GLES 3.1 context is returned.
Components: AOSP
Affects: dEQP-GLES31.functional.draw_base_vertex.*
Change-Id: I87c918d5f66a0a5b547f8e625c662203a7f85048
Alexander Galazin [Wed, 16 Aug 2017 00:30:11 +0000 (00:30 +0000)]
Check for tessellation/geometry extensions being exposed
am:
573154bb7b
Change-Id: Ib37ad273d16588101b8b4f6ade7f6f9e227faf5c
Alexander Galazin [Fri, 11 Aug 2017 09:03:50 +0000 (11:03 +0200)]
Check for tessellation/geometry extensions being exposed
Some sample_variables tests use tessellation/geometry shaders.
Need to check that the relevant extensions are exposed.
Components: AOSP
Affects:
dEQP-GLES31.functional.debug.negative_coverage.*.oes_sample_variables.access_built_in_types_inside_other_shaders
Change-Id: Iff74939d474082938955e5b7ebfc41ea3b4a6ec5