Alexander Galazin [Thu, 24 Aug 2017 18:06:18 +0000 (18:06 +0000)]
Merge "Run Draw*BaseVertex if EXT_draw_elements_base_vertex is present"
am:
4929480c47
Change-Id: I76b5980c8c1d05a515651c5a8cd266c2d236cf96
Mika Isojrvi [Thu, 24 Aug 2017 18:06:06 +0000 (18:06 +0000)]
Fix texture mip level size in framebuffer fetch tests am:
be0d165a5d
am:
0f01836518
Change-Id: Ie64aff819c56715999139de44887dd57f5822b10
james.glanville [Thu, 24 Aug 2017 18:05:52 +0000 (18:05 +0000)]
Merge "Use safe glFramebufferTexture* function" am:
ec5ccbe144
am:
d4c3e6e71b
Change-Id: I389324c9220d9a7860a2ae749b02051b6b05dfe7
Michael Chock [Thu, 24 Aug 2017 18:05:41 +0000 (18:05 +0000)]
Merge "Do not use degenerate frames in EGL tests" am:
f5971fe17f
am:
4a2d8af710
Change-Id: I4a2ae433b85d202d52d9e76b3787b0fadc362dc4
Alexander Galazin [Thu, 24 Aug 2017 18:05:29 +0000 (18:05 +0000)]
Merge "Report tests using Draw*BaseVertex as NotSupported" am:
f96636fdfa
am:
eaf6e29e46
Change-Id: Ia21497809fccc8e80d7e9dac295b0b8ba76b7929
Alexander Galazin [Thu, 24 Aug 2017 18:05:18 +0000 (18:05 +0000)]
Merge "Fix error double accounting in fuzzyCompare()" am:
0cf17c4bf8
am:
f64327185c
Change-Id: I1aaa3ffd21e63fad420676c02770fa91cec85475
Alexander Galazin [Thu, 24 Aug 2017 18:05:05 +0000 (18:05 +0000)]
Check for tessellation/geometry extensions being exposed am:
573154bb7b
am:
f79e5f07b3
Change-Id: I3f03c20526d12b39d3d2a2da3a712e9f9ab98251
Chih-Hung Hsieh [Thu, 24 Aug 2017 18:04:53 +0000 (18:04 +0000)]
Suppress non-critical warnings in external/deqp. am:
b7ae0d8484
am:
ed7ff5357c
Change-Id: Ie5c3d341fc5854ce52e9d3a0872930c9249dd4a2
Mika Isojarvi [Thu, 24 Aug 2017 18:04:41 +0000 (18:04 +0000)]
Merge "Release EGL resources in CTS worker threads" am:
fde96926aa
am:
cf24be7e7a
Change-Id: Iff1ee2fd762af68855c40fbc5a53451684aad0e0
Graeme Leese [Thu, 24 Aug 2017 18:04:30 +0000 (18:04 +0000)]
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am:
4f1051ad32 am:
5bd0fb31a1 am:
ea24f81118
am:
9485e519fd
Change-Id: I6b89a8388ddb627bcbdaaee6bc10ecb79470139b
Michael Chock [Thu, 24 Aug 2017 18:04:16 +0000 (18:04 +0000)]
Check for EGLimage support in EGLimage test am:
1886241d23
am:
830a36a4f8
Change-Id: I2bee6c6ee96a4ee66f4387160096e18faaccb28c
Kalle Raita [Thu, 24 Aug 2017 18:04:03 +0000 (18:04 +0000)]
Merge "Add triangle edge guardband for Tex2D lookup diff" am:
da231f19ab
am:
e609b77e0b
Change-Id: I68d4d001c9a29fcd31fa8f3c787e881077da39f0
Mika Isojrvi [Thu, 24 Aug 2017 18:03:51 +0000 (18:03 +0000)]
Fix atomic ssbo xor test am:
f0fa05e898 am:
14cd264501 am:
d4c01761d3 am:
674ba44413
am:
b209b899a4
Change-Id: I82def2e376a18bf72b855a4c3278a5dda8f170c9
Courtney Goeltzenleuchter [Thu, 24 Aug 2017 18:03:37 +0000 (18:03 +0000)]
EGL: Add wide-color tests am:
6a26fb1fd0
am:
14dd0253a4
Change-Id: Iecfb0ee912291e28a9b3c1b9940cd7e0556e63e9
Mika Isojarvi [Thu, 24 Aug 2017 18:03:23 +0000 (18:03 +0000)]
Merge "Merge Vulkan CTS 1.0.2.4 into aosp/master" am:
0f5658c72b
am:
0419094593
Change-Id: Ib9cdac4b4c91ef68920e077ea718eb03573c4d2d
Mika Isojarvi [Thu, 24 Aug 2017 18:03:10 +0000 (18:03 +0000)]
Merge "Report Android extension pack tests as not supported" am:
03c395c60f
am:
714fd7ab4d
Change-Id: I2f672736e70cfb7185d22477f3ba4e07621f943a
Mika Isojrvi [Thu, 24 Aug 2017 18:02:57 +0000 (18:02 +0000)]
Update GL wrapper to newest API. am:
7782ec5bab
am:
62ec47fdc6
Change-Id: Icd1d138135683d9033398d436a5e8aa750b4fb33
Alexander Galazin [Thu, 24 Aug 2017 18:02:38 +0000 (18:02 +0000)]
Fetch gl.xml, egl.xml from Github repos am:
ae3759c7c9
am:
18976166cc
Change-Id: Iae50e1fd1571a9e1efdaa4b1eb53862cd27ce957
Mika Isojrvi [Thu, 24 Aug 2017 18:02:27 +0000 (18:02 +0000)]
Mask compared bits in atomic operation tests. am:
b2ed9fbe1a am:
4d1d6446da am:
b78f9b0e57 am:
6e213b6fdc
am:
7e95c3f44d
Change-Id: Iff07579f3399f1b27d974b8afbd46a1586d4efc5
Mika Isojrvi [Thu, 24 Aug 2017 18:02:12 +0000 (18:02 +0000)]
Add missing files to Android.mk am:
58f3ba4184
am:
705eef50a0
Change-Id: I36624aac69d9298a27bf6cad86ca1057f4c77150
Alexander Galazin [Thu, 24 Aug 2017 18:01:59 +0000 (18:01 +0000)]
Add RENDERBUFFER_VALID bit to R8, RG8 definition am:
1d7c8df82e
am:
30382a11c1
Change-Id: Ib6e1f02aa102c323efdf0265fd7c3ddef237b09d
Mark Adams [Thu, 24 Aug 2017 18:01:46 +0000 (18:01 +0000)]
Check that threads started in multithreading tests am:
9937c63c41
am:
f2596ba255
Change-Id: I222564e4a1377dac89d29f1d8ab36d746a06c04b
Pyry Haulos [Thu, 24 Aug 2017 18:01:35 +0000 (18:01 +0000)]
Reduce scope of mustpass exclusions due to
22760309 am:
5d86672aa0
am:
ce28f5f6cf
Change-Id: Id990cfcd6364a029ddb66c7f746b4d2fee4ca12d
John Richardson [Thu, 24 Aug 2017 18:01:23 +0000 (18:01 +0000)]
Add new large constant array indexing tests am:
fc35227a44
am:
a67b2fc329
Change-Id: I35b2cf20443115906566fb8fd04c723d44b60d4c
james.glanville [Thu, 24 Aug 2017 18:01:11 +0000 (18:01 +0000)]
Reset GL_FRAMEBUFFER_SRGB state for ES tests am:
695727058b
am:
827499adc8
Change-Id: Ida2167c12afe32633c316f6723c57d8490da6467
james.glanville [Thu, 24 Aug 2017 18:00:59 +0000 (18:00 +0000)]
Apply sRGB conversion to reference in sRGB framebuffer fetch test am:
c76765be1f
am:
1a2bba672b
Change-Id: I74efce2d534ec3fb95999818412e5a00f00e2ab0
John Richardson [Thu, 24 Aug 2017 18:00:46 +0000 (18:00 +0000)]
Fix for integer formats in framebuffer extension tests am:
3bb47b5c57
am:
d88eb27b07
Change-Id: I66f03257c3938f8a47d38fed19afed75a5c7b915
John Richardson [Thu, 24 Aug 2017 18:00:34 +0000 (18:00 +0000)]
Add new framebuffer fetch extension tests am:
2a609fb223
am:
dc459c6a62
Change-Id: I55698c9a289cea96cfda8ede7ddef612909ff755
John Richardson [Thu, 24 Aug 2017 18:00:21 +0000 (18:00 +0000)]
Code clean up in swizzle math operations script am:
fc24d7d28c
am:
e0bc032205
Change-Id: I28ecd5062c3b59ed664cd9a77ee87dccf2d585d5
John Richardson [Thu, 24 Aug 2017 18:00:08 +0000 (18:00 +0000)]
Add new swizzle math operation tests am:
821035bbc9
am:
6a85779ded
Change-Id: I4c8766274b5ae97c2f082cb1623ffe7e886f44f0
Pyry Haulos [Thu, 24 Aug 2017 17:59:49 +0000 (17:59 +0000)]
Fix compute.exceed_atomic_counters_limit am:
5b837a5b21
am:
fd1b8ad87e
Change-Id: Ic2dbf0a248ac263bcb41894fe10841d02d1d69fc
Alexander Galazin [Thu, 24 Aug 2017 17:59:31 +0000 (17:59 +0000)]
Ensure vertex shader presence if a geometry shader exists am:
5dd0c1077c
am:
452c2c614e
Change-Id: I5cdaf6deae5e08ade91dff1ef450bb2f52c07703
Michael Hadley [Thu, 24 Aug 2017 17:59:19 +0000 (17:59 +0000)]
Add negative OES_sample_variables tests am:
d30cb29294
am:
ffc0164249
Change-Id: I3de245bfa2709406ae95c4e8439fdf01ec608dc3
John Richardson [Thu, 24 Aug 2017 17:59:07 +0000 (17:59 +0000)]
Add new compute negative coverage tests am:
db4a886f3f
am:
051309e020
Change-Id: I850ad84382e25c9dbcc4fd6f45d92cde297a9b5d
John Richardson [Thu, 24 Aug 2017 17:58:55 +0000 (17:58 +0000)]
Add new EGL enum negative case to robustness tests am:
c77b3cf9f3
am:
5d171f9a93
Change-Id: If8d4fd9006802a9037b644790dae22490a9d4a91
Michael Hadley [Thu, 24 Aug 2017 17:58:43 +0000 (17:58 +0000)]
Add negative sRGB texture/sampler API tests am:
a237c0c9ac
am:
33e1879c17
Change-Id: Id94620abb45c97299a7333718577f196401a6175
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
projects / platform / upstream / VK-GL-CTS.git / log