Mika Isojrvi [Wed, 8 Feb 2017 18:13:48 +0000 (18:13 +0000)]
Fix Android builds compiler flags
am:
e2af5c745d
Change-Id: Ic8ca64ec962c6fc4d78d0d628a740ce69c8a0e29
Mika Isojärvi [Mon, 6 Feb 2017 22:48:37 +0000 (14:48 -0800)]
Fix Android builds compiler flags
- Move -fwrapv to common flags
- Add -Wno-delete-non-virtual-dtor
Bug:
34676963
Test: Build deqp with the AOSP ARM64 target
Change-Id: I21e4c70ef5f2ebe7d306d5a4dcbb52933c4dff6d
Kalle Raita [Mon, 6 Feb 2017 20:24:26 +0000 (20:24 +0000)]
Merge "Check NDK version in the app build script"
am:
197032faf3
Change-Id: I886a1b1bd45006d00035258a2d1325652a9313f7
Treehugger Robot [Mon, 6 Feb 2017 20:18:40 +0000 (20:18 +0000)]
Merge "Check NDK version in the app build script"
Kalle Raita [Wed, 1 Feb 2017 19:25:05 +0000 (11:25 -0800)]
Check NDK version in the app build script
Prevents accidentally starting build with wrong version and prints
instructions for retrieving correct NDK version.
Test: manual for current build, using r12 (wrong version), and override
Change-Id: I4a021e71261d17897bb4285ce996a758db7e5419
Pyry Haulos [Fri, 3 Feb 2017 23:30:57 +0000 (23:30 +0000)]
Android: Test that mandatory extensions are supported
am:
2ef3d2cadd
Change-Id: Ieba8a9ae224215d5e68fb934fede4d1e5904ee0d
Pyry Haulos [Fri, 3 Feb 2017 23:03:25 +0000 (23:03 +0000)]
Android: Test that no Vulkan layers are enumerated
am:
4f0cdcd709
Change-Id: I59fb804cd944ae24bc78864fb7229709eca3476e
Pyry Haulos [Fri, 3 Feb 2017 22:53:24 +0000 (22:53 +0000)]
Android: Check KHX, GOOGLE, and ANDROID extensions
am:
5d9562a8c6
Change-Id: I3149f91b93dad8801cc0e4fa05e9c19aaf2d4984
Pyry Haulos [Fri, 3 Feb 2017 21:25:48 +0000 (13:25 -0800)]
Android: Test that mandatory extensions are supported
Change-Id: Id0e44299f1d8441bf1e7ecc91d82d3b06400e7e6
Pyry Haulos [Tue, 17 Jan 2017 23:49:02 +0000 (15:49 -0800)]
Android: Test that no Vulkan layers are enumerated
Change-Id: I43dacf306b468485fc160f175160555b9cf1c86d
Pyry Haulos [Wed, 11 Jan 2017 23:02:19 +0000 (15:02 -0800)]
Android: Check KHX, GOOGLE, and ANDROID extensions
Change-Id: I6ee24e584666e1f2542adf35943a2973c9392ad9
Pyry Haulos [Tue, 31 Jan 2017 01:48:37 +0000 (01:48 +0000)]
Merge "Update Android CTS Vulkan mustpass to match 1.0.2"
am:
8de4af67bb
Change-Id: I2accdd355e2d34d9d808ffb9b93afec01d0d345d
Treehugger Robot [Tue, 31 Jan 2017 01:45:31 +0000 (01:45 +0000)]
Merge "Update Android CTS Vulkan mustpass to match 1.0.2"
Michael Hadley [Tue, 31 Jan 2017 00:28:34 +0000 (00:28 +0000)]
Added gl_BoundingBox built-in type access tests
am:
ed63f60eb4
Change-Id: I1d0700b52ee7dfbd51f7e7165df01696d6b299cf
Michael Hadley [Tue, 31 Jan 2017 00:28:32 +0000 (00:28 +0000)]
Add SSBO block tests
am:
04ba289d6e
Change-Id: I33095ab7cebe48f0941370bf9d0b6c576a90c464
Pyry Haulos [Tue, 31 Jan 2017 00:02:32 +0000 (16:02 -0800)]
Update Android CTS Vulkan mustpass to match 1.0.2
This CL updates Android CTS mustpass for Vulkan to match Khronos Vulkan
CTS 1.0.2.0.
Change-Id: Ia2f82b5f6675c67940679eb98f59510f264d62bf
Michael Hadley [Wed, 14 Dec 2016 20:08:59 +0000 (20:08 +0000)]
Added gl_BoundingBox built-in type access tests
New tests:
- dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader_directive.accessing_bounding_box_type
Change-Id: I8f47dfdfde631f36f6a515459867b59e3c210701
Michael Hadley [Thu, 1 Dec 2016 17:52:17 +0000 (17:52 +0000)]
Add SSBO block tests
New Tests:
- dEQP-GLES31.functional.debug.negative_coverage.callbacks.ssbo_block.ssbo_block.*
Change-Id: I60d52bc34d9211e93332dcc719535f1f5e4a0596
John Richardson [Mon, 30 Jan 2017 20:43:56 +0000 (20:43 +0000)]
Add tessellation shader stages to negative layout_binding tests
am:
b7272b0934
Change-Id: I7b698194e1b617fa6c0e31ba437c1586f2c01a44
John Richardson [Mon, 30 Jan 2017 20:43:44 +0000 (20:43 +0000)]
Add new tessellation negative coverage tests
am:
1889817926
Change-Id: I8f4b76d0c37c88c45512352502ed138acc095fc4
John Richardson [Wed, 23 Nov 2016 14:48:32 +0000 (14:48 +0000)]
Add tessellation shader stages to negative layout_binding tests
Tests groups added to:
- dEQP-GLES31.functional.layout_binding.negative.sampler.sampler2d.*.
- dEQP-GLES31.functional.layout_binding.negative.sampler.sampler3d.*.
- dEQP-GLES31.functional.layout_binding.negative.ubo.*.
- dEQP-GLES31.functional.layout_binding.negative.ssbo.*.
- dEQP-GLES31.functional.layout_binding.negative.image.image2d.*.
- dEQP-GLES31.functional.layout_binding.negative.image.image3d.*.
New tests (tess_control, tess_evalution):
- binding_neg
- binding_over_max
- binding_neg_array
- binding_over_max_array
Extended tests:
- binding_contradictory
- binding_contradictory_array
Change-Id: Ia6b66f1d5316e3bba376a8aea189074b60fbedb5
John Richardson [Wed, 9 Nov 2016 08:34:43 +0000 (08:34 +0000)]
Add new tessellation negative coverage tests
Test groups added to:
- dEQP-GLES31.functional.shaders.linkage.tessellation.varying.rules
- dEQP-GLES31.functional.shaders.linkage.tessellation.layout_declarations.rules (new)
- dEQP-GLES31.functional.shaders.linkage.tessellation.barriers.rules (new)
- dEQP-GLES31.functional.debug.negative_coverage.*.tessellation (new)
New tests:
- output_non_array
- invalid_patch_in_usage
- invalid_patch_out_usage
- invalid_per_patch_qualifier_usage
- output_block_non_array
- invalid_barrier_usage_within_control_flow
- invalid_barrier_usage_after_return
- primitive_mode_mismatch
- spacing_mode_mismatch
- vertex_order_mismatch
- vertex_count_mismatch
- single_tessellation_stage
- invalid_primitive_mode
- tessellation_not_active
- invalid_program_state
- get_programiv
- invalid_program_queries
- tessellation_control_invalid_vertex_count
Change-Id: I0c4f4b407bfe80e09546af51fdb2d184cf310757
Xin Li [Thu, 26 Jan 2017 21:09:27 +0000 (21:09 +0000)]
Merge nougat-mr1-cts-dev into master.
am:
2dcacdbe0a
Change-Id: I4d80ab4fe02c0c7209365b08bf64358f6f7979e8
Xin Li [Thu, 26 Jan 2017 20:34:33 +0000 (20:34 +0000)]
Skip commit '
c5bbebc46ac7725d43692602422ee3fc76cac7b0' on
am:
b1fa5e8f2c
Change-Id: If4100aebe657cc11438526fc0d0151d4158e2372
Xin Li [Thu, 26 Jan 2017 20:34:22 +0000 (20:34 +0000)]
Merge commit '
2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to
am:
04974c3449
Change-Id: Idd92a7eeffaa2a6aec507dc3c886a6f08eea47be
Xin Li [Thu, 26 Jan 2017 18:55:24 +0000 (10:55 -0800)]
Merge nougat-mr1-cts-dev into master.
Xin Li [Thu, 26 Jan 2017 18:53:54 +0000 (10:53 -0800)]
Xin Li [Thu, 26 Jan 2017 18:28:31 +0000 (10:28 -0800)]
Merge commit '
2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from
nougat-cts-mr1-dev to master.
Change-Id: I9ad6799aaae603a05c0cc65bcff60df8bff88a95
Pyry Haulos [Tue, 24 Jan 2017 23:21:22 +0000 (23:21 +0000)]
Add eglChooseConfig() tests for EXT_pixel_format_float
am:
54c090f981
Change-Id: I03e6ac5098e24cdf1234734412b485ef8ba6e9a2
Pyry Haulos [Tue, 24 Jan 2017 23:21:20 +0000 (23:21 +0000)]
Add basic test for EGL_KHR_no_config_context
am:
d7ec39dd04
Change-Id: I8d311d08ebdb37f1eb81e1a22b14b587d0b31357
Pyry Haulos [Fri, 20 Jan 2017 18:30:13 +0000 (10:30 -0800)]
Add eglChooseConfig() tests for EXT_pixel_format_float
These tests verify that eglChooseConfig() filters configs correctly
based on EGL_COLOR_COMPONENT_TYPE_EXT attribute.
Change-Id: Icaaffee69dd46a9044149c01c8fe8b7ec8928305
Pyry Haulos [Fri, 20 Jan 2017 19:04:46 +0000 (11:04 -0800)]
Add basic test for EGL_KHR_no_config_context
Change-Id: I14aa3f38ea8d2aaa224c13a992d41cf5ef546f6e
Pyry Haulos [Tue, 24 Jan 2017 19:43:39 +0000 (19:43 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
am:
68408cad8f
Change-Id: I80f0e00e63ebbfe674b4f5d60e5da1a72084066b
Pyry Haulos [Tue, 24 Jan 2017 17:07:51 +0000 (09:07 -0800)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
Change-Id: Ifee45dee9fe57a8386c468dfedfb822c329f2504
Tina Zhou [Mon, 23 Jan 2017 19:22:38 +0000 (19:22 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222
am:
a6f61be6c3
Change-Id: I8f6e08168004906b53c8317556bbad339aea875e
Chad Versace [Mon, 23 Jan 2017 19:22:25 +0000 (19:22 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0
am:
91a1b97b09
Change-Id: I91ec061ca04588ab8fc0d14b881f5ee77218994c
Tina Zhou [Mon, 23 Jan 2017 19:22:13 +0000 (19:22 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea
am:
f1dcdc55d5
Change-Id: Ic823ceca5963c2fcb5ab4be0324cb57cfb102561
Chad Versace [Mon, 23 Jan 2017 19:22:02 +0000 (19:22 +0000)]
x11: Fix deadlock am:
5e863331b2
am:
cef17b4f69
Change-Id: Ib421c76250a51295f84e792c095128e7f065aaba
Tina Zhou [Mon, 23 Jan 2017 19:12:27 +0000 (19:12 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev
am:
cbdbf95222
Change-Id: I2531e5a260f50c8bae1a756a61026a46ae253614
Chad Versace [Mon, 23 Jan 2017 19:12:25 +0000 (19:12 +0000)]
x11: Call XInitThreads()
am:
5d11c9d2c0
Change-Id: Ib89f9fbfaa7d0b3dcb590fc2ac20ff2c83e3fbad
Tina Zhou [Mon, 23 Jan 2017 19:12:12 +0000 (19:12 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev
am:
34b869eeea
Change-Id: I5ffe988c3affcd3afeaf3c63b5011e42ef9a4ba1
Chad Versace [Mon, 23 Jan 2017 19:12:10 +0000 (19:12 +0000)]
x11: Fix deadlock
am:
5e863331b2
Change-Id: Ic938e269f89e59fc9ab8b43c97efcb49e0317180
Tina Zhou [Mon, 23 Jan 2017 19:11:49 +0000 (19:11 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev
am:
cbdbf95222
Change-Id: I063e616e5eb47560c87e4e550cb41e29bddca05a
Chad Versace [Mon, 23 Jan 2017 19:11:47 +0000 (19:11 +0000)]
x11: Call XInitThreads()
am:
5d11c9d2c0
Change-Id: Ibdd37ad696a32e47d56e7138949cac34cb6245a8
Tina Zhou [Mon, 23 Jan 2017 19:11:34 +0000 (19:11 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev
am:
34b869eeea
Change-Id: I7af8485bb0a56711f3dfe09bd16bf26bc7b5588a
Chad Versace [Mon, 23 Jan 2017 19:11:32 +0000 (19:11 +0000)]
x11: Fix deadlock
am:
5e863331b2
Change-Id: I1de362ce859395f3c7c932b1d6ad652925516dda
Tina Zhou [Mon, 23 Jan 2017 19:09:19 +0000 (19:09 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev
Tina Zhou [Mon, 23 Jan 2017 19:06:21 +0000 (19:06 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev
Kalle Raita [Sat, 21 Jan 2017 00:41:12 +0000 (00:41 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 -s ours
am:
462575748a
Change-Id: Ib7de359a842c02a280f8970e6d6e3221043722dc
Kalle Raita [Sat, 21 Jan 2017 00:41:05 +0000 (00:41 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f
am:
8bb21c1262
Change-Id: I11185aeebe3f3ad4cfb51015f1e0087514a2ce09
Kalle Raita [Sat, 21 Jan 2017 00:35:05 +0000 (00:35 +0000)]
CP: Remove two read-backs from copy image tests
am:
263e135474 -s ours
Change-Id: I3145b66433218cbd2d7a13452d2626cda66f001e
Kalle Raita [Sat, 21 Jan 2017 00:35:03 +0000 (00:35 +0000)]
CP: Non-compressed copy image target size (64,64,8
am:
7aff1a044f
Change-Id: I263ee368df721429983ace2e80a4ddeb17c2e2c3
Kalle Raita [Sat, 21 Jan 2017 00:23:35 +0000 (00:23 +0000)]
CP: Remove two read-backs from copy image tests
am:
263e135474
Change-Id: I9926edda54ffa5bdb0b5b7f9aeac08aab58237e8
Kalle Raita [Sat, 21 Jan 2017 00:23:33 +0000 (00:23 +0000)]
CP: Non-compressed copy image target size (64,64,8
am:
7aff1a044f
Change-Id: I55e1c77eb6558a7a396707cf541d529394be34b7
Chad Versace [Fri, 20 Jan 2017 22:59:10 +0000 (14:59 -0800)]
x11: Fix deadlock
When waiting for a window's MapNotify event, drain only that window's
event queue. Do NOT drain the global event queue, which includes all
windows' events.
Fixes deadlock in test 'dEQP-EGL.functional.multithread.window_context'
on Mesa master@
f57bdd48 with Intel Skylake.
Change-Id: I8c7f2db6c145f59493cb7572b20c4799e9a2cd0a
Depends-On: Ib3b535cec8295e062994fd759ae083c78641cf13
Chad Versace [Tue, 27 Dec 2016 21:47:33 +0000 (13:47 -0800)]
x11: Call XInitThreads()
Because the X11 manual says we must.
From man:XInitThreads(3):
The XInitThreads function initializes Xlib support for concurrent
threads. This function must be the first Xlib function
a multi-threaded program calls, and it must complete before any other
Xlib call is made.
Fixes crash in multithreaded test:
Test case 'dEQP-EGL.functional.multithread.window_context'..
[xcb] Unknown sequence number while processing queue
[xcb] Most likely this is a multi-threaded client and XInitThreads has not been called
[xcb] Aborting, sorry about that.
deqp-egl: xcb_io.c:259: poll_for_event: Assertion `!xcb_xlib_threads_sequence_lost' failed.
Change-Id: Ib3b535cec8295e062994fd759ae083c78641cf13
Kalle Raita [Thu, 1 Sep 2016 20:21:50 +0000 (13:21 -0700)]
CP: Remove two read-backs from copy image tests
Cherry pick commit
b2fb8ad5ceefe26964101bd403e7786ae83274a9
from master.
Bug:
33965234
Remove two read-backs from copy image tests
Test: Ran copy_image on N6 & N9 with L MR1 image to check for
false-negatives. PixelC and Pixel XL for passing with current OS image.
Change-Id: I9f7028eb550012f8d9abe2f7afee2d1402f5abf3
Kalle Raita [Wed, 7 Dec 2016 17:41:41 +0000 (09:41 -0800)]
CP: Non-compressed copy image target size (64,64,8
Cherry-pick commit
8076c97ac0fc706288ef266b0cbe748012c4e0c4 from master:
Non-compressed copy image tests target size reduced to (64,64,8). The
compressed cases retain old size of (128,128,16) to ensure coverage of
all block size combinations.
Bug:
33965234
Test: Run tests on N6 and N9 on L MR 1 with known failures
Change-Id: If22e8722c1de58aa239cf6fe29e79d3bdd13c589
Tina Zhou [Fri, 20 Jan 2017 20:32:02 +0000 (20:32 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf -s ours
am:
1d2a009979 -s ours
Change-Id: Ie406079ab3058b2203dbb3811194c086a595f858
Pyry Haulos [Fri, 20 Jan 2017 20:31:48 +0000 (20:31 +0000)]
Remove tests affected by NV/OES_viewport_array extension am:
267c765690 -s ours
am:
55fe6e8997 -s ours
Change-Id: I13085ccdcd995b71cbffdb619de4421ef7918da9
Tina Zhou [Fri, 20 Jan 2017 20:31:31 +0000 (20:31 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66
am:
ea7ea6aeee
Change-Id: I45a83cc65cfe838f11d13cac80bdc18ae9fed0fa
Alexander Galazin [Fri, 20 Jan 2017 20:31:19 +0000 (20:31 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca
am:
b1c225b9d6
Change-Id: I9305006c741bbb4109c54b3187473bab91fe4cfb
Tina Zhou [Fri, 20 Jan 2017 20:30:03 +0000 (20:30 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657
am:
487543e953
Change-Id: I4e1060cc6c204387f1520a40b97fa061a9044241
Pyry Haulos [Fri, 20 Jan 2017 20:29:48 +0000 (20:29 +0000)]
resolve merge conflicts of
ba455914 to master
am:
07a7e24da3
Change-Id: Iece28ec157fd5f603009ffb6fc9023cc0164ab1d
Tina Zhou [Fri, 20 Jan 2017 20:28:13 +0000 (20:28 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev
am:
e98444b9bf -s ours
Change-Id: I35eea6598260946f05bec754e9a627c263cad2f0
Pyry Haulos [Fri, 20 Jan 2017 20:28:12 +0000 (20:28 +0000)]
Remove tests affected by NV/OES_viewport_array extension
am:
267c765690 -s ours
Change-Id: I8f9d7aef632660fe6201035d381485072dbee063
Tina Zhou [Fri, 20 Jan 2017 20:27:56 +0000 (20:27 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev
am:
61d6d95a66
Change-Id: I1eb46e5e8e20d1f35eb7c0234e97aa0f0d8c1ea1
Alexander Galazin [Fri, 20 Jan 2017 20:27:55 +0000 (20:27 +0000)]
Generate flat triangles in polygon offset tests.
am:
975a59ebca
Change-Id: Ia1226e8da8462deb895b6e7e8113db5fd500565f
Tina Zhou [Fri, 20 Jan 2017 20:27:45 +0000 (20:27 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev
am:
312a550657
Change-Id: Ic9ad221d68e82f4b2fc31a6ca51f21fc731ca31d
Tina Zhou [Fri, 20 Jan 2017 18:37:20 +0000 (18:37 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a
am:
cc65e08407
Change-Id: I1f0093e12f40b5e0e694b28833c815ea14174fa2
Nicolas Boichat [Fri, 20 Jan 2017 18:37:07 +0000 (18:37 +0000)]
Fix eglBindAPI negative test am:
09784f8510
am:
2792165177
Change-Id: Ic7b93e76b3eed09c6a193dee9e99b5a60e327b2d
Tina Zhou [Fri, 20 Jan 2017 18:36:41 +0000 (18:36 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 -s ours
am:
7e8c7d9b65
Change-Id: Ifdf30f1ba3b3844a7bdcef1f039d17b02704e772
Kenneth Graunke [Fri, 20 Jan 2017 18:36:30 +0000 (18:36 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 -s ours
am:
727bdb2369
Change-Id: I5eec17ede97a0c83b4de7dbcc47e536a96ae3367
Tina Zhou [Fri, 20 Jan 2017 18:36:09 +0000 (18:36 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99
am:
e8956e54ae
Change-Id: I6035d3e7d62e1b49556abdcac6563f363f7164c3
Pyry Haulos [Fri, 20 Jan 2017 18:35:56 +0000 (18:35 +0000)]
Optimize swapchain OOM tests am:
1614827a71
am:
1f1eac5e9e
Change-Id: I7ad8770ac94694b57f07aef32b2235e67e05aa63
Tina Zhou [Fri, 20 Jan 2017 18:35:45 +0000 (18:35 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am:
0991459ed1
am:
98d1096b90
Change-Id: I6f8ac25b96706a941610b386e2317dca15a33fbe
Kenneth Graunke [Fri, 20 Jan 2017 18:35:35 +0000 (18:35 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f
am:
bd1ce838a0
Change-Id: Ie886fa96f1da7c960d0fbd8540e6e1fc196a6585
Tina Zhou [Fri, 20 Jan 2017 18:35:22 +0000 (18:35 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc -s ours
am:
306e8af13e -s ours
Change-Id: Ic85553551174fa4c8604b704b1030596351d7c90
Mark Adams [Fri, 20 Jan 2017 18:35:10 +0000 (18:35 +0000)]
Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 -s ours
am:
509b577c43 -s ours
Change-Id: I19d17f92ec3fc76ce56c84d04ea300ce8fcc37ac
Pyry Haulos [Fri, 20 Jan 2017 18:34:24 +0000 (10:34 -0800)]
resolve merge conflicts of
ba455914 to master
Change-Id: Iad350278ba3cf6adcc0fa5e4914e8d98db71a567
Tina Zhou [Fri, 20 Jan 2017 18:31:53 +0000 (18:31 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev
am:
6068dfbf3a
Change-Id: I6830683be5c3f71a47c61202689daa9a98797632
Nicolas Boichat [Fri, 20 Jan 2017 18:31:52 +0000 (18:31 +0000)]
Fix eglBindAPI negative test
am:
09784f8510
Change-Id: I286c03b0221c479bf4c4e98a4122eb6fe7290526
Tina Zhou [Fri, 20 Jan 2017 18:31:40 +0000 (18:31 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev
am:
3baf7e3be2 -s ours
Change-Id: I57408e9f40640fec25656024aad4a9a047b48e2b
Kenneth Graunke [Fri, 20 Jan 2017 18:31:39 +0000 (18:31 +0000)]
Drop incorrect framebuffer texture subtests.
am:
625d685874 -s ours
Change-Id: I7753f87b0fed949615678a5dda727814dcd6007b
Tina Zhou [Fri, 20 Jan 2017 18:31:25 +0000 (18:31 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev
am:
c811d42d99
Change-Id: Iff260b7a0cac1f300e09ae4799c0f0bb37e6fd16
Pyry Haulos [Fri, 20 Jan 2017 18:31:24 +0000 (18:31 +0000)]
Optimize swapchain OOM tests
am:
1614827a71
Change-Id: Ia597d433e2978dea15e46e5dd13cd7e723dd11c2
Tina Zhou [Fri, 20 Jan 2017 18:31:08 +0000 (18:31 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev
am:
0991459ed1
Change-Id: Iaad1f68482163e3e8940baf9139b29b66c4ed6f2
Kenneth Graunke [Fri, 20 Jan 2017 18:31:07 +0000 (18:31 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests.
am:
2ed3a5a66f
Change-Id: I979d7d709017237a7e201017b270aacaefc01013
Tina Zhou [Fri, 20 Jan 2017 18:31:04 +0000 (18:31 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev
am:
e98444b9bf
Change-Id: I03190aa34e911cb4a8b174d1251a354ff6e34718
Pyry Haulos [Fri, 20 Jan 2017 18:31:02 +0000 (18:31 +0000)]
Remove tests affected by NV/OES_viewport_array extension
am:
267c765690
Change-Id: I74f0255f38b618d9c72e1e48fabbda9636daf14d
Tina Zhou [Fri, 20 Jan 2017 18:30:48 +0000 (18:30 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev
am:
61d6d95a66
Change-Id: Ia7141732269df847c13bbb8b36e9f911c76d8753
Alexander Galazin [Fri, 20 Jan 2017 18:30:47 +0000 (18:30 +0000)]
Generate flat triangles in polygon offset tests.
am:
975a59ebca
Change-Id: If91ab1b34f3215705636abaa4dc52ebad5d3d3a7
Tina Zhou [Fri, 20 Jan 2017 18:30:36 +0000 (18:30 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev
am:
312a550657
Change-Id: Ia8465e3ae1fb9d80125305134c157857e5e339b1
Pyry Haulos [Fri, 20 Jan 2017 18:30:35 +0000 (18:30 +0000)]
Relax line width verification in primitive bbox tests
am:
ba45591407
Change-Id: Ia0f71e5511d1bf4bf449ef71ecf5bb822311cf08
Tina Zhou [Fri, 20 Jan 2017 18:30:23 +0000 (18:30 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev
am:
6068dfbf3a
Change-Id: I4ca862cbe3c17c0887437a98570f16e1bfc19d34
Nicolas Boichat [Fri, 20 Jan 2017 18:30:22 +0000 (18:30 +0000)]
Fix eglBindAPI negative test
am:
09784f8510
Change-Id: I9f1246736de39cfc6bc6593bad465fa881f55e29
Tina Zhou [Fri, 20 Jan 2017 18:30:11 +0000 (18:30 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev
am:
3baf7e3be2
Change-Id: I2f95c748059d7aea5f1899ff6ee6c0fe96ea7245
Kenneth Graunke [Fri, 20 Jan 2017 18:30:10 +0000 (18:30 +0000)]
Drop incorrect framebuffer texture subtests.
am:
625d685874
Change-Id: I7b1cab296c2a61ed3e05ae52dd21fd62bc6d3c8a
Tina Zhou [Fri, 20 Jan 2017 18:29:58 +0000 (18:29 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev
am:
c811d42d99
Change-Id: I06e852cc34ee156dbd66ac36fbb052a2db8ec36f
Pyry Haulos [Fri, 20 Jan 2017 18:29:57 +0000 (18:29 +0000)]
Optimize swapchain OOM tests
am:
1614827a71
Change-Id: I5ac33602999153d04624eb32504437ffff9b3b51
projects / platform / upstream / VK-GL-CTS.git / log