Alexander Galazin [Thu, 24 Aug 2017 17:58:33 +0000 (17:58 +0000)]
Fix DrawRangeElementsBaseVertex tests with negative basevertex am:
bf0b29365e
am:
d81d3cdfd6
Change-Id: I7eb7e59a9522818c2acd03b9f2fc79a6d9f9afb4
John Richardson [Thu, 24 Aug 2017 17:58:22 +0000 (17:58 +0000)]
Add new draw elements base vertex tests am:
3c865084eb
am:
f573b5fc43
Change-Id: I29be02c366103cc0984195f759fdf644785b48d0
Pyry Haulos [Thu, 24 Aug 2017 17:58:11 +0000 (17:58 +0000)]
Fix typo in framebuffer_srgb_unsupported_enum am:
b46d559e07
am:
ca35ff2dec
Change-Id: I9ede5f505ba6aa874f5fafbf5339911d01281ec4
John Richardson [Thu, 24 Aug 2017 17:57:59 +0000 (17:57 +0000)]
Add sRGB write decode negative case am:
6644e7bfef
am:
f4548f9b1e
Change-Id: I648b27990903014c6cbe41389ad3424233cec3eb
Michael Hadley [Thu, 24 Aug 2017 17:57:48 +0000 (17:57 +0000)]
Add sRGB write decode tests am:
50d8f31f52
am:
f81147bab9
Change-Id: I299172ae6871b0c9b4c39c0e365ee1394f94a379
Juan A. Suarez Romero [Thu, 24 Aug 2017 17:57:36 +0000 (17:57 +0000)]
x11_egl: use quotes to include glesv1_cm directories am:
f5e7ab6b79
am:
8f736c4099
Change-Id: I49997f5595f3d1f9152da9d7f40a86d8de53a264
Pyry Haulos [Thu, 24 Aug 2017 17:57:25 +0000 (17:57 +0000)]
Merge "Remove EGL gles1.rgb565_window from mustpass" am:
7bff163e7f am:
8d0d1e55f9
am:
68d63a6c74
Change-Id: I74104f7daa4f0c24a7e613d0f702a14e1d47e613
Pyry Haulos [Thu, 24 Aug 2017 17:57:14 +0000 (17:57 +0000)]
Touch watchdog before freeing objs in max_concurrent am:
815781b777 am:
6cbc014cfb
am:
e7f15283a8
Change-Id: Ica052d67337b381aa13f0efc7516b0fffee97eea
Pyry Haulos [Thu, 24 Aug 2017 17:57:01 +0000 (17:57 +0000)]
Merge "Remove EGL gles1.rgb565_window from mustpass" into oc-dev am:
840e33e440
am:
6523455d5c
Change-Id: I71494bd89890b751402f803fa45fb1ef8c94fc64
Pyry Haulos [Thu, 24 Aug 2017 17:56:47 +0000 (17:56 +0000)]
Merge "Touch watchdog before freeing objs in max_concurrent" into oc-dev am:
47e683efe5
am:
3b58165c1a
Change-Id: I2719d97a2d3503498ab1a17d47868fe5e2e256dd
Alexander Galazin [Thu, 24 Aug 2017 17:56:33 +0000 (17:56 +0000)]
Skip OOB SSBO fragment tests for ES3.1 GPUs am:
66241e9dbb
am:
58015e2810
Change-Id: I8e6d829010757a6e6582ef019aed3ba468a93aa7
Alexander Galazin [Thu, 24 Aug 2017 17:56:15 +0000 (17:56 +0000)]
Skip OOB SSBO fragment tests for ES3.1 GPUs am:
f5fc3c8409 am:
ea27c20fd2
am:
d097af6b28
Change-Id: If180e367842d7bca758ac3265047c1a2b49982c3
Pyry Haulos [Thu, 24 Aug 2017 17:56:02 +0000 (17:56 +0000)]
Merge "Ignore A channel in EGL RGB5_A1 clear color tests" into oc-dev am:
49883d1448
am:
ea13b9e878
Change-Id: Ibe6ce4bae08d3d857a45bd1a5d4fd8250ade278f
Guang Zhu [Thu, 24 Aug 2017 17:55:49 +0000 (17:55 +0000)]
fix DEQP AndroidTest.xml generation script am:
a60033dd24
am:
8c7a54bc6c
Change-Id: Ib5592d8da2067c9d322b8aaedeeefa5b63c8778a
Alexander Galazin [Thu, 24 Aug 2017 17:55:35 +0000 (17:55 +0000)]
Ignore A channel in EGL RGB5_A1 clear color tests am:
9da1b45a8e am:
4e33c51c88 am:
bf0988368a
am:
b2c2e2721c
Change-Id: I2088ecad36345a69a7890d92e38a498696ebe26c
Guang Zhu [Thu, 24 Aug 2017 17:55:23 +0000 (17:55 +0000)]
add component metadata tag to CTS DEQP module am:
e7e9f03ac1
am:
01bbd19739
Change-Id: I4e8500b1f4f7f968a63fd9b1ead20059d51ab95f
Chih-Hung Hsieh [Thu, 24 Aug 2017 17:55:07 +0000 (17:55 +0000)]
Add OWNERS in external/deqp am:
ea5d0ac339 am:
d8d22c9c34 am:
90707d5538
am:
2698dbc280
Change-Id: Ia517aa386da2e2f9e93f33b860078a9d264fdc63
jdesprez [Thu, 24 Aug 2017 17:54:56 +0000 (17:54 +0000)]
Add getAbi new interface am:
16fd5275d6
am:
37ca881df0
Change-Id: I6bb1150a2a2a1916afa8785384d14b73bab13474
Pyry Haulos [Thu, 24 Aug 2017 17:54:38 +0000 (17:54 +0000)]
Remove unused function from es31fSRGBDecodeTests.cpp am:
1ee59ff986 am:
2e80d40a0b am:
4e9833b13f
am:
7935d416ee
Change-Id: Iec9b52fe2ee62a2900571ac0ed5bba5f9e2efb39
Alexander Galazin [Thu, 24 Aug 2017 17:54:23 +0000 (17:54 +0000)]
Fix texture/sampler mapping in sRGB tests am:
102cfe8b11
am:
ce808c1fa0
Change-Id: I05f754bc094776e278cf9eacf60486e4e011df16
Alexander Galazin [Thu, 24 Aug 2017 17:54:07 +0000 (17:54 +0000)]
Fix texture/sampler mapping in sRGB tests am:
c8efb45ead am:
984445983d am:
bd25f07ba0
am:
2ec9385767
Change-Id: I657f6d555bd2d7ed12c7c91b360aad14d8bd6997
Pyry Haulos [Thu, 24 Aug 2017 17:53:54 +0000 (17:53 +0000)]
Update Vulkan CTS to version 1.0.2.3 am:
148890e79f
am:
826d389a17
Change-Id: I6e849c26b6b0f565a70f854fa077b47bac8a3745
Pyry Haulos [Thu, 24 Aug 2017 17:53:37 +0000 (17:53 +0000)]
Update Vulkan CTS to version 1.0.2.3 am:
633ab6f3c8 am:
399ba4a5ec am:
a339444f14
am:
17e9ff6806
Change-Id: Ic789669792c52aab8e14fdabc854a82d987bcbdb
Alexander Galazin [Thu, 24 Aug 2017 17:53:23 +0000 (17:53 +0000)]
Fix negative CompressedTexImage2D tests am:
4b6115726c
am:
3c3614565e
Change-Id: Ie512434944e6a60f0aabe4d2a71fbcd084bb5007
Pyry Haulos [Thu, 24 Aug 2017 17:53:08 +0000 (17:53 +0000)]
Merge "Fix GCC 6.3 warnings in aosp/master" am:
1211e9fe1b am:
56ed30da81 am:
2bd761c309
am:
10d242c3d6
Change-Id: I0e5496e2a223ffc2ff2422ae1d75b1a581dc009b
Alexander Galazin [Thu, 24 Aug 2017 17:52:50 +0000 (17:52 +0000)]
Fix negative CompressedTexImage2D tests am:
9de005f035 am:
958ab8f9cb am:
b42217f8ce
am:
fa2e139731
Change-Id: I0164efe43dc6d1c2b4a26be831d89c10873d301e
Pyry Haulos [Thu, 24 Aug 2017 17:52:33 +0000 (17:52 +0000)]
Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev am:
acf47d464f am:
c2594c65ff" into nyc-mr1-dev am:
2190aa2642 am:
7394ee84a1 am:
579c101261 am:
705f37810e
am:
6ec69a101d
Change-Id: I83d067e9625f74330d6ca52b8e876f2789ad4841
Pyry Haulos [Thu, 24 Aug 2017 17:52:13 +0000 (17:52 +0000)]
Merge "Fix color change verification in dithering tests" into nougat-cts-dev am:
acf47d464f am:
45d860b737 am:
2196375b32 am:
84ee6b2620 am:
d4c8a3ac82 am:
862196b30a am:
b552592f77
am:
a5f4638914
Change-Id: I0a2e638b81da02b7b58fc84eccd967da6c2edfcb
Pyry Haulos [Thu, 24 Aug 2017 17:51:53 +0000 (17:51 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am:
9a83ec3f47 am:
9443c9c4c0 am:
578ae6d230 am:
6b5103682e am:
28cc3b34a9 am:
c99530440b am:
a651781bb8 -s ours
am:
d57f61995e -s ours
Change-Id: Icd222f4fe4741e5961af3ea51e064b6c4e84c3b2
Alexander Galazin [Thu, 24 Aug 2017 17:51:27 +0000 (17:51 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:
eebcec1b52 am:
71a9bc447d am:
620c938d61 am:
62aeee5d3e am:
f83b3c5679 am:
64598a3e94 am:
b06191e636
am:
dcb6d80d7a
Change-Id: Ia138dd13e29628c55385554aea49a98d69b40cbe
Pyry Haulos [Thu, 24 Aug 2017 17:51:13 +0000 (17:51 +0000)]
resolve merge conflicts of
eb48f49dd to oc-dev am:
7e37841e4f -s ours
am:
a8938da884 -s ours
Change-Id: Ia10cbcef9ef8cdc21d6124625632cc9ba20947c4
Pyry Haulos [Thu, 24 Aug 2017 17:50:57 +0000 (17:50 +0000)]
Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev am:
acf47d464f am:
c2594c65ff" into nyc-mr1-dev am:
2190aa2642 am:
7394ee84a1 am:
579c101261 am:
27ac88fa73
am:
af56714a9b
Change-Id: I4ea47415c8ae67810a215ad698b88ed410bcc4fd
Pyry Haulos [Thu, 24 Aug 2017 17:50:42 +0000 (17:50 +0000)]
Merge "Fix color change verification in dithering tests" into nougat-cts-dev am:
acf47d464f am:
45d860b737 am:
2196375b32 am:
84ee6b2620 am:
d4c8a3ac82 am:
862196b30a am:
7399cb4e48
am:
a8ec7e0231
Change-Id: Ia5a40ac839b7ecd118d573af6ebf46079b08f5e2
Pyry Haulos [Thu, 24 Aug 2017 17:50:25 +0000 (17:50 +0000)]
Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am:
9a83ec3f47 am:
9443c9c4c0 am:
578ae6d230 am:
6b5103682e am:
28cc3b34a9 am:
c99530440b -s ours" into nyc-mr2-dev-plus-aosp am:
bfa02fb74d -s ours
am:
5da73a2fc6 -s ours
Change-Id: I234549ca744f9552df7e7d9116c490a5ae93a882
Pyry Haulos [Thu, 24 Aug 2017 17:50:08 +0000 (17:50 +0000)]
Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev am:
acf47d464f am:
c2594c65ff am:
1203cd8416 am:
365f13849d" into nyc-mr2-dev-plus-aosp am:
0bcd8aabc4
am:
7697d09e8e
Change-Id: Ib868428a1a4a20687d19531e5381074c353373cd
Alexander Galazin [Thu, 24 Aug 2017 17:49:52 +0000 (17:49 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:
eebcec1b52 am:
71a9bc447d am:
620c938d61 am:
62aeee5d3e am:
f83b3c5679 am:
64598a3e94 am:
7782da8bc6
am:
d2425448d5
Change-Id: I764e3da853d4585d05e9f680ec0b6e361b3257a9
Pyry Haulos [Thu, 24 Aug 2017 17:49:36 +0000 (17:49 +0000)]
Merge "Merge "Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am:
9a83ec3f47 am:
90e6678bc9" into nyc-mr1-dev am:
26ff3a55fd am:
4f2accd121 am:
eb48f49ddc -s ours" into nyc-mr2-dev-plus-aosp am:
fbc5716d8b -s ours" into oc-dev-plus-aosp
am:
b8886e0cec -s ours
Change-Id: I9e71dfbf87e694c8e7b04e1c44a5ecfa4a3810e8
Alexander Galazin [Thu, 24 Aug 2017 17:49:19 +0000 (17:49 +0000)]
Merge "Merge "Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:
eebcec1b52 am:
2585331908" into nyc-mr1-dev am:
cbd57d8ea2 am:
e63231fb5e am:
282f941efc" into nyc-mr2-dev-plus-aosp am:
378bef97d2" into oc-dev-plus-aosp
am:
8ff375b503
Change-Id: I1c7a8d4d6a94078749a672e41fcbceedddfb05c8
Pyry Haulos [Thu, 24 Aug 2017 17:49:01 +0000 (17:49 +0000)]
Merge "Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am:
9a83ec3f47 am:
90e6678bc9 -s ours am:
18231b0d34 -s ours am:
df2c784664 -s ours" into nyc-mr2-dev-plus-aosp am:
74bc88be32 -s ours" into oc-dev-plus-aosp
am:
2d576a8876 -s ours
Change-Id: I3ecde15d447b357766f6b75a3eb446722fcb337c
Pyry Haulos [Thu, 24 Aug 2017 17:48:41 +0000 (17:48 +0000)]
Merge "Merge "Merge "Try to determine renderable format in lifetime tests am:
c0a5dc217f am:
e94af4b69f am:
d92ff56cca" into nyc-mr1-dev am:
2e135d60c4 am:
b804e15573 am:
f981189859" into nyc-mr2-dev-plus-aosp am:
3498ef1536" into oc-dev-plus-aosp
am:
12c6adf6f9
Change-Id: I3e2f493da464dbf0f3ba59de5d842a61a66b233d
Alexander Galazin [Thu, 24 Aug 2017 17:48:21 +0000 (17:48 +0000)]
Merge "Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:
eebcec1b52 am:
2585331908 am:
0543f8e619 am:
261a03ba31" into nyc-mr2-dev-plus-aosp am:
f3aadc9609" into oc-dev-plus-aosp
am:
932a74d3d2
Change-Id: Id8c9685fc69e5a089ee8189b34daed33544f800a
Alexander Galazin [Thu, 24 Aug 2017 17:47:56 +0000 (17:47 +0000)]
Merge "Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:
eebcec1b52 am:
2585331908" into nyc-mr1-dev am:
cbd57d8ea2 am:
e63231fb5e am:
282f941efc am:
8b5b1427f4" into oc-dev-plus-aosp
am:
a03f6ca147
Change-Id: I2f2391c91fa4d123b2d40ebdb4a9f44c1e47803a
Pyry Haulos [Thu, 24 Aug 2017 17:47:33 +0000 (17:47 +0000)]
Merge "Merge "Try to determine renderable format in lifetime tests am:
c0a5dc217f am:
e94af4b69f am:
d92ff56cca" into nyc-mr1-dev am:
2e135d60c4 am:
b804e15573 am:
f981189859 am:
a503de3a04" into oc-dev-plus-aosp
am:
136bd5f683
Change-Id: I4c6e47cf00dec052644cdbebe60b3ac408ae553b
Pyry Haulos [Thu, 24 Aug 2017 17:47:09 +0000 (17:47 +0000)]
Merge "Merge "Try to determine renderable format in lifetime tests am:
c0a5dc217f am:
eba26e2387 am:
8b78db19fd am:
9d0568c51e am:
e6eb42c8fd" into nyc-mr2-dev-plus-aosp am:
c5ebf8cdab" into oc-dev-plus-aosp
am:
3112afb203
Change-Id: Ic33d33e521a88675538db1c0c9584708a17d8c6e
Pyry Haulos [Thu, 24 Aug 2017 17:46:49 +0000 (17:46 +0000)]
Merge "Try to determine renderable format in lifetime tests am:
c0a5dc217f am:
eba26e2387 am:
8b78db19fd am:
9d0568c51e am:
e6eb42c8fd am:
c57341fa99" into oc-dev-plus-aosp
am:
cd13f199b8
Change-Id: I286884789c46631a0864e2f17ed72995b249d6a2
Pyry Haulos [Thu, 24 Aug 2017 17:46:29 +0000 (17:46 +0000)]
Try to determine renderable format in lifetime tests am:
c0a5dc217f am:
eba26e2387 am:
d1aa6c62e3 am:
347c7f4d8b am:
ca28cf3dee
am:
0c3bd38647
Change-Id: I9e05a3234d6fdd4821582ba3ae6965f7498e1ead
Mika Isojärvi [Thu, 24 Aug 2017 17:39:50 +0000 (10:39 -0700)]
resolve merge conflicts of
a18fc4da to deqp-dev
Test: python scripts/check_build_sanity.py
Change-Id: I005ec911d42238906482a71545df50c395fb23ad
Kalle Raita [Thu, 24 Aug 2017 17:33:56 +0000 (17:33 +0000)]
Merge "Log which watchdog timer was exceeded" am:
9bd0272d00 am:
00bbea1771 am:
a20ae3d6a8
am:
49c18c6c67
Change-Id: I4b760e5f168ef847b88b886e3ea074ddd7398640
Mika Isojärvi [Thu, 24 Aug 2017 17:23:41 +0000 (10:23 -0700)]
resolve merge conflicts of
297d0b5c to deqp-dev
Test: python scripts/check_build_sanity.py
Change-Id: I051006ca6e29b2f9ae116261aec1c0c3c234d6e0
Pyry Haulos [Thu, 24 Aug 2017 17:17:33 +0000 (17:17 +0000)]
Update Android CTS Vulkan waivers list to match Khronos CTS am:
bc44daba17
am:
2acdba2927
Change-Id: Ie670b3dac650e232336b0960285b7730796ddae0
Mika Isojärvi [Thu, 24 Aug 2017 17:13:34 +0000 (10:13 -0700)]
resolve merge conflicts of
59febde9 to deqp-dev
Test: python scripts/check_build_sanity.py
Change-Id: I6fa14e6831bdb54ee33f92521f385ef6b7586580
Alexander Galazin [Thu, 24 Aug 2017 17:03:19 +0000 (17:03 +0000)]
Ensure expected error in copytexsubimage2d_incomplete_framebuffer am:
3809b1c7f1
am:
24e713de1b
Change-Id: I9761ff979c49091f286ca650450a607ea196fda1
Alexander Galazin [Thu, 24 Aug 2017 17:03:02 +0000 (17:03 +0000)]
Ensure expected error in copytexsubimage2d_incomplete_framebuffer am:
89bb39d249 am:
fc8c8e4d78 am:
8c429200b5
am:
28c233c958
Change-Id: I01c005ef5c1c741cd55cce763711aa9c60099360
Mika Isojärvi [Thu, 24 Aug 2017 16:45:21 +0000 (09:45 -0700)]
resolve merge conflicts of
f5a50cbc to deqp-dev
Test: python scripts/check_build_sanity.py
Change-Id: I7c2fef01e29278a44514b1e854c460f960c9368d
Pyry Haulos [Tue, 22 Aug 2017 21:16:07 +0000 (21:16 +0000)]
DEPTH_STENCIL_OES as tex format requires OES_depth_texture am:
8290443470 am:
7e7f286dce am:
5ff8fe0a04
am:
2ee90b476e
Change-Id: Ic94d010f200974fa52cfa808f79ac8cfacd11e48
Mika Isojärvi [Tue, 22 Aug 2017 21:15:44 +0000 (21:15 +0000)]
Merge "DO NOT MERGE: Temporarily disable failing deqp tests" into oc-dev am:
4695739815
am:
261ff27a8c -s ours
Change-Id: Id2bed6c91aa4cd53508eb67690d1f40d95a81a38
Brian Anderson [Tue, 22 Aug 2017 21:15:27 +0000 (21:15 +0000)]
EGL_ANDROID_get_frame_timestamps fixes am:
679b3e921a
am:
7f554ec88f
Change-Id: Iee6fbea076bb03e35d4aaa2c1d6901bcdfb6f674
Brian Anderson [Tue, 22 Aug 2017 21:14:56 +0000 (21:14 +0000)]
eglGetFrameTimestamps: Use reserved enum values. am:
84574b5c7b am:
6ee57fc890 am:
475941c82b
am:
8db673346f
Change-Id: I46ba204de220549dfec94a0f6e28bdedc341019f
Brian Anderson [Tue, 22 Aug 2017 21:14:40 +0000 (21:14 +0000)]
eglGetFrameTimestamps: Allow optional present support. am:
afb7428641 am:
4563d47710 am:
22cb1bb41b
am:
efeaa084a8
Change-Id: I66133fe968950d6692dd0d49663be91947454872
Brian Anderson [Tue, 22 Aug 2017 21:14:27 +0000 (21:14 +0000)]
eglGetFrameTimestamps: pending vs. invalid timestamps. am:
b4e217e4a1 am:
61e9fbabf0 am:
a41125daf9
am:
5e38c3842d
Change-Id: Iea29ce6d4039d38928d4c38969191fbab18d0213
Ian Romanick [Tue, 22 Aug 2017 21:14:17 +0000 (21:14 +0000)]
Merge "Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
a4ddab16dd" into nyc-mr1-dev am:
768446b015 am:
1e68201377 am:
14221e7f43" into nyc-mr2-dev-plus-aosp am:
9f9bdc8201
am:
d07ebc4c7d
Change-Id: I847d8f2671cf6b2443c7e58531839d17bb2aaf1b
Ian Romanick [Tue, 22 Aug 2017 21:14:07 +0000 (21:14 +0000)]
Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
fdc198ba11 am:
c7970bbd83 am:
8bb630d3e5 am:
d76c57f2b6 am:
995657a4be" into nyc-mr2-dev-plus-aosp am:
fea22331f3
am:
f69e9e35f8
Change-Id: I956dc5f619f030d91a7cb6c20bffe6dc3aad863a
Ian Romanick [Tue, 22 Aug 2017 21:13:55 +0000 (21:13 +0000)]
Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
a4ddab16dd am:
8ca5b73a02 am:
33055729ed am:
b661c02c90
am:
e7c4c8b2fd
Change-Id: I81dab721991b1a84393ef70d921f379e8e9b3d8d
Ian Romanick [Tue, 22 Aug 2017 21:13:42 +0000 (21:13 +0000)]
Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
a4ddab16dd" into nyc-mr1-dev am:
768446b015 am:
1e68201377 am:
14221e7f43 am:
1039da878e
am:
4238a089a6
Change-Id: I7d4bf6b03ead148b78e66a59c9843c91397235cc
Ian Romanick [Tue, 22 Aug 2017 21:13:30 +0000 (21:13 +0000)]
Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am:
aeef6dd8f5 am:
fdc198ba11 am:
c7970bbd83 am:
8bb630d3e5 am:
d76c57f2b6 am:
995657a4be am:
0dc7a59526
am:
dc412875c3
Change-Id: I8477ed8f59d97eb6ef365c159e07a673e80860a4
Kalle Raita [Tue, 22 Aug 2017 21:13:16 +0000 (21:13 +0000)]
Merge "Allow robustness tests on GLES 3.0" am:
ab3013ef10 am:
b23ee5b160 am:
e801ea5994 am:
ef62cc04d9 am:
49b972090a
am:
9d266e8df4
Change-Id: I459f4ec76e9cab982bf299a5fe9987517ea2ec85
Kalle Raita [Tue, 22 Aug 2017 21:13:02 +0000 (21:13 +0000)]
Merge "Allow robustness tests on GLES 3.0" am:
ab3013ef10 am:
b23ee5b160 am:
e801ea5994
am:
ef62cc04d9
Change-Id: I055adce80842aafdd24a38866da1e1554e056485
Pyry Haulos [Tue, 22 Aug 2017 21:12:43 +0000 (21:12 +0000)]
Merge vulkan-cts-1.0.2 into goog/oc-dev am:
605556c673
am:
f3c5fbe817
Change-Id: I5fb848c6bf6c430003501eb4f87ef253eadab907
Pyry Haulos [Tue, 22 Aug 2017 21:12:19 +0000 (21:12 +0000)]
Merge vulkan-cts-1.0.2 into aosp/master am:
55da06144c am:
d905a013d0 am:
c91ce3f2a2
am:
dca02bef80
Change-Id: Ic10cb6f345c317690f6a074cf870413895ccaf57
Pyry Haulos [Tue, 22 Aug 2017 21:11:49 +0000 (21:11 +0000)]
Merge "x11_egl: search for glesv1_cm, toggle DEQP_SUPPORT_GLES1 on if found" am:
89c3844ccb am:
17ff0445a7 am:
5fa0204a0a
am:
70b7b394f3
Change-Id: Ic4d03832ab2b116bd125895557f0eee6234d0318
Pyry Haulos [Tue, 22 Aug 2017 21:11:28 +0000 (21:11 +0000)]
Do not re-init GL functions after context reset am:
48870ebe72
am:
b3dddbf271
Change-Id: I3553b689404fbae6704b9288bb5109d031cb0716
Pyry Haulos [Tue, 22 Aug 2017 21:11:06 +0000 (21:11 +0000)]
Do not re-init GL functions after context reset am:
72c880b4c9 am:
a5c0bd16ed am:
8fd7fdf3df
am:
06683b6d0d
Change-Id: Ia8446cbc721cbbb5057661c459ea9858850e43e9
Alexander Galazin [Tue, 22 Aug 2017 21:10:46 +0000 (21:10 +0000)]
Fix shader bugs in OOB tests am:
609d108f89
am:
6600966ac8
Change-Id: Iac5c21ca09d72ff890aa2f6d58a2cf46bcc3ae03
Alexander Galazin [Tue, 22 Aug 2017 21:10:24 +0000 (21:10 +0000)]
Fix shader bugs in OOB tests am:
cf65c56fb4 am:
baf5ae40a9 am:
afc0b6a272
am:
516a43c4f1
Change-Id: Ia03eb8af9e0fc795c28fd5a594d36c8b8a6d2e77
Pyry Haulos [Tue, 22 Aug 2017 21:09:48 +0000 (21:09 +0000)]
resolve merge conflicts of
433645782 to oc-dev-plus-aosp
am:
3a33181ba4
Change-Id: Id339737e93fedf20a36a70d45ad5f11db50f7643
Pyry Haulos [Tue, 22 Aug 2017 21:09:30 +0000 (21:09 +0000)]
Use new LOD approximation rules for OpenGL ES am:
0b6dbeb93e am:
d05ba20fed am:
097f4d1511
am:
52bce38cb6
Change-Id: Ic50f9c44822d4c04838cf9bbe149678e62cc9244
Pyry Haulos [Tue, 22 Aug 2017 21:09:12 +0000 (21:09 +0000)]
Relax LOD computation bounds am:
a9a793142c am:
1aae7665eb am:
126f23f1f4
am:
8da912daf1
Change-Id: I15f81cea0626e82db3980e6e39d705a4b50cb392
Pyry Haulos [Tue, 22 Aug 2017 21:08:58 +0000 (21:08 +0000)]
Merge Vulkan CTS 1.0.2.2 into goog/oc-dev am:
a44ba43f52
am:
5370e5f24b
Change-Id: If42032b5ec1c05d6c6d727e89daea0c0bc0807f3
Pyry Haulos [Tue, 22 Aug 2017 21:08:46 +0000 (21:08 +0000)]
Merge Vulkan CTS 1.0.2.2 into aosp/master am:
d4891aeb29 am:
9e51a9547a am:
f6b03a3a50
am:
2c01c32bac
Change-Id: I34ef952a07cc0037e9349d6cb566e8c53f2820c6
Kalle Raita [Tue, 22 Aug 2017 21:08:17 +0000 (21:08 +0000)]
CP: Update runtime hints for master and Nougat am:
37fdf46649
am:
950100f76e
Change-Id: Ifcd9b34f37fd008765a3adef1fc8baf1af5a3fc7
Kalle Raita [Tue, 22 Aug 2017 21:08:04 +0000 (21:08 +0000)]
Merge "Update runtime hints for master and Nougat" am:
c29c5a7b35 am:
d25e6dcca6 am:
9a3ee57a75
am:
f01815f17d
Change-Id: Ifd5134dac00a50376de3b7ed3693091c7e0e2a02
Pyry Haulos [Tue, 22 Aug 2017 21:07:39 +0000 (21:07 +0000)]
Revert "Allow old behavior in image format property tests" am:
6d962c2a6f am:
8c75e4b367 am:
8ecb06a488
am:
bd01a31a03
Change-Id: I5fd92ef8536079f7dda24145801c5ddd94677f38
James Glanville [Tue, 22 Aug 2017 21:07:26 +0000 (21:07 +0000)]
Fix tests in dEQP-EGL.functional.robustness* am:
fd0b6eda1c am:
d3ac80fae5 am:
54c4090dfe
am:
b4c6add667
Change-Id: I31ac9ae9d664f862db3728d2f71fb5cb08899069
Pyry Haulos [Tue, 22 Aug 2017 21:07:10 +0000 (21:07 +0000)]
Fix GL entry point loading in robustness tests am:
ee81fc2044 am:
7af7cc4764 am:
5222daa01a
am:
5f5a909017
Change-Id: Ic8bc9f51b327946fc508e39481167fc9152361ac
Brian Anderson [Tue, 22 Aug 2017 21:06:51 +0000 (21:06 +0000)]
Remove retire event from eglGetFrameTimestamps am:
1c43c47725 am:
be7f9f0a83 am:
00f5a5956b
am:
728085dbe2
Change-Id: I19fa75f3d972fdea4763a904c29a2b42cac33b9c
Pyry Haulos [Tue, 22 Aug 2017 21:06:35 +0000 (21:06 +0000)]
Fix warning introduced in
2c9e3ec9 am:
521361d83d am:
19bf995047 am:
80b99cc54a am:
b39a206388 am:
5006352564 am:
8aa6812b7c
am:
2545942815
Change-Id: Iaea74315782dbb087b385e435b1f091e6e095fce
Pyry Haulos [Tue, 22 Aug 2017 21:05:56 +0000 (21:05 +0000)]
Fix warning introduced in
2c9e3ec9 am:
521361d83d am:
19bf995047 am:
c4c0f6d489 am:
31d2e24daf am:
e615f79c5a
am:
0676473b72
Change-Id: I58f136a9f30106a51928a7c9de79b1264d6c9556
Pyry Haulos [Tue, 22 Aug 2017 21:05:30 +0000 (21:05 +0000)]
Fix warning introduced in
2c9e3ec9 am:
521361d83d am:
5f34117776 am:
eba2559865 am:
99f3ab7c5a am:
91a3078a37 am:
bcca961424 am:
d3a3351f43
am:
f686bd5f57
Change-Id: I27cf7eef9e68d91fbe5c6d6507a36a942317474d
Pyry Haulos [Tue, 22 Aug 2017 21:05:03 +0000 (21:05 +0000)]
Fix warning introduced in
2c9e3ec9 am:
d8b452a753 am:
03dde47b9d am:
9333757172
am:
48b95fe358
Change-Id: I9ce95f265efc18f68fd94489d23bbc21f70aef3c
Alexander Galazin [Tue, 22 Aug 2017 21:04:44 +0000 (21:04 +0000)]
Merge "Merge "Further relax line verification in primitive bbox tests" into nougat-cts-dev am:
0532365740 am:
468843cf08 am:
085f13d8da am:
981b8742da" into nyc-mr2-dev-plus-aosp am:
31f2366386
am:
de5423ea05
Change-Id: Ie653ac95d94b4cdc48a1b189d8736c25f22aa2a3
Alexander Galazin [Tue, 22 Aug 2017 21:04:18 +0000 (21:04 +0000)]
Merge "Further relax line verification in primitive bbox tests" into nougat-cts-dev am:
0532365740 am:
dce98dc6e9 am:
650fc6607d am:
2e13d553b0 am:
cb66bf73ac am:
e17e4e54b0 am:
6428468a8b
am:
5f6e45bf92
Change-Id: I2814cec474b0da8d7d368171d5140ed1efd73641
Alexander Galazin [Tue, 22 Aug 2017 21:03:53 +0000 (21:03 +0000)]
Merge "Further relax line verification in primitive bbox tests" into nougat-cts-dev am:
0532365740 am:
468843cf08 am:
726720187d am:
19a2ee6b36 am:
94f99f7054 am:
7540f5a544
am:
819e026dfc
Change-Id: I108446e07223816dfde1ae03df8991a13e0f0ea4
Pyry Haulos [Tue, 22 Aug 2017 21:03:29 +0000 (21:03 +0000)]
Fix warnings in new EGL tests am:
de0c0ce818 am:
ea8380f2db am:
8e517dcc33
am:
688c264fa0
Change-Id: I411ee6ede3c31e51f572dfdae6cf9a82db1450b5
Alexander Galazin [Tue, 22 Aug 2017 21:03:18 +0000 (21:03 +0000)]
Use glReadnPixels only if KHR_robustness is supported am:
d99ba132d9 am:
875d3c2990 am:
4a2a606f28 am:
31335b5fc3 am:
4a75760b34 am:
ff6b243c33 am:
e9179721a7
am:
d4f1cddd22
Change-Id: Ie7b232da190323bd366bee01530e9ff1fa52aebc
Alexander Galazin [Tue, 22 Aug 2017 21:03:05 +0000 (21:03 +0000)]
Merge "Use glReadnPixels only if KHR_robustness is supported am:
d99ba132d9 am:
d01980d03d am:
1efb4d5fdd am:
a03d5cd549 am:
db3b4ad59a" into nyc-mr2-dev-plus-aosp am:
6886889dd2
am:
49c0db9055
Change-Id: I7aa65fedda420b83fb15b7b96597e4f24983566a
Alexander Galazin [Tue, 22 Aug 2017 21:02:53 +0000 (21:02 +0000)]
Use glReadnPixels only if KHR_robustness is supported am:
d99ba132d9 am:
d01980d03d am:
19b4a4e7ac am:
2d0dfec91d am:
38a71682fd
am:
29a6f6dab4
Change-Id: Ib6c8e3fbce2ea545043aae08ed97795a8a80a4d0
Kenneth Graunke [Tue, 22 Aug 2017 21:02:40 +0000 (21:02 +0000)]
Merge "Fix stencil bits when creating reference image in depth stencil tests" am:
1f9e724a41 am:
17f944d740 am:
e6980259ca
am:
b7c8854c31
Change-Id: I037fa52f109dcf8ff3c38257530d803d6b240748
Sunny Sun [Tue, 22 Aug 2017 21:02:30 +0000 (21:02 +0000)]
Fix typo in dEQP-GLES31.functional.srgb_texture_decode.skip_decode.* am:
e05b3a9c94 am:
6b525a74ec am:
148faca50c
am:
ffc29271fa
Change-Id: Iec47851a7d7b53d44b8c3f87a27368e8ebb8ac9c
Brian Anderson [Tue, 22 Aug 2017 21:02:18 +0000 (21:02 +0000)]
Fix flakiness of compositeDeadline check of eglGetFrameTimestsmps am:
40fd86f16f am:
7cc41a5dfc am:
f4f65e7140
am:
5a70f10096
Change-Id: I962f73d54818640dab46584ea94e4eee8b407172
John Richardson [Tue, 22 Aug 2017 21:02:06 +0000 (21:02 +0000)]
Merge "Modify EGL robustness tests to use VBOs" am:
c9dcf19f73 am:
c3629c05cc am:
27d6b7fdb7
am:
8cf37a8380
Change-Id: I7605edd142dcf0b73c349be6e7c99bb087a6a500