platform/upstream/VK-GL-CTS.git
7 years agoMerge "Merge "Relax line width verification in primitive bbox tests" into nougat...
Tina Zhou [Fri, 20 Jan 2017 21:00:07 +0000 (21:00 +0000)]
Merge "Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am: 312a550657 am: 36d3dd2ab1 am: 5debc545bf am: ee10cd68f7 am: bc02b9f045" into nyc-mr2-dev-plus-aosp
am: d065cd796c

Change-Id: I289895432f366e810da907270c5a0e25e6185cee

7 years agoMerge "Relax line width verification in primitive bbox tests" into nougat-cts-dev...
Tina Zhou [Fri, 20 Jan 2017 21:00:04 +0000 (21:00 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am: 312a550657 am: 36d3dd2ab1 am: 5debc545bf am: ee10cd68f7 am: bc02b9f045
am: 54491f9f70

Change-Id: Ie7d3c55b24b9a4d33d96a4c9dda577cd6d518906

7 years agoMerge "Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into...
Tina Zhou [Fri, 20 Jan 2017 20:59:40 +0000 (20:59 +0000)]
Merge "Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf  -s ours am: 1d2a009979  -s ours am: 2c6307af33  -s ours" into nyc-mr1-dev-plus-aosp am: cf38dd18f9  -s ours" into nyc-mr2-dev-plus-aosp
am: 8ddf92f83f  -s ours

Change-Id: I62c6ee92e840e9df6bb7c7fa18c51709b52e60ec

7 years agoMerge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat...
Tina Zhou [Fri, 20 Jan 2017 20:59:35 +0000 (20:59 +0000)]
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf  -s ours am: 1d2a009979  -s ours am: 2c6307af33  -s ours" into nyc-mr1-dev-plus-aosp am: cf38dd18f9  -s ours
am: 731f55380c  -s ours

Change-Id: I67875ae50bbb82539fcbc9f38cc1d92e3b3c98d5

7 years agoMerge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat...
Tina Zhou [Fri, 20 Jan 2017 20:59:10 +0000 (20:59 +0000)]
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf  -s ours am: 1d2a009979  -s ours am: 2c6307af33  -s ours am: 57ac8058b6  -s ours" into nyc-mr2-dev-plus-aosp
am: 85830e3e45  -s ours

Change-Id: I6894e5f90b2c57d43a36896da8a388e43702ac36

7 years agoMerge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts...
Tina Zhou [Fri, 20 Jan 2017 20:59:07 +0000 (20:59 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf  -s ours am: 1d2a009979  -s ours am: 2c6307af33  -s ours am: 57ac8058b6  -s ours
am: 91f0b198ee  -s ours

Change-Id: Ic8c7f71b789b4012591da21583fa3739c83420a5

7 years agoMerge "Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690...
Pyry Haulos [Fri, 20 Jan 2017 20:58:44 +0000 (20:58 +0000)]
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690  -s ours am: 55fe6e8997  -s ours am: 7bab558fb8  -s ours" into nyc-mr1-dev-plus-aosp am: a185466ba9  -s ours" into nyc-mr2-dev-plus-aosp
am: 9f321a7874  -s ours

Change-Id: I275becb76aef6cb3bf219bc438aa8ee5b012c73b

7 years agoMerge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 ...
Pyry Haulos [Fri, 20 Jan 2017 20:58:40 +0000 (20:58 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690  -s ours am: 55fe6e8997  -s ours am: 7bab558fb8  -s ours" into nyc-mr1-dev-plus-aosp am: a185466ba9  -s ours
am: 3b908a5583  -s ours

Change-Id: Iffc1781093fb35750d0b6d443a46bc5748445ab8

7 years agoMerge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 ...
Pyry Haulos [Fri, 20 Jan 2017 20:58:16 +0000 (20:58 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690  -s ours am: 55fe6e8997  -s ours am: 7bab558fb8  -s ours am: 578e9af267  -s ours" into nyc-mr2-dev-plus-aosp
am: 00e79d6cb0  -s ours

Change-Id: I6d13dfd8cf3f66075c29f7516efd4fd1e420fb56

7 years agoRemove tests affected by NV/OES_viewport_array extension am: 267c765690 -s ours...
Pyry Haulos [Fri, 20 Jan 2017 20:58:12 +0000 (20:58 +0000)]
Remove tests affected by NV/OES_viewport_array extension am: 267c765690  -s ours am: 55fe6e8997  -s ours am: 7bab558fb8  -s ours am: 578e9af267  -s ours
am: a98fc6842f  -s ours

Change-Id: I02c059e358761b38ee1e769b9a938abc475967ae

7 years agoMerge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat...
Tina Zhou [Fri, 20 Jan 2017 20:57:49 +0000 (20:57 +0000)]
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf am: 41c599b77e am: 9d74d882df am: b3182128b8 am: a9eaaaca53 am: c0d6b5c22b  -s ours" into nyc-mr2-dev-plus-aosp
am: 1a7a472c46  -s ours

Change-Id: I6821e3a4efc0d2febfb7bd2bf39e3d732ff4bf14

7 years agoMerge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts...
Tina Zhou [Fri, 20 Jan 2017 20:57:46 +0000 (20:57 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf am: 41c599b77e am: 9d74d882df am: b3182128b8 am: a9eaaaca53 am: c0d6b5c22b  -s ours
am: ab3c5142fa  -s ours

Change-Id: I29c7f66d9c9695e2655f0a47ce38faa700f49794

7 years agoMerge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am...
Pyry Haulos [Fri, 20 Jan 2017 20:57:17 +0000 (20:57 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am: e4ed95024e am: 578afa4c88 am: 22a8808370 am: 7b177f2f34 am: 3665d90d07  -s ours" into nyc-mr2-dev-plus-aosp
am: 0814dedc8b  -s ours

Change-Id: I28a1e7d6667d2101ffd9ee6023775ac7fcb63b1d

7 years agoRemove tests affected by NV/OES_viewport_array extension am: 267c765690 am: e4ed95024...
Pyry Haulos [Fri, 20 Jan 2017 20:57:15 +0000 (20:57 +0000)]
Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am: e4ed95024e am: 578afa4c88 am: 22a8808370 am: 7b177f2f34 am: 3665d90d07  -s ours
am: 606e0ad44f  -s ours

Change-Id: I5b9b9bed2aea34ef9e785d4789466d90b81e3599

7 years agoMerge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev...
Tina Zhou [Fri, 20 Jan 2017 20:56:48 +0000 (20:56 +0000)]
Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am: 61d6d95a66 am: 5611bf398b am: e2d1c25650 am: d368eb8664 am: 8cfa8cb220 am: 987939f284" into nyc-mr2-dev-plus-aosp
am: c4617ac622

Change-Id: Ic17bb443ec60de537989f4770d3ef140a1810cb3

7 years agoMerge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:...
Tina Zhou [Fri, 20 Jan 2017 20:56:46 +0000 (20:56 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am: 61d6d95a66 am: 5611bf398b am: e2d1c25650 am: d368eb8664 am: 8cfa8cb220 am: 987939f284
am: 92f412bb50

Change-Id: I114c30236f3ea3d0df06831ecb8a63ea91e2efe2

7 years agoMerge "Generate flat triangles in polygon offset tests. am: 975a59ebca am: 0bde00f9d6...
Alexander Galazin [Fri, 20 Jan 2017 20:56:24 +0000 (20:56 +0000)]
Merge "Generate flat triangles in polygon offset tests. am: 975a59ebca am: 0bde00f9d6 am: b57eb2d24f am: aa9a995cfc am: afc69d0dd1 am: f7bcd5d876" into nyc-mr2-dev-plus-aosp
am: d6eee093f9

Change-Id: I02deb616cdf9ebb358d1f5def005b830ad93677d

7 years agoGenerate flat triangles in polygon offset tests. am: 975a59ebca am: 0bde00f9d6 am...
Alexander Galazin [Fri, 20 Jan 2017 20:56:22 +0000 (20:56 +0000)]
Generate flat triangles in polygon offset tests. am: 975a59ebca am: 0bde00f9d6 am: b57eb2d24f am: aa9a995cfc am: afc69d0dd1 am: f7bcd5d876
am: 4fdce7d4d1

Change-Id: I33c47fd6ed72205f72be885cc79a8ba4a8857db2

7 years agoMerge "Merge "Relax line width verification in primitive bbox tests" into nougat...
Tina Zhou [Fri, 20 Jan 2017 20:55:58 +0000 (20:55 +0000)]
Merge "Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am: 312a550657 am: f3d81a3cd9 am: 3b0479c233 am: 0a2fdff220 am: d8355f769b am: a4ca32e8d3" into nyc-mr2-dev-plus-aosp
am: bb99be6bcd

Change-Id: I1a1480e1ea48894a06a915d1b894efca356643d5

7 years agoMerge "Relax line width verification in primitive bbox tests" into nougat-cts-dev...
Tina Zhou [Fri, 20 Jan 2017 20:55:56 +0000 (20:55 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am: 312a550657 am: f3d81a3cd9 am: 3b0479c233 am: 0a2fdff220 am: d8355f769b am: a4ca32e8d3
am: 10374df5c4

Change-Id: I88d4e7a2dd9a5ae8fb489e67ef55505db90182a1

7 years agoMerge "Relax line width verification in primitive bbox tests am: ba45591407 am: b4fbc...
Pyry Haulos [Fri, 20 Jan 2017 20:55:30 +0000 (20:55 +0000)]
Merge "Relax line width verification in primitive bbox tests am: ba45591407 am: b4fbc02e3c am: b9b63c17d2 am: 4f191e12a9 am: c29aba4a88 am: e29f3de157" into nyc-mr2-dev-plus-aosp
am: 140a9f7e32

Change-Id: If70d6ac6b5af0931d89eef4184d89fba5a49857c

7 years agoRelax line width verification in primitive bbox tests am: ba45591407 am: b4fbc02e3c...
Pyry Haulos [Fri, 20 Jan 2017 20:55:28 +0000 (20:55 +0000)]
Relax line width verification in primitive bbox tests am: ba45591407 am: b4fbc02e3c am: b9b63c17d2 am: 4f191e12a9 am: c29aba4a88 am: e29f3de157
am: befdc5649a

Change-Id: I971d0bad1d7f71ad0561cf986067995042fde79b

7 years agoMerge "Merge "Fix eglBindAPI negative test" into nougat-cts-dev am: 6068dfbf3a am...
Tina Zhou [Fri, 20 Jan 2017 20:55:00 +0000 (20:55 +0000)]
Merge "Merge "Fix eglBindAPI negative test" into nougat-cts-dev am: 6068dfbf3a am: 365f81e68c am: 15cde0b466 am: b21dbe99b2 am: 930d6894e5 am: 1a09b5270f" into nyc-mr2-dev-plus-aosp
am: 1a22842512

Change-Id: Ia0224916079992f0bdac6e93c30343da867d89d5

7 years agoMerge "Fix eglBindAPI negative test" into nougat-cts-dev am: 6068dfbf3a am: 365f81e68...
Tina Zhou [Fri, 20 Jan 2017 20:54:57 +0000 (20:54 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am: 6068dfbf3a am: 365f81e68c am: 15cde0b466 am: b21dbe99b2 am: 930d6894e5 am: 1a09b5270f
am: 5999552dcf

Change-Id: I3fda49a151e4dc26f101bda6648342c41bf0d2ed

7 years agoMerge "Fix eglBindAPI negative test am: 09784f8510 am: 3342150f5a am: 1af587d644...
Nicolas Boichat [Fri, 20 Jan 2017 20:54:31 +0000 (20:54 +0000)]
Merge "Fix eglBindAPI negative test am: 09784f8510 am: 3342150f5a am: 1af587d644 am: 52211c87ed am: fc116aa764 am: 5b5f75828b" into nyc-mr2-dev-plus-aosp
am: f40c8d91c6

Change-Id: I36b39dbff29f9b1fd6fd6e6a2ee2c76a575025cd

7 years agoFix eglBindAPI negative test am: 09784f8510 am: 3342150f5a am: 1af587d644 am: 52211c8...
Nicolas Boichat [Fri, 20 Jan 2017 20:54:29 +0000 (20:54 +0000)]
Fix eglBindAPI negative test am: 09784f8510 am: 3342150f5a am: 1af587d644 am: 52211c87ed am: fc116aa764 am: 5b5f75828b
am: a8199aac7c

Change-Id: Ic0f81126c4f712c2708fc51afb51a15506d90407

7 years agoMerge "Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am...
Tina Zhou [Fri, 20 Jan 2017 20:54:04 +0000 (20:54 +0000)]
Merge "Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3be2 am: a580ae91f8 am: 816d6bdb88 am: f49c7ce972 am: a91d8f9bf5 am: 6fd723a7cc" into nyc-mr2-dev-plus-aosp
am: 072c251d10

Change-Id: I8689598e3e2ea9195fc3d75ff14320cc9ac0c65f

7 years agoMerge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3b...
Tina Zhou [Fri, 20 Jan 2017 20:54:02 +0000 (20:54 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3be2 am: a580ae91f8 am: 816d6bdb88 am: f49c7ce972 am: a91d8f9bf5 am: 6fd723a7cc
am: bd1a96bd10

Change-Id: I200ed13156d9736f95cf5423bbf1f364ae204301

7 years agoMerge "Drop incorrect framebuffer texture subtests. am: 625d685874 am: 25b6d76b01...
Kenneth Graunke [Fri, 20 Jan 2017 20:53:40 +0000 (20:53 +0000)]
Merge "Drop incorrect framebuffer texture subtests. am: 625d685874 am: 25b6d76b01 am: 6f6f3d78fc am: 18805bd38c am: ce197d0f27 am: 0e230d6099" into nyc-mr2-dev-plus-aosp
am: 1c4dcaec85

Change-Id: I202b495357f5ae8ede6b5d6aa0cc7fcb73b8cc4f

7 years agoDrop incorrect framebuffer texture subtests. am: 625d685874 am: 25b6d76b01 am: 6f6f3d...
Kenneth Graunke [Fri, 20 Jan 2017 20:53:39 +0000 (20:53 +0000)]
Drop incorrect framebuffer texture subtests. am: 625d685874 am: 25b6d76b01 am: 6f6f3d78fc am: 18805bd38c am: ce197d0f27 am: 0e230d6099
am: 2032b1fbed

Change-Id: Id9cea46c263ec49a22844e8cde517bcc77c46851

7 years agoMerge "Merge "Optimize swapchain OOM tests" into nougat-cts-dev am: c811d42d99 am...
Tina Zhou [Fri, 20 Jan 2017 20:53:13 +0000 (20:53 +0000)]
Merge "Merge "Optimize swapchain OOM tests" into nougat-cts-dev am: c811d42d99 am: 6d4c0dca61 am: d64bb66820 am: ec68ba0951 am: b7985f162a am: 4ab2fada98" into nyc-mr2-dev-plus-aosp
am: 8f231318dc

Change-Id: I1bf17123bb98ead4f4c99918600745a3d926e695

7 years agoMerge "Optimize swapchain OOM tests" into nougat-cts-dev am: c811d42d99 am: 6d4c0dca6...
Tina Zhou [Fri, 20 Jan 2017 20:53:10 +0000 (20:53 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am: c811d42d99 am: 6d4c0dca61 am: d64bb66820 am: ec68ba0951 am: b7985f162a am: 4ab2fada98
am: d9e96ae59b

Change-Id: Id166754d6b9d5d353272cf7ee8c6aea41c82c7bf

7 years agoMerge "Optimize swapchain OOM tests am: 1614827a71 am: 2cfe132119 am: 00ab17bd23...
Pyry Haulos [Fri, 20 Jan 2017 20:52:36 +0000 (20:52 +0000)]
Merge "Optimize swapchain OOM tests am: 1614827a71 am: 2cfe132119 am: 00ab17bd23 am: c9b7dae8a8 am: acce97d998 am: 23baea4982" into nyc-mr2-dev-plus-aosp
am: 1fbdd02485

Change-Id: I623e62c54185b1d5a7e303db3e1034e6c32604c1

7 years agoOptimize swapchain OOM tests am: 1614827a71 am: 2cfe132119 am: 00ab17bd23 am: c9b7dae...
Pyry Haulos [Fri, 20 Jan 2017 20:52:34 +0000 (20:52 +0000)]
Optimize swapchain OOM tests am: 1614827a71 am: 2cfe132119 am: 00ab17bd23 am: c9b7dae8a8 am: acce97d998 am: 23baea4982
am: f6a0d45a54

Change-Id: I3f4eabfbba6bc68c02773aea27027a120ffcfc9f

7 years agoMerge "Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests...
Tina Zhou [Fri, 20 Jan 2017 20:52:06 +0000 (20:52 +0000)]
Merge "Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am: 0991459ed1 am: e19d6a6859 am: e0e2260a4a am: 222ef92210 am: c6747b082f am: cfc3d67576" into nyc-mr2-dev-plus-aosp
am: db7525e0dc

Change-Id: I181488f4fc1e2802a28e644de77ac9a37a38000f

7 years agoMerge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into...
Tina Zhou [Fri, 20 Jan 2017 20:52:03 +0000 (20:52 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am: 0991459ed1 am: e19d6a6859 am: e0e2260a4a am: 222ef92210 am: c6747b082f am: cfc3d67576
am: c5e76fa2a2

Change-Id: I3bff6ed474e901089070cb435adf8dad33083d87

7 years agoMerge "Fix internal format/type for ES3 3D + depth/stencil negative API tests. am...
Kenneth Graunke [Fri, 20 Jan 2017 20:51:39 +0000 (20:51 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests. am: 2ed3a5a66f am: 6a6f549150 am: f9b870fb5b am: b47baae90a am: 76a7f607a5 am: 602c392f12" into nyc-mr2-dev-plus-aosp
am: 6192e24e15

Change-Id: I8270fd4b8489d516ff37eb603d2e3f9022d2d712

7 years agoFix internal format/type for ES3 3D + depth/stencil negative API tests. am: 2ed3a5a66...
Kenneth Graunke [Fri, 20 Jan 2017 20:51:37 +0000 (20:51 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am: 2ed3a5a66f am: 6a6f549150 am: f9b870fb5b am: b47baae90a am: 76a7f607a5 am: 602c392f12
am: 03e08ec810

Change-Id: I4e05a357f81f8830b2976cd9edae3cf5696ee7d1

7 years agoMerge "Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am...
Tina Zhou [Fri, 20 Jan 2017 20:47:12 +0000 (20:47 +0000)]
Merge "Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am: 13a05434cc am: 5f30178321 am: 764cd6e60b am: 0a683a56e7 am: e961416ca6 am: ee59a7cc22  -s ours" into nyc-mr2-dev-plus-aosp
am: 44bab0a654  -s ours

Change-Id: Ieb884c16b84c8e7d9baf9d31b338cda37f853c6e

7 years agoMerge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am: 13a05434cc...
Tina Zhou [Fri, 20 Jan 2017 20:47:10 +0000 (20:47 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am: 13a05434cc am: 5f30178321 am: 764cd6e60b am: 0a683a56e7 am: e961416ca6 am: ee59a7cc22  -s ours
am: 3d8ac1f5a5  -s ours

Change-Id: Ia685a237ee165ef19ceb70b1ebb8059064b6c0d3

7 years agoMerge "Add support for EGL_EXT_pixel_format_float am: 521bf8a7c3 am: 4b7baeace7 am...
Mark Adams [Fri, 20 Jan 2017 20:46:46 +0000 (20:46 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float am: 521bf8a7c3 am: 4b7baeace7 am: 86683f95c7 am: 0624edb1ce am: 234daba7b4 am: 8d164d1990  -s ours" into nyc-mr2-dev-plus-aosp
am: d9abcf26e5  -s ours

Change-Id: I82b1cdf1d716fd361499f819523ab68a5c6d5176

7 years agoAdd support for EGL_EXT_pixel_format_float am: 521bf8a7c3 am: 4b7baeace7 am: 86683f95...
Mark Adams [Fri, 20 Jan 2017 20:46:43 +0000 (20:46 +0000)]
Add support for EGL_EXT_pixel_format_float am: 521bf8a7c3 am: 4b7baeace7 am: 86683f95c7 am: 0624edb1ce am: 234daba7b4 am: 8d164d1990  -s ours
am: bf21c39e9a  -s ours

Change-Id: Ibde452be050688ea27142a277c1712001f8d76a1

7 years agoMerge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat...
Tina Zhou [Fri, 20 Jan 2017 20:46:07 +0000 (20:46 +0000)]
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf am: ce3144c3e5 am: 29dde7d04d am: 4ac909cfeb am: 011ccfc134  -s ours" into nyc-mr2-dev-plus-aosp
am: f5600f9aaf  -s ours

Change-Id: I415a1f65dffb0b5d3218653bfd34653535b7081d

7 years agoMerge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts...
Tina Zhou [Fri, 20 Jan 2017 20:46:02 +0000 (20:46 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf am: ce3144c3e5 am: 29dde7d04d am: 4ac909cfeb am: 011ccfc134  -s ours
am: 5653120f84  -s ours

Change-Id: I902e942aba6d8db4b856a81ac6d6f42b382cc488

7 years agoMerge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am...
Pyry Haulos [Fri, 20 Jan 2017 20:45:36 +0000 (20:45 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am: 0004ce1767 am: ee2a180f00 am: 20860eb2df am: 2ecead38c4  -s ours" into nyc-mr2-dev-plus-aosp
am: 76768aa15e  -s ours

Change-Id: Ie48f61086e3b2a54c0ed414a2871497590e2b2fe

7 years agoRemove tests affected by NV/OES_viewport_array extension am: 267c765690 am: 0004ce176...
Pyry Haulos [Fri, 20 Jan 2017 20:45:34 +0000 (20:45 +0000)]
Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am: 0004ce1767 am: ee2a180f00 am: 20860eb2df am: 2ecead38c4  -s ours
am: b1fe967ef0  -s ours

Change-Id: I9bbe74ac29a4cae2c06c24dcc810f2092c3b8ca6

7 years agoMerge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev...
Tina Zhou [Fri, 20 Jan 2017 20:45:07 +0000 (20:45 +0000)]
Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am: 61d6d95a66 am: 73b7f271a9 am: 0b9596cb35 am: 436488b78f am: e89621e593" into nyc-mr2-dev-plus-aosp
am: bb2bb196e2

Change-Id: Iaa00f7ffbd59828a53bf1809e1178ed86c84928b

7 years agoMerge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:...
Tina Zhou [Fri, 20 Jan 2017 20:45:04 +0000 (20:45 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am: 61d6d95a66 am: 73b7f271a9 am: 0b9596cb35 am: 436488b78f am: e89621e593
am: f8c8d5ff8d

Change-Id: I8291da4b9d2958acc6fdd74dacd8201d9f1607e0

7 years agoMerge "Merge "Relax line width verification in primitive bbox tests" into nougat...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:45:00 +0000 (20:45 +0000)]
Merge "Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am: 312a550657 am: 36d3dd2ab1 am: 5debc545bf am: ee10cd68f7 am: bc02b9f045" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Relax line width verification in primitive bbox tests" into nougat-cts-dev...
Tina Zhou [Fri, 20 Jan 2017 20:44:50 +0000 (20:44 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am: 312a550657 am: 36d3dd2ab1 am: 5debc545bf am: ee10cd68f7
am: bc02b9f045

Change-Id: Id3422968d394dd61cfa7e9f8a84c5afe21b057cf

7 years agoMerge "Merge "Relax line width verification in primitive bbox tests am: ba45591407...
Pyry Haulos [Fri, 20 Jan 2017 20:44:37 +0000 (20:44 +0000)]
Merge "Merge "Relax line width verification in primitive bbox tests am: ba45591407 am: a11fd8b487 am: 90c49fe030 am: 04d8a8e98a" into nyc-mr1-dev-plus-aosp am: c60e446249" into nyc-mr2-dev-plus-aosp
am: 058d1a53d2

Change-Id: I11192dcb244d80cfcb7cda06673ba747f11b42bb

7 years agoMerge "Relax line width verification in primitive bbox tests am: ba45591407 am: a11fd...
Pyry Haulos [Fri, 20 Jan 2017 20:44:35 +0000 (20:44 +0000)]
Merge "Relax line width verification in primitive bbox tests am: ba45591407 am: a11fd8b487 am: 90c49fe030 am: 04d8a8e98a" into nyc-mr1-dev-plus-aosp am: c60e446249
am: ff1ea61283

Change-Id: I2ff4856e06782e3e6043afb577d81985c921ffdd

7 years agoMerge "Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:44:32 +0000 (20:44 +0000)]
Merge "Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf  -s ours am: 1d2a009979  -s ours am: 2c6307af33  -s ours" into nyc-mr1-dev-plus-aosp am: cf38dd18f9  -s ours" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:44:26 +0000 (20:44 +0000)]
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf  -s ours am: 1d2a009979  -s ours am: 2c6307af33  -s ours am: 57ac8058b6  -s ours" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat...
Tina Zhou [Fri, 20 Jan 2017 20:44:18 +0000 (20:44 +0000)]
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf  -s ours am: 1d2a009979  -s ours am: 2c6307af33  -s ours" into nyc-mr1-dev-plus-aosp
am: cf38dd18f9  -s ours

Change-Id: Ibf415e822ead5d6498b0e1d940baaf0aa545be25

7 years agoMerge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts...
Tina Zhou [Fri, 20 Jan 2017 20:44:15 +0000 (20:44 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf  -s ours am: 1d2a009979  -s ours am: 2c6307af33  -s ours
am: 57ac8058b6  -s ours

Change-Id: Ibb5d4533d489ec240aea3d66f48abed8c70a0222

7 years agoMerge "Relax line width verification in primitive bbox tests am: ba45591407 am: a11fd...
Pyry Haulos [Fri, 20 Jan 2017 20:44:12 +0000 (20:44 +0000)]
Merge "Relax line width verification in primitive bbox tests am: ba45591407 am: a11fd8b487 am: 90c49fe030 am: 04d8a8e98a am: ddf3f33d7a" into nyc-mr2-dev-plus-aosp
am: 0265d22b8c

Change-Id: I15227e9016dc8ec8e91c33716ce8df345af780fd

7 years agoRelax line width verification in primitive bbox tests am: ba45591407 am: a11fd8b487...
Pyry Haulos [Fri, 20 Jan 2017 20:44:09 +0000 (20:44 +0000)]
Relax line width verification in primitive bbox tests am: ba45591407 am: a11fd8b487 am: 90c49fe030 am: 04d8a8e98a am: ddf3f33d7a
am: 957322a3c7

Change-Id: I3f166ff92a06dcbc9b2fc1e31ac9cbd745fb20bb

7 years agoMerge "Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:44:00 +0000 (20:44 +0000)]
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690  -s ours am: 55fe6e8997  -s ours am: 7bab558fb8  -s ours" into nyc-mr1-dev-plus-aosp am: a185466ba9  -s ours" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 ...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:43:55 +0000 (20:43 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690  -s ours am: 55fe6e8997  -s ours am: 7bab558fb8  -s ours am: 578e9af267  -s ours" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 ...
Pyry Haulos [Fri, 20 Jan 2017 20:43:48 +0000 (20:43 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690  -s ours am: 55fe6e8997  -s ours am: 7bab558fb8  -s ours" into nyc-mr1-dev-plus-aosp
am: a185466ba9  -s ours

Change-Id: I9f17439cc94f6e47850dc9784bf4fb492170c568

7 years agoRemove tests affected by NV/OES_viewport_array extension am: 267c765690 -s ours...
Pyry Haulos [Fri, 20 Jan 2017 20:43:45 +0000 (20:43 +0000)]
Remove tests affected by NV/OES_viewport_array extension am: 267c765690  -s ours am: 55fe6e8997  -s ours am: 7bab558fb8  -s ours
am: 578e9af267  -s ours

Change-Id: I3fcbec0414216c7beb1066b31607841743b44308

7 years agoMerge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:43:35 +0000 (20:43 +0000)]
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf am: 41c599b77e am: 9d74d882df am: b3182128b8 am: a9eaaaca53 am: c0d6b5c22b  -s ours" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Generate flat triangles in polygon offset tests. am: 975a59ebca am: 02c67b12c1...
Alexander Galazin [Fri, 20 Jan 2017 20:43:35 +0000 (20:43 +0000)]
Merge "Generate flat triangles in polygon offset tests. am: 975a59ebca am: 02c67b12c1 am: 0e7da13770 am: 0dbb18ee84 am: b89872b38a" into nyc-mr2-dev-plus-aosp
am: d9b4127ee3

Change-Id: I8a623470cf0b4dffcda583887ffec0470939cbe5

7 years agoGenerate flat triangles in polygon offset tests. am: 975a59ebca am: 02c67b12c1 am...
Alexander Galazin [Fri, 20 Jan 2017 20:43:32 +0000 (20:43 +0000)]
Generate flat triangles in polygon offset tests. am: 975a59ebca am: 02c67b12c1 am: 0e7da13770 am: 0dbb18ee84 am: b89872b38a
am: 709049d1f3

Change-Id: Iaa3f2aa6ba72f005858523930b675cf13de85245

7 years agoMerge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts...
Tina Zhou [Fri, 20 Jan 2017 20:43:29 +0000 (20:43 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf am: 41c599b77e am: 9d74d882df am: b3182128b8 am: a9eaaaca53
am: c0d6b5c22b  -s ours

Change-Id: I7eb3481b4c93bcc4de011b97739f829dcfa77d56

7 years agoMerge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:43:23 +0000 (20:43 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am: e4ed95024e am: 578afa4c88 am: 22a8808370 am: 7b177f2f34 am: 3665d90d07  -s ours" into nyc-mr2-dev-plus-aosp

7 years agoRemove tests affected by NV/OES_viewport_array extension am: 267c765690 am: e4ed95024...
Pyry Haulos [Fri, 20 Jan 2017 20:43:17 +0000 (20:43 +0000)]
Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am: e4ed95024e am: 578afa4c88 am: 22a8808370 am: 7b177f2f34
am: 3665d90d07  -s ours

Change-Id: I337bf941721008a733672911b327e36be7b458ca

7 years agoMerge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:43:10 +0000 (20:43 +0000)]
Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am: 61d6d95a66 am: 5611bf398b am: e2d1c25650 am: d368eb8664 am: 8cfa8cb220 am: 987939f284" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Merge "Relax line width verification in primitive bbox tests" into nougat...
Tina Zhou [Fri, 20 Jan 2017 20:43:06 +0000 (20:43 +0000)]
Merge "Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am: 312a550657 am: 36d3dd2ab1 am: 5debc545bf am: ee10cd68f7 am: 09377becd7" into nyc-mr2-dev-plus-aosp
am: 3db7131bdf

Change-Id: I813884399348b918ae6024e5288add33c762effa

7 years agoMerge "Relax line width verification in primitive bbox tests" into nougat-cts-dev...
Tina Zhou [Fri, 20 Jan 2017 20:43:04 +0000 (20:43 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am: 312a550657 am: 36d3dd2ab1 am: 5debc545bf am: ee10cd68f7 am: 09377becd7
am: 40c5c485ff

Change-Id: I79402f3a5899977c89603860479bdfe5f3ed5366

7 years agoMerge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:...
Tina Zhou [Fri, 20 Jan 2017 20:43:02 +0000 (20:43 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am: 61d6d95a66 am: 5611bf398b am: e2d1c25650 am: d368eb8664 am: 8cfa8cb220
am: 987939f284

Change-Id: Ic7b839e2663709f543e34d129d7efedf4d107f39

7 years agoMerge "Generate flat triangles in polygon offset tests. am: 975a59ebca am: 0bde00f9d6...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:42:58 +0000 (20:42 +0000)]
Merge "Generate flat triangles in polygon offset tests. am: 975a59ebca am: 0bde00f9d6 am: b57eb2d24f am: aa9a995cfc am: afc69d0dd1 am: f7bcd5d876" into nyc-mr2-dev-plus-aosp

7 years agoGenerate flat triangles in polygon offset tests. am: 975a59ebca am: 0bde00f9d6 am...
Alexander Galazin [Fri, 20 Jan 2017 20:42:53 +0000 (20:42 +0000)]
Generate flat triangles in polygon offset tests. am: 975a59ebca am: 0bde00f9d6 am: b57eb2d24f am: aa9a995cfc am: afc69d0dd1
am: f7bcd5d876

Change-Id: Iab624c49bc1e5ab249c6e7338c75f9bf019680c0

7 years agoMerge "Merge "Relax line width verification in primitive bbox tests" into nougat...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:42:48 +0000 (20:42 +0000)]
Merge "Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am: 312a550657 am: f3d81a3cd9 am: 3b0479c233 am: 0a2fdff220 am: d8355f769b am: a4ca32e8d3" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Relax line width verification in primitive bbox tests" into nougat-cts-dev...
Tina Zhou [Fri, 20 Jan 2017 20:42:42 +0000 (20:42 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am: 312a550657 am: f3d81a3cd9 am: 3b0479c233 am: 0a2fdff220 am: d8355f769b
am: a4ca32e8d3

Change-Id: If535925b571294338b6edcf80e388189967ba23e

7 years agoMerge "Relax line width verification in primitive bbox tests am: ba45591407 am: b4fbc...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:42:37 +0000 (20:42 +0000)]
Merge "Relax line width verification in primitive bbox tests am: ba45591407 am: b4fbc02e3c am: b9b63c17d2 am: 4f191e12a9 am: c29aba4a88 am: e29f3de157" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev...
Tina Zhou [Fri, 20 Jan 2017 20:42:35 +0000 (20:42 +0000)]
Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am: 61d6d95a66 am: ea7ea6aeee am: 562348c4a0 am: b03f7416cd" into nyc-mr2-dev-plus-aosp
am: dfdb3bb243

Change-Id: I754c4572f6adb856d384ed18fd12a1998ef22b8c

7 years agoMerge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:...
Tina Zhou [Fri, 20 Jan 2017 20:42:33 +0000 (20:42 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am: 61d6d95a66 am: ea7ea6aeee am: 562348c4a0 am: b03f7416cd
am: 94adec74ae

Change-Id: I55a460c691640998fefb402fb178644ac8d1810b

7 years agoRelax line width verification in primitive bbox tests am: ba45591407 am: b4fbc02e3c...
Pyry Haulos [Fri, 20 Jan 2017 20:42:30 +0000 (20:42 +0000)]
Relax line width verification in primitive bbox tests am: ba45591407 am: b4fbc02e3c am: b9b63c17d2 am: 4f191e12a9 am: c29aba4a88
am: e29f3de157

Change-Id: I2c96677d85c255e0f2355a5c619db592b39f224d

7 years agoMerge "Merge "Fix eglBindAPI negative test" into nougat-cts-dev am: 6068dfbf3a am...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:42:25 +0000 (20:42 +0000)]
Merge "Merge "Fix eglBindAPI negative test" into nougat-cts-dev am: 6068dfbf3a am: 365f81e68c am: 15cde0b466 am: b21dbe99b2 am: 930d6894e5 am: 1a09b5270f" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Fix eglBindAPI negative test" into nougat-cts-dev am: 6068dfbf3a am: 365f81e68...
Tina Zhou [Fri, 20 Jan 2017 20:42:19 +0000 (20:42 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am: 6068dfbf3a am: 365f81e68c am: 15cde0b466 am: b21dbe99b2 am: 930d6894e5
am: 1a09b5270f

Change-Id: I73cff9b7c4b40fb5dcd58c0d330a310da7194f68

7 years agoMerge "Fix eglBindAPI negative test am: 09784f8510 am: 3342150f5a am: 1af587d644...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:42:14 +0000 (20:42 +0000)]
Merge "Fix eglBindAPI negative test am: 09784f8510 am: 3342150f5a am: 1af587d644 am: 52211c87ed am: fc116aa764 am: 5b5f75828b" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Relax line width verification in primitive bbox tests am: ba45591407 am: a11fd...
Pyry Haulos [Fri, 20 Jan 2017 20:42:12 +0000 (20:42 +0000)]
Merge "Relax line width verification in primitive bbox tests am: ba45591407 am: a11fd8b487 am: 90c49fe030 am: 04d8a8e98a am: 6734db1692" into nyc-mr2-dev-plus-aosp
am: c9967871b3

Change-Id: I312f88b7f80a26c58abdd579c0abd7825a22be85

7 years agoRelax line width verification in primitive bbox tests am: ba45591407 am: a11fd8b487...
Pyry Haulos [Fri, 20 Jan 2017 20:42:10 +0000 (20:42 +0000)]
Relax line width verification in primitive bbox tests am: ba45591407 am: a11fd8b487 am: 90c49fe030 am: 04d8a8e98a am: 6734db1692
am: 74bbc068d7

Change-Id: Ifcc406d5d6f5bf877986bb25b93cf33e3174408f

7 years agoFix eglBindAPI negative test am: 09784f8510 am: 3342150f5a am: 1af587d644 am: 52211c8...
Nicolas Boichat [Fri, 20 Jan 2017 20:42:08 +0000 (20:42 +0000)]
Fix eglBindAPI negative test am: 09784f8510 am: 3342150f5a am: 1af587d644 am: 52211c87ed am: fc116aa764
am: 5b5f75828b

Change-Id: I1d59566df19a116593926ea8d1a09cd47d10745b

7 years agoMerge "Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:42:03 +0000 (20:42 +0000)]
Merge "Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3be2 am: a580ae91f8 am: 816d6bdb88 am: f49c7ce972 am: a91d8f9bf5 am: 6fd723a7cc" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3b...
Tina Zhou [Fri, 20 Jan 2017 20:41:56 +0000 (20:41 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3be2 am: a580ae91f8 am: 816d6bdb88 am: f49c7ce972 am: a91d8f9bf5
am: 6fd723a7cc

Change-Id: Ifbc5a19b90aad47f9be8192efe75048683a03873

7 years agoMerge "Drop incorrect framebuffer texture subtests. am: 625d685874 am: 25b6d76b01...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:41:52 +0000 (20:41 +0000)]
Merge "Drop incorrect framebuffer texture subtests. am: 625d685874 am: 25b6d76b01 am: 6f6f3d78fc am: 18805bd38c am: ce197d0f27 am: 0e230d6099" into nyc-mr2-dev-plus-aosp

7 years agoGenerate flat triangles in polygon offset tests. am: 975a59ebca am: b1c225b9d6 am...
Alexander Galazin [Fri, 20 Jan 2017 20:41:52 +0000 (20:41 +0000)]
Generate flat triangles in polygon offset tests. am: 975a59ebca am: b1c225b9d6 am: f8e27c683d am: 5ccc8a2ee8
am: 678de5eb37

Change-Id: I2099fa159371cb4104dc962a6b38d4963d380bab

7 years agoDrop incorrect framebuffer texture subtests. am: 625d685874 am: 25b6d76b01 am: 6f6f3d...
Kenneth Graunke [Fri, 20 Jan 2017 20:41:47 +0000 (20:41 +0000)]
Drop incorrect framebuffer texture subtests. am: 625d685874 am: 25b6d76b01 am: 6f6f3d78fc am: 18805bd38c am: ce197d0f27
am: 0e230d6099

Change-Id: Ibc4efb0fbd54c7c9ecec669bf673f139b22efd87

7 years agoMerge "Merge "Optimize swapchain OOM tests" into nougat-cts-dev am: c811d42d99 am...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:41:42 +0000 (20:41 +0000)]
Merge "Merge "Optimize swapchain OOM tests" into nougat-cts-dev am: c811d42d99 am: 6d4c0dca61 am: d64bb66820 am: ec68ba0951 am: b7985f162a am: 4ab2fada98" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Optimize swapchain OOM tests" into nougat-cts-dev am: c811d42d99 am: 6d4c0dca6...
Tina Zhou [Fri, 20 Jan 2017 20:41:31 +0000 (20:41 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am: c811d42d99 am: 6d4c0dca61 am: d64bb66820 am: ec68ba0951 am: b7985f162a
am: 4ab2fada98

Change-Id: I43a4b603f4fa5128cf79e4833c01a176435edcb2

7 years agoMerge "Optimize swapchain OOM tests am: 1614827a71 am: 2cfe132119 am: 00ab17bd23...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:41:27 +0000 (20:41 +0000)]
Merge "Optimize swapchain OOM tests am: 1614827a71 am: 2cfe132119 am: 00ab17bd23 am: c9b7dae8a8 am: acce97d998 am: 23baea4982" into nyc-mr2-dev-plus-aosp

7 years agoOptimize swapchain OOM tests am: 1614827a71 am: 2cfe132119 am: 00ab17bd23 am: c9b7dae...
Pyry Haulos [Fri, 20 Jan 2017 20:41:20 +0000 (20:41 +0000)]
Optimize swapchain OOM tests am: 1614827a71 am: 2cfe132119 am: 00ab17bd23 am: c9b7dae8a8 am: acce97d998
am: 23baea4982

Change-Id: Ia7f263826f508fc64ae006fae383da00d45d3932

7 years agoMerge "Relax line width verification in primitive bbox tests" into nougat-cts-dev...
Tina Zhou [Fri, 20 Jan 2017 20:41:18 +0000 (20:41 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am: 312a550657 am: 487543e953 am: ed835f32e2 am: cd215677dd
am: 1d8a06d405

Change-Id: Ib161d31753aad494402828f347231d8524c99b44

7 years agoMerge "Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:41:15 +0000 (20:41 +0000)]
Merge "Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am: 0991459ed1 am: e19d6a6859 am: e0e2260a4a am: 222ef92210 am: c6747b082f am: cfc3d67576" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into...
Tina Zhou [Fri, 20 Jan 2017 20:41:08 +0000 (20:41 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am: 0991459ed1 am: e19d6a6859 am: e0e2260a4a am: 222ef92210 am: c6747b082f
am: cfc3d67576

Change-Id: I379d29db9a55a018c5f6e9b4a21c594e633c3c82

7 years agoresolve merge conflicts of ba455914 to master am: 07a7e24da3 am: 218bfe74ff am: e37a7...
Pyry Haulos [Fri, 20 Jan 2017 20:41:05 +0000 (20:41 +0000)]
resolve merge conflicts of ba455914 to master am: 07a7e24da3 am: 218bfe74ff am: e37a75a4b9
am: 2d1edbcbc6

Change-Id: I204e1fc1e1172b17d92b8bd85a6a30da5b24e12e

7 years agoMerge "Fix internal format/type for ES3 3D + depth/stencil negative API tests. am...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:41:03 +0000 (20:41 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests. am: 2ed3a5a66f am: 6a6f549150 am: f9b870fb5b am: b47baae90a am: 76a7f607a5 am: 602c392f12" into nyc-mr2-dev-plus-aosp