platform/upstream/VK-GL-CTS.git
7 years agoCP: Remove two read-backs from copy image tests am: 263e135474 -s ours am: 462575748...
Kalle Raita [Sat, 21 Jan 2017 00:48:54 +0000 (00:48 +0000)]
CP: Remove two read-backs from copy image tests am: 263e135474  -s ours am: 462575748a am: 86e2ff7051
am: 33eec04a9a

Change-Id: I9bdbe54cd23a186d93801702ab548cbb810b3f0f

7 years agoCP: Non-compressed copy image target size (64,64,8 am: 7aff1a044f am: 8bb21c1262...
Kalle Raita [Sat, 21 Jan 2017 00:48:48 +0000 (00:48 +0000)]
CP: Non-compressed copy image target size (64,64,8 am: 7aff1a044f am: 8bb21c1262 am: c080a2efba
am: 0670d1bd72

Change-Id: I628bdee8aa41fb40022e546d9ccd03dc09956238

7 years agoCP: Remove two read-backs from copy image tests am: 263e135474 -s ours am: 462575748a
Kalle Raita [Sat, 21 Jan 2017 00:44:39 +0000 (00:44 +0000)]
CP: Remove two read-backs from copy image tests am: 263e135474  -s ours am: 462575748a
am: 86e2ff7051

Change-Id: Ief01ede52502fbec19a0b11d68ec3ea0ecb89c47

7 years agoCP: Non-compressed copy image target size (64,64,8 am: 7aff1a044f am: 8bb21c1262
Kalle Raita [Sat, 21 Jan 2017 00:44:35 +0000 (00:44 +0000)]
CP: Non-compressed copy image target size (64,64,8 am: 7aff1a044f am: 8bb21c1262
am: c080a2efba

Change-Id: I8ffe404a5e7735c351c5291ccd88f8835051c195

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 [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:57:36 +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  -s ours
am: fd5c16b5cc  -s ours

Change-Id: I66750d4b28ee2f30be24e731a9009d58a98a59ba

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

Change-Id: I072a21265fefda540ff83a785d5bbed61b32a79e

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

Change-Id: I1268204c6293f6ea03b60e304a90e3fe5525aadf

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

Change-Id: Ifc7e16cdf9db3bb38a28a7f480a43a1dc7d64227

7 years agoMerge "Relax line width verification in primitive bbox tests" into nougat-cts-dev...
Tina Zhou [Fri, 20 Jan 2017 20:56:39 +0000 (20:56 +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: 49858ea9f7

Change-Id: I3a27944219ba6c7ea0cda03ebd0d65eb7bd57612

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

Change-Id: I65bdbeb0aba8c782aa9d3399e12c5f6ca6f19285

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

Change-Id: I4c5bbbbdadaae47a719e8af05254b075ff4c41e8

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

Change-Id: I68b3eb1fba405c54ae91076add05d6e442434fb7

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

Change-Id: I23581f8b7ca3e156a43bbd89e46e337c5fb5b869

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

Change-Id: I410f4a137ea08b546c016caebd78705611deec7e

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

Change-Id: Ia9a6763a23a5ec8f176b01183a9656546075c6ab

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

Change-Id: Iac0fba1c0dc93ae52c498c50de482eb57fa54dd4

7 years agoMerge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into...
Tina Zhou [Fri, 20 Jan 2017 20:54:40 +0000 (20:54 +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: 1a84cd74f0

Change-Id: I7b229784f85f92d08fc1130fef4dc6e5100d9565

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:47:35 +0000 (20:47 +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: bdbc876fc7" into nyc-mr2-dev-plus-aosp

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

Change-Id: I945144d4cc2c17944e03bbeaafaf4bb10a465a62

7 years agoMerge "Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:47:19 +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  -s ours am: 8cddd0f806  -s ours" into nyc-mr2-dev-plus-aosp

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:12 +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  -s ours
am: 8cddd0f806  -s ours

Change-Id: I9966b7a980cac344e75e4810dd05699775d03cad

7 years agoMerge "Add support for EGL_EXT_pixel_format_float am: 521bf8a7c3 am: 4b7baeace7 am...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:47:02 +0000 (20:47 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float am: 521bf8a7c3 am: 4b7baeace7 am: 86683f95c7 am: 0624edb1ce am: 234daba7b4  -s ours am: 7f9e23d176  -s ours" into nyc-mr2-dev-plus-aosp

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

Change-Id: I5ed211775089c1316522de4757278364d692cde4

7 years agoMerge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:46:47 +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  -s ours am: 50df351a0f  -s ours" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts...
Tina Zhou [Fri, 20 Jan 2017 20:46:40 +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  -s ours
am: 50df351a0f  -s ours

Change-Id: I4fe705ee4db0cb5b1e5c27331aa1cd703c90e34a

7 years agoMerge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:46:27 +0000 (20:46 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am: 0004ce1767 am: ee2a180f00 am: 20860eb2df  -s ours am: a4982bfb72  -s ours" into nyc-mr2-dev-plus-aosp

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

Change-Id: I70c5745be0a607b14bff00ef872087d8fe6201b9

7 years agoMerge "Merge "Merge "Generate flat triangles in polygon offset tests." into nougat...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:46:07 +0000 (20:46 +0000)]
Merge "Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am: 61d6d95a66 am: 73b7f271a9 am: 0b9596cb35 am: 436488b78f" into nyc-mr1-dev-plus-aosp am: 715c4b7814" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:46:02 +0000 (20:46 +0000)]
Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am: 61d6d95a66 am: 73b7f271a9 am: 0b9596cb35 am: 436488b78f am: 336f66bfc4" 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:45:54 +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" into nyc-mr1-dev-plus-aosp
am: 715c4b7814

Change-Id: I0ae9df9e5f9225aef57aabd039136f9400ae2b8e

7 years agoMerge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:...
Tina Zhou [Fri, 20 Jan 2017 20:45:50 +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: 336f66bfc4

Change-Id: I639413972a8f2c7ef6561c3f39bf13d7a7e07f04

7 years agoMerge "Merge "Generate flat triangles in polygon offset tests. am: 975a59ebca am...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:45:34 +0000 (20:45 +0000)]
Merge "Merge "Generate flat triangles in polygon offset tests. am: 975a59ebca am: 02c67b12c1 am: 0e7da13770 am: 0dbb18ee84" into nyc-mr1-dev-plus-aosp am: 146f745175" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Generate flat triangles in polygon offset tests. am: 975a59ebca am: 02c67b12c1...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:45:30 +0000 (20:45 +0000)]
Merge "Generate flat triangles in polygon offset tests. am: 975a59ebca am: 02c67b12c1 am: 0e7da13770 am: 0dbb18ee84 am: 4c08ce83d1" 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:45:24 +0000 (20:45 +0000)]
Merge "Generate flat triangles in polygon offset tests. am: 975a59ebca am: 02c67b12c1 am: 0e7da13770 am: 0dbb18ee84" into nyc-mr1-dev-plus-aosp
am: 146f745175

Change-Id: Ic3dbfa7fbdcd3159365e207e516e4a3745fc2751

7 years agoGenerate flat triangles in polygon offset tests. am: 975a59ebca am: 02c67b12c1 am...
Alexander Galazin [Fri, 20 Jan 2017 20:45:19 +0000 (20:45 +0000)]
Generate flat triangles in polygon offset tests. am: 975a59ebca am: 02c67b12c1 am: 0e7da13770 am: 0dbb18ee84
am: 4c08ce83d1

Change-Id: Ibaef63c51e4f6c85576d08d759e6b24abf8f560f

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

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 "Merge "Relax line width verification in primitive bbox tests" into nougat...
Tina Zhou [Fri, 20 Jan 2017 20:44:53 +0000 (20:44 +0000)]
Merge "Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am: 312a550657 am: 36d3dd2ab1 am: 5debc545bf am: ee10cd68f7" into nyc-mr1-dev-plus-aosp
am: 977fa4ba31

Change-Id: I807cdfeb8bf38096382be6549b863f5da5c3859a

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 "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 "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 "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts...
Tina Zhou [Fri, 20 Jan 2017 20:43:38 +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  -s ours

Change-Id: I1f9541e557c882d978b2f28ac19d661d966a7fc7

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 "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 agoRemove tests affected by NV/OES_viewport_array extension am: 267c765690 am: e4ed95024...
Pyry Haulos [Fri, 20 Jan 2017 20:43:23 +0000 (20:43 +0000)]
Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am: e4ed95024e am: 578afa4c88 am: 22a8808370
am: 7b177f2f34  -s ours

Change-Id: Ib3c92fbb2286febb1edc3d3cbd98c885238c4918

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 "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:...
Tina Zhou [Fri, 20 Jan 2017 20:43:10 +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

Change-Id: I8436c1b5cbdc9eb0777f4a3514c9504ba55e1650

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 "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:58 +0000 (20:42 +0000)]
Generate flat triangles in polygon offset tests. am: 975a59ebca am: 0bde00f9d6 am: b57eb2d24f am: aa9a995cfc
am: afc69d0dd1

Change-Id: Icd93b4e1f8011e015efbd0635306ff0b3a4be290

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:45 +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

Change-Id: I1d2a295e6d58c3a92b40c2ff6d6ac7886ba47225

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 agoRelax line width verification in primitive bbox tests am: ba45591407 am: b4fbc02e3c...
Pyry Haulos [Fri, 20 Jan 2017 20:42:31 +0000 (20:42 +0000)]
Relax line width verification in primitive bbox tests am: ba45591407 am: b4fbc02e3c am: b9b63c17d2 am: 4f191e12a9
am: c29aba4a88

Change-Id: I2cab9d14f0dfc30ac564d54ac5bbf6265da9f80e

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" into nougat-cts-dev am: 6068dfbf3a am: 365f81e68...
Tina Zhou [Fri, 20 Jan 2017 20:42:18 +0000 (20:42 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am: 6068dfbf3a am: 365f81e68c am: 15cde0b466 am: b21dbe99b2
am: 930d6894e5

Change-Id: I8d8b61c5fbbc9bdbd13a6099508b5550ff469bb5

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 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 agoFix eglBindAPI negative test am: 09784f8510 am: 3342150f5a am: 1af587d644 am: 52211c87ed
Nicolas Boichat [Fri, 20 Jan 2017 20:42:05 +0000 (20:42 +0000)]
Fix eglBindAPI negative test am: 09784f8510 am: 3342150f5a am: 1af587d644 am: 52211c87ed
am: fc116aa764

Change-Id: I8c60841464302f2623b6766086499623eef4dd23

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." into nougat-cts-dev am: 3baf7e3b...
Tina Zhou [Fri, 20 Jan 2017 20:41:52 +0000 (20:41 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3be2 am: a580ae91f8 am: 816d6bdb88 am: f49c7ce972
am: a91d8f9bf5

Change-Id: I6f66ea6c3de27d24cfcfb9e802f432653779c6b0

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 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 agoDrop incorrect framebuffer texture subtests. am: 625d685874 am: 25b6d76b01 am: 6f6f3d...
Kenneth Graunke [Fri, 20 Jan 2017 20:41:40 +0000 (20:41 +0000)]
Drop incorrect framebuffer texture subtests. am: 625d685874 am: 25b6d76b01 am: 6f6f3d78fc am: 18805bd38c
am: ce197d0f27

Change-Id: Id8c7bbe84ea9f0039805f46005bd61e6f1883229

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" into nougat-cts-dev am: c811d42d99 am: 6d4c0dca6...
Tina Zhou [Fri, 20 Jan 2017 20:41:27 +0000 (20:41 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am: c811d42d99 am: 6d4c0dca61 am: d64bb66820 am: ec68ba0951
am: b7985f162a

Change-Id: I19990dc29eda0b601694d9c78727b5a6d0b8234a

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 "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 agoOptimize swapchain OOM tests am: 1614827a71 am: 2cfe132119 am: 00ab17bd23 am: c9b7dae8a8
Pyry Haulos [Fri, 20 Jan 2017 20:41:14 +0000 (20:41 +0000)]
Optimize swapchain OOM tests am: 1614827a71 am: 2cfe132119 am: 00ab17bd23 am: c9b7dae8a8
am: acce97d998

Change-Id: Ib5d26c891a7b8dd3dd297efca0d5346c0d30203d

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 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

7 years agoMerge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into...
Tina Zhou [Fri, 20 Jan 2017 20:41:00 +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

Change-Id: Ifeb85870fcb7a6ce2373d72a31a0ab94cdb4fe9c

7 years agoFix internal format/type for ES3 3D + depth/stencil negative API tests. am: 2ed3a5a66...
Kenneth Graunke [Fri, 20 Jan 2017 20:40:58 +0000 (20:40 +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

Change-Id: I4af0fd340d3c0dc1486f7b824eb4e938c2696c4a

7 years agoMerge "Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:40:54 +0000 (20:40 +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

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

Change-Id: I965058dde5f55cb5d35a54ae6d8bf9fa3611ab9f

7 years agoMerge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am: 13a05434cc...
Tina Zhou [Fri, 20 Jan 2017 20:40:46 +0000 (20:40 +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

Change-Id: I0e7fc2f94781ce5e81a90a1ba89aa3a9bf89e272

7 years agoMerge "Add support for EGL_EXT_pixel_format_float am: 521bf8a7c3 am: 4b7baeace7 am...
Android Build Merger (Role) [Fri, 20 Jan 2017 20:40:41 +0000 (20:40 +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

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

Change-Id: I8f32699958d680c42818e1c8faa57b0c2f904213

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

Change-Id: Iabde3389ba6347e64f350f2148d892148f9412c2