platform/upstream/VK-GL-CTS.git
7 years agoAdd tessellation shader stages to negative layout_binding tests
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

7 years agoAdd new tessellation negative coverage tests
John Richardson [Mon, 30 Jan 2017 20:43:44 +0000 (20:43 +0000)]
Add new tessellation negative coverage tests
am: 1889817926

Change-Id: I8f4b76d0c37c88c45512352502ed138acc095fc4

7 years agoAdd tessellation shader stages to negative layout_binding tests
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

7 years agoAdd new tessellation negative coverage tests
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

7 years agoMerge nougat-mr1-cts-dev into master.
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

7 years agoSkip commit 'c5bbebc46ac7725d43692602422ee3fc76cac7b0' on master.
Xin Li [Thu, 26 Jan 2017 20:34:33 +0000 (20:34 +0000)]
Skip commit 'c5bbebc46ac7725d43692602422ee3fc76cac7b0' on 
am: b1fa5e8f2c

Change-Id: If4100aebe657cc11438526fc0d0151d4158e2372

7 years agoMerge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to...
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

7 years agoMerge nougat-mr1-cts-dev into master.
Xin Li [Thu, 26 Jan 2017 18:55:24 +0000 (10:55 -0800)]
Merge nougat-mr1-cts-dev into master.

7 years agoSkip commit 'c5bbebc46ac7725d43692602422ee3fc76cac7b0' on master.
Xin Li [Thu, 26 Jan 2017 18:53:54 +0000 (10:53 -0800)]
Skip commit 'c5bbebc46ac7725d43692602422ee3fc76cac7b0' on 

7 years agoMerge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from
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

7 years agoAdd eglChooseConfig() tests for EXT_pixel_format_float
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

7 years agoAdd basic test for EGL_KHR_no_config_context
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

7 years agoAdd eglChooseConfig() tests for EXT_pixel_format_float
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

7 years agoAdd basic test for EGL_KHR_no_config_context
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

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
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

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
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

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222
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

7 years agox11: Call XInitThreads() am: 5d11c9d2c0
Chad Versace [Mon, 23 Jan 2017 19:22:25 +0000 (19:22 +0000)]
x11: Call XInitThreads() am: 5d11c9d2c0
am: 91a1b97b09

Change-Id: I91ec061ca04588ab8fc0d14b881f5ee77218994c

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea
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

7 years agox11: Fix deadlock am: 5e863331b2
Chad Versace [Mon, 23 Jan 2017 19:22:02 +0000 (19:22 +0000)]
x11: Fix deadlock am: 5e863331b2
am: cef17b4f69

Change-Id: Ib421c76250a51295f84e792c095128e7f065aaba

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev
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

7 years agox11: Call XInitThreads()
Chad Versace [Mon, 23 Jan 2017 19:12:25 +0000 (19:12 +0000)]
x11: Call XInitThreads()
am: 5d11c9d2c0

Change-Id: Ib89f9fbfaa7d0b3dcb590fc2ac20ff2c83e3fbad

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev
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

7 years agox11: Fix deadlock
Chad Versace [Mon, 23 Jan 2017 19:12:10 +0000 (19:12 +0000)]
x11: Fix deadlock
am: 5e863331b2

Change-Id: Ic938e269f89e59fc9ab8b43c97efcb49e0317180

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev
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

7 years agox11: Call XInitThreads()
Chad Versace [Mon, 23 Jan 2017 19:11:47 +0000 (19:11 +0000)]
x11: Call XInitThreads()
am: 5d11c9d2c0

Change-Id: Ibdd37ad696a32e47d56e7138949cac34cb6245a8

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev
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

7 years agox11: Fix deadlock
Chad Versace [Mon, 23 Jan 2017 19:11:32 +0000 (19:11 +0000)]
x11: Fix deadlock
am: 5e863331b2

Change-Id: I1de362ce859395f3c7c932b1d6ad652925516dda

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev
Tina Zhou [Mon, 23 Jan 2017 19:09:19 +0000 (19:09 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev

7 years agoMerge "x11: Fix deadlock" 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

7 years agoCP: Remove two read-backs from copy image tests am: 263e135474 -s ours
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

7 years agoCP: Non-compressed copy image target size (64,64,8 am: 7aff1a044f
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

7 years agoCP: Remove two read-backs from copy image tests
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

7 years agoCP: Non-compressed copy image target size (64,64,8
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

7 years agoCP: Remove two read-backs from copy image tests
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

7 years agoCP: Non-compressed copy image target size (64,64,8
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

7 years agox11: Fix deadlock
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

7 years agox11: Call XInitThreads()
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

7 years agoCP: Remove two read-backs from copy image tests
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

7 years agoCP: Non-compressed copy image target size (64,64,8
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

7 years agoMerge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts...
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

7 years agoRemove tests affected by NV/OES_viewport_array extension am: 267c765690 -s ours
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

7 years agoMerge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:...
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

7 years agoGenerate flat triangles in polygon offset tests. am: 975a59ebca
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

7 years agoMerge "Relax line width verification in primitive bbox tests" into nougat-cts-dev...
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

7 years agoresolve merge conflicts of ba455914 to master
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

7 years agoMerge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev
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

7 years agoRemove tests affected by NV/OES_viewport_array extension
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

7 years agoMerge "Generate flat triangles in polygon offset tests." into nougat-cts-dev
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

7 years agoGenerate flat triangles in polygon offset tests.
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

7 years agoMerge "Relax line width verification in primitive bbox tests" into nougat-cts-dev
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

7 years agoMerge "Fix eglBindAPI negative test" into nougat-cts-dev am: 6068dfbf3a
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

7 years agoFix eglBindAPI negative test am: 09784f8510
Nicolas Boichat [Fri, 20 Jan 2017 18:37:07 +0000 (18:37 +0000)]
Fix eglBindAPI negative test am: 09784f8510
am: 2792165177

Change-Id: Ic7b93e76b3eed09c6a193dee9e99b5a60e327b2d

7 years agoMerge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3b...
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

7 years agoDrop incorrect framebuffer texture subtests. am: 625d685874 -s ours
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

7 years agoMerge "Optimize swapchain OOM tests" into nougat-cts-dev am: c811d42d99
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

7 years agoOptimize swapchain OOM tests am: 1614827a71
Pyry Haulos [Fri, 20 Jan 2017 18:35:56 +0000 (18:35 +0000)]
Optimize swapchain OOM tests am: 1614827a71
am: 1f1eac5e9e

Change-Id: I7ad8770ac94694b57f07aef32b2235e67e05aa63

7 years agoMerge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into...
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

7 years agoFix internal format/type for ES3 3D + depth/stencil negative API tests. am: 2ed3a5a66f
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

7 years agoMerge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am: 13a05434cc...
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

7 years agoAdd support for EGL_EXT_pixel_format_float am: 521bf8a7c3 -s ours
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

7 years agoresolve merge conflicts of ba455914 to master
Pyry Haulos [Fri, 20 Jan 2017 18:34:24 +0000 (10:34 -0800)]
resolve merge conflicts of ba455914 to master

Change-Id: Iad350278ba3cf6adcc0fa5e4914e8d98db71a567

7 years agoMerge "Fix eglBindAPI negative test" into nougat-cts-dev
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

7 years agoFix eglBindAPI negative test
Nicolas Boichat [Fri, 20 Jan 2017 18:31:52 +0000 (18:31 +0000)]
Fix eglBindAPI negative test
am: 09784f8510

Change-Id: I286c03b0221c479bf4c4e98a4122eb6fe7290526

7 years agoMerge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev
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

7 years agoDrop incorrect framebuffer texture subtests.
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

7 years agoMerge "Optimize swapchain OOM tests" into nougat-cts-dev
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

7 years agoOptimize swapchain OOM tests
Pyry Haulos [Fri, 20 Jan 2017 18:31:24 +0000 (18:31 +0000)]
Optimize swapchain OOM tests
am: 1614827a71

Change-Id: Ia597d433e2978dea15e46e5dd13cd7e723dd11c2

7 years agoMerge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into...
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

7 years agoFix internal format/type for ES3 3D + depth/stencil negative API tests.
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

7 years agoMerge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev
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

7 years agoRemove tests affected by NV/OES_viewport_array extension
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

7 years agoMerge "Generate flat triangles in polygon offset tests." into nougat-cts-dev
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

7 years agoGenerate flat triangles in polygon offset tests.
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

7 years agoMerge "Relax line width verification in primitive bbox tests" into nougat-cts-dev
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

7 years agoRelax line width verification in primitive bbox tests
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

7 years agoMerge "Fix eglBindAPI negative test" into nougat-cts-dev
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

7 years agoFix eglBindAPI negative test
Nicolas Boichat [Fri, 20 Jan 2017 18:30:22 +0000 (18:30 +0000)]
Fix eglBindAPI negative test
am: 09784f8510

Change-Id: I9f1246736de39cfc6bc6593bad465fa881f55e29

7 years agoMerge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev
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

7 years agoDrop incorrect framebuffer texture subtests.
Kenneth Graunke [Fri, 20 Jan 2017 18:30:10 +0000 (18:30 +0000)]
Drop incorrect framebuffer texture subtests.
am: 625d685874

Change-Id: I7b1cab296c2a61ed3e05ae52dd21fd62bc6d3c8a

7 years agoMerge "Optimize swapchain OOM tests" into nougat-cts-dev
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

7 years agoOptimize swapchain OOM tests
Pyry Haulos [Fri, 20 Jan 2017 18:29:57 +0000 (18:29 +0000)]
Optimize swapchain OOM tests
am: 1614827a71

Change-Id: I5ac33602999153d04624eb32504437ffff9b3b51

7 years agoMerge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into...
Tina Zhou [Fri, 20 Jan 2017 18:29:46 +0000 (18:29 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev
am: 0991459ed1

Change-Id: If9f75801b7ea26bec470e4dd11b318431ed56352

7 years agoFix internal format/type for ES3 3D + depth/stencil negative API tests.
Kenneth Graunke [Fri, 20 Jan 2017 18:29:45 +0000 (18:29 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests.
am: 2ed3a5a66f

Change-Id: I9439b037614e52368b771e1b7a84bd4930bfbf6a

7 years agoMerge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:29:33 +0000 (18:29 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev
am: 13a05434cc

Change-Id: Ic956c9c223aef327c2614b3f52ecf5c1166bec22

7 years agoAdd support for EGL_EXT_pixel_format_float
Mark Adams [Fri, 20 Jan 2017 18:29:32 +0000 (18:29 +0000)]
Add support for EGL_EXT_pixel_format_float
am: 521bf8a7c3

Change-Id: I64bda78561b2eb598e78bb2ba13b485602ea96e7

7 years agoMerge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:29:13 +0000 (18:29 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev
am: 13a05434cc  -s ours

Change-Id: Ib0bb082d5c906b0b614387c2c7bfab5e5727b160

7 years agoAdd support for EGL_EXT_pixel_format_float
Mark Adams [Fri, 20 Jan 2017 18:29:10 +0000 (18:29 +0000)]
Add support for EGL_EXT_pixel_format_float
am: 521bf8a7c3  -s ours

Change-Id: I51c41d6dcc7fb454f05dbbefeab1af0413215c4f

7 years agoMerge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:28:49 +0000 (18:28 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev

7 years agoMerge "Generate flat triangles in polygon offset tests." into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:28:42 +0000 (18:28 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev

7 years agoMerge "Relax line width verification in primitive bbox tests" into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:28:34 +0000 (18:28 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev

7 years agoMerge "Fix eglBindAPI negative test" into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:28:26 +0000 (18:28 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev

7 years agoMerge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:28:18 +0000 (18:28 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev

7 years agoMerge "Optimize swapchain OOM tests" into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:27:50 +0000 (18:27 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev

7 years agoMerge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into...
Tina Zhou [Fri, 20 Jan 2017 18:27:40 +0000 (18:27 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev

7 years agoMerge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:27:14 +0000 (18:27 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev

7 years agoMerge "Revert "Workaround for GCC aarch64 compiler bug""
Pyry Haulos [Thu, 19 Jan 2017 23:22:55 +0000 (23:22 +0000)]
Merge "Revert "Workaround for GCC aarch64 compiler bug""
am: 516ebfdd41

Change-Id: Iebf581676394db8614036086954b9fa432566acb

7 years agoMerge "Revert "Workaround for GCC aarch64 compiler bug""
Treehugger Robot [Thu, 19 Jan 2017 23:18:56 +0000 (23:18 +0000)]
Merge "Revert "Workaround for GCC aarch64 compiler bug""

7 years agoReverse the expectation in SSO match_different_[member_]struct_names
Pyry Haulos [Thu, 19 Jan 2017 21:37:47 +0000 (21:37 +0000)]
Reverse the expectation in SSO match_different_[member_]struct_names
am: 68f263d56a

Change-Id: Ic386ff47f47d9aa38cedad1089ae34b2be289224

7 years agoRevert "Workaround for GCC aarch64 compiler bug"
Pyry Haulos [Thu, 19 Jan 2017 21:28:17 +0000 (13:28 -0800)]
Revert "Workaround for GCC aarch64 compiler bug"

dEQP in Android CTS is now built with LLVM exclusively so reverting this
old workaround for GCC compiler bug is safe.

This reverts commit 00b60d29a1da01c554a3af8f96112199231145d2.

Bug: 17907351
Change-Id: I8d118195159e8238e6e4911ed187c2608d8418d3