platform/upstream/VK-GL-CTS.git
7 years agoMerge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat...
Pyry Haulos [Wed, 3 May 2017 16:19:06 +0000 (16:19 +0000)]
Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 9443c9c4c0 am: 578ae6d230 am: 6b5103682e am: 28cc3b34a9 am: c99530440b  -s ours" into nyc-mr2-dev-plus-aosp
am: bfa02fb74d  -s ours

Change-Id: I43303c670a5ea08890127d2523297604b9b7588d

7 years agoMerge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev...
Pyry Haulos [Wed, 3 May 2017 16:18:53 +0000 (16:18 +0000)]
Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev am: acf47d464f am: c2594c65ff am: 1203cd8416 am: 365f13849d" into nyc-mr2-dev-plus-aosp
am: 0bcd8aabc4

Change-Id: Ia176d53657edd6e377c3882124ab3dfebf9a062b

7 years agoMerge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:...
Alexander Galazin [Wed, 3 May 2017 16:18:38 +0000 (16:18 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52 am: 71a9bc447d am: 620c938d61 am: 62aeee5d3e am: f83b3c5679 am: 64598a3e94
am: 7782da8bc6

Change-Id: I582c24e2b7108c392cccc457e84df1c67d7ee5ab

7 years agoMerge "Merge "Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_textur...
Android Build Merger (Role) [Wed, 3 May 2017 16:17:39 +0000 (16:17 +0000)]
Merge "Merge "Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 90e6678bc9" into nyc-mr1-dev am: 26ff3a55fd am: 4f2accd121 am: eb48f49ddc  -s ours" into nyc-mr2-dev-plus-aosp am: fbc5716d8b  -s ours" into oc-dev-plus-aosp

7 years agoMerge "Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture"...
Pyry Haulos [Wed, 3 May 2017 16:17:33 +0000 (16:17 +0000)]
Merge "Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 90e6678bc9" into nyc-mr1-dev am: 26ff3a55fd am: 4f2accd121 am: eb48f49ddc  -s ours" into nyc-mr2-dev-plus-aosp
am: fbc5716d8b  -s ours

Change-Id: I561e84d85bbd9f7e93e8591355cdb7f2874a7cba

7 years agoMerge "Merge "Merge "Merge "Fix error mask generation in checkLineContinuity" into...
Android Build Merger (Role) [Wed, 3 May 2017 16:17:24 +0000 (16:17 +0000)]
Merge "Merge "Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52 am: 2585331908" into nyc-mr1-dev am: cbd57d8ea2 am: e63231fb5e am: 282f941efc" into nyc-mr2-dev-plus-aosp am: 378bef97d2" into oc-dev-plus-aosp

7 years agoMerge "Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat...
Alexander Galazin [Wed, 3 May 2017 16:17:20 +0000 (16:17 +0000)]
Merge "Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52 am: 2585331908" into nyc-mr1-dev am: cbd57d8ea2 am: e63231fb5e am: 282f941efc" into nyc-mr2-dev-plus-aosp
am: 378bef97d2

Change-Id: Iccd5843c054815525a8824b878f6b19bbf6a38f6

7 years agoMerge "Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture"...
Android Build Merger (Role) [Wed, 3 May 2017 16:17:09 +0000 (16:17 +0000)]
Merge "Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 90e6678bc9  -s ours am: 18231b0d34  -s ours am: df2c784664  -s ours" into nyc-mr2-dev-plus-aosp am: 74bc88be32  -s ours" into oc-dev-plus-aosp

7 years agoMerge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat...
Pyry Haulos [Wed, 3 May 2017 16:17:03 +0000 (16:17 +0000)]
Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 90e6678bc9  -s ours am: 18231b0d34  -s ours am: df2c784664  -s ours" into nyc-mr2-dev-plus-aosp
am: 74bc88be32  -s ours

Change-Id: I9642121a3fa570ec74ae191ee047c85d447a1afa

7 years agoMerge "Merge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc2...
Android Build Merger (Role) [Wed, 3 May 2017 16:16:56 +0000 (16:16 +0000)]
Merge "Merge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: e94af4b69f am: d92ff56cca" into nyc-mr1-dev am: 2e135d60c4 am: b804e15573 am: f981189859" into nyc-mr2-dev-plus-aosp am: 3498ef1536" into oc-dev-plus-aosp

7 years agoMerge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f...
Pyry Haulos [Wed, 3 May 2017 16:16:50 +0000 (16:16 +0000)]
Merge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: e94af4b69f am: d92ff56cca" into nyc-mr1-dev am: 2e135d60c4 am: b804e15573 am: f981189859" into nyc-mr2-dev-plus-aosp
am: 3498ef1536

Change-Id: Id8758cffe0b5d09afdb52db8e41e697156896706

7 years agoMerge "Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat...
Android Build Merger (Role) [Wed, 3 May 2017 16:16:42 +0000 (16:16 +0000)]
Merge "Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52 am: 2585331908 am: 0543f8e619 am: 261a03ba31" into nyc-mr2-dev-plus-aosp am: f3aadc9609" into oc-dev-plus-aosp

7 years agoMerge "Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat...
Android Build Merger (Role) [Wed, 3 May 2017 16:16:40 +0000 (16:16 +0000)]
Merge "Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52 am: 2585331908" into nyc-mr1-dev am: cbd57d8ea2 am: e63231fb5e am: 282f941efc am: 8b5b1427f4" into oc-dev-plus-aosp

7 years agoMerge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev...
Alexander Galazin [Wed, 3 May 2017 16:16:36 +0000 (16:16 +0000)]
Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52 am: 2585331908" into nyc-mr1-dev am: cbd57d8ea2 am: e63231fb5e am: 282f941efc
am: 8b5b1427f4

Change-Id: I6cf301acefeca41c22cc734587e8ff27225885f9

7 years agoMerge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev...
Alexander Galazin [Wed, 3 May 2017 16:16:35 +0000 (16:16 +0000)]
Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52 am: 2585331908 am: 0543f8e619 am: 261a03ba31" into nyc-mr2-dev-plus-aosp
am: f3aadc9609

Change-Id: I1b9bad43ad4096e05b62d6de5a158161bfde4f99

7 years agoMerge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f...
Android Build Merger (Role) [Wed, 3 May 2017 16:16:31 +0000 (16:16 +0000)]
Merge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: e94af4b69f am: d92ff56cca" into nyc-mr1-dev am: 2e135d60c4 am: b804e15573 am: f981189859 am: a503de3a04" into oc-dev-plus-aosp

7 years agoMerge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat...
Android Build Merger (Role) [Wed, 3 May 2017 16:16:29 +0000 (16:16 +0000)]
Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 9443c9c4c0 am: 578ae6d230 am: 6b5103682e am: 28cc3b34a9 am: c99530440b  -s ours" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f...
Android Build Merger (Role) [Wed, 3 May 2017 16:16:29 +0000 (16:16 +0000)]
Merge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387 am: 8b78db19fd am: 9d0568c51e am: e6eb42c8fd" into nyc-mr2-dev-plus-aosp am: c5ebf8cdab" into oc-dev-plus-aosp

7 years agoMerge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: e94af4...
Pyry Haulos [Wed, 3 May 2017 16:16:24 +0000 (16:16 +0000)]
Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: e94af4b69f am: d92ff56cca" into nyc-mr1-dev am: 2e135d60c4 am: b804e15573 am: f981189859
am: a503de3a04

Change-Id: I863e7706bd571f06111b62ac54e4d7d2f3135e3a

7 years agoMerge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e...
Pyry Haulos [Wed, 3 May 2017 16:16:22 +0000 (16:16 +0000)]
Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387 am: 8b78db19fd am: 9d0568c51e am: e6eb42c8fd" into nyc-mr2-dev-plus-aosp
am: c5ebf8cdab

Change-Id: Ia06915d3462d92da63e9dff67c8c8e567a4cbf94

7 years agoMerge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
Pyry Haulos [Wed, 3 May 2017 16:16:22 +0000 (16:16 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 9443c9c4c0 am: 578ae6d230 am: 6b5103682e am: 28cc3b34a9
am: c99530440b  -s ours

Change-Id: I6e05166299ac00d164e4a446a3994126f99d8d3f

7 years agoMerge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev...
Android Build Merger (Role) [Wed, 3 May 2017 16:16:18 +0000 (16:16 +0000)]
Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev am: acf47d464f am: c2594c65ff am: 1203cd8416 am: 365f13849d" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e...
Android Build Merger (Role) [Wed, 3 May 2017 16:16:17 +0000 (16:16 +0000)]
Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387 am: 8b78db19fd am: 9d0568c51e am: e6eb42c8fd am: c57341fa99" into oc-dev-plus-aosp

7 years agoMerge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:...
Alexander Galazin [Wed, 3 May 2017 16:16:08 +0000 (16:16 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52 am: 71a9bc447d am: 620c938d61 am: 62aeee5d3e am: f83b3c5679
am: 64598a3e94

Change-Id: I8eda5991f3fc92e64bdcea31f4f4bfed1c2929b4

7 years agoTry to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387...
Pyry Haulos [Wed, 3 May 2017 16:16:08 +0000 (16:16 +0000)]
Try to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387 am: 8b78db19fd am: 9d0568c51e am: e6eb42c8fd
am: c57341fa99

Change-Id: I311ff3c66d52a2072e0ce30fe34a5eeec7b27504

7 years agoTry to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387...
Pyry Haulos [Wed, 3 May 2017 16:16:07 +0000 (16:16 +0000)]
Try to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387 am: d1aa6c62e3 am: 347c7f4d8b
am: ca28cf3dee

Change-Id: I7df51c751f0f49791ab6ca9878b53d3599c57f83

7 years agoMerge "Fix color change verification in dithering tests" into nougat-cts-dev am:...
Pyry Haulos [Wed, 3 May 2017 16:16:07 +0000 (16:16 +0000)]
Merge "Fix color change verification in dithering tests" into nougat-cts-dev am: acf47d464f am: c2594c65ff am: 1203cd8416
am: 365f13849d

Change-Id: I7cbc7fe4ea7caca2964bc57c5e8b21c7f6aa2be2

7 years agoMerge "Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture"...
Android Build Merger (Role) [Wed, 3 May 2017 16:14:23 +0000 (16:14 +0000)]
Merge "Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 90e6678bc9" into nyc-mr1-dev am: 26ff3a55fd am: 4f2accd121 am: eb48f49ddc  -s ours" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat...
Pyry Haulos [Wed, 3 May 2017 16:14:15 +0000 (16:14 +0000)]
Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 90e6678bc9" into nyc-mr1-dev am: 26ff3a55fd am: 4f2accd121
am: eb48f49ddc  -s ours

Change-Id: Ib55e83cc935c9e921f7511534af7a5d3649a9eac

7 years agoMerge "Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat...
Android Build Merger (Role) [Wed, 3 May 2017 16:14:10 +0000 (16:14 +0000)]
Merge "Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52 am: 2585331908" into nyc-mr1-dev am: cbd57d8ea2 am: e63231fb5e am: 282f941efc" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat...
Android Build Merger (Role) [Wed, 3 May 2017 16:14:06 +0000 (16:14 +0000)]
Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 90e6678bc9  -s ours am: 18231b0d34  -s ours am: df2c784664  -s ours" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev...
Alexander Galazin [Wed, 3 May 2017 16:14:06 +0000 (16:14 +0000)]
Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52 am: 2585331908" into nyc-mr1-dev am: cbd57d8ea2 am: e63231fb5e
am: 282f941efc

Change-Id: I2289455e7e7d0d30105b4b6e931cb917fe5201d3

7 years agoMerge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f...
Android Build Merger (Role) [Wed, 3 May 2017 16:14:00 +0000 (16:14 +0000)]
Merge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: e94af4b69f am: d92ff56cca" into nyc-mr1-dev am: 2e135d60c4 am: b804e15573 am: f981189859" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev...
Alexander Galazin [Wed, 3 May 2017 16:14:00 +0000 (16:14 +0000)]
Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52 am: 2585331908" into nyc-mr1-dev am: cbd57d8ea2 am: e63231fb5e
am: 282f941efc

Change-Id: I29e45817dd40064cb7e14e1556c0ca7f579d543d

7 years agoMerge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
Pyry Haulos [Wed, 3 May 2017 16:14:00 +0000 (16:14 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 90e6678bc9  -s ours am: 18231b0d34  -s ours
am: df2c784664  -s ours

Change-Id: I50ce03149d8ca74ed207910688f1ec4652e9e3db

7 years agoMerge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev...
Android Build Merger (Role) [Wed, 3 May 2017 16:13:55 +0000 (16:13 +0000)]
Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52 am: 2585331908 am: 0543f8e619 am: 261a03ba31" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: e94af4...
Pyry Haulos [Wed, 3 May 2017 16:13:54 +0000 (16:13 +0000)]
Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: e94af4b69f am: d92ff56cca" into nyc-mr1-dev am: 2e135d60c4 am: b804e15573
am: f981189859

Change-Id: Ic97d42989936d7b590d13abe8a09e07fbe5bf378

7 years agoMerge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:...
Alexander Galazin [Wed, 3 May 2017 16:13:51 +0000 (16:13 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52 am: 2585331908 am: 0543f8e619
am: 261a03ba31

Change-Id: Ib16cfe7f0642abf81fb43e6c416433669c5e485c

7 years agoMerge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: e94af4...
Pyry Haulos [Wed, 3 May 2017 16:13:50 +0000 (16:13 +0000)]
Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: e94af4b69f am: d92ff56cca" into nyc-mr1-dev am: 2e135d60c4 am: b804e15573
am: f981189859

Change-Id: I3fa10677ea6bab3fc6704a7e87f5207e2510aac1

7 years agoMerge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e...
Android Build Merger (Role) [Wed, 3 May 2017 16:13:49 +0000 (16:13 +0000)]
Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387 am: 8b78db19fd am: 9d0568c51e am: e6eb42c8fd" into nyc-mr2-dev-plus-aosp

7 years agoMerge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
Pyry Haulos [Wed, 3 May 2017 16:13:44 +0000 (16:13 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 9443c9c4c0 am: 578ae6d230 am: 6b5103682e
am: 28cc3b34a9

Change-Id: Iee8955593b7276884cfdcdb38e14a2acaff8d383

7 years agoTry to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387...
Pyry Haulos [Wed, 3 May 2017 16:13:39 +0000 (16:13 +0000)]
Try to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387 am: 8b78db19fd am: 9d0568c51e
am: e6eb42c8fd

Change-Id: Id0cb1111377ad3aa758c02faa589bafca2d806c0

7 years agoTry to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387...
Pyry Haulos [Wed, 3 May 2017 16:13:39 +0000 (16:13 +0000)]
Try to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387 am: 8b78db19fd am: 9d0568c51e
am: e6eb42c8fd

Change-Id: I58ad9518a226f67acc4c3d6ceba58928daec3135

7 years agoMerge "Fix color change verification in dithering tests" into nougat-cts-dev am:...
Pyry Haulos [Wed, 3 May 2017 16:13:37 +0000 (16:13 +0000)]
Merge "Fix color change verification in dithering tests" into nougat-cts-dev am: acf47d464f am: c2594c65ff
am: 1203cd8416

Change-Id: I38ebf494e5b067abe94d3d7f510d7956c0bbb6c3

7 years agoTry to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387...
Pyry Haulos [Wed, 3 May 2017 16:13:36 +0000 (16:13 +0000)]
Try to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387 am: d1aa6c62e3
am: 347c7f4d8b

Change-Id: I7497ac1f06891ddeb33a726cb1568980ef7dea71

7 years agoMerge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:...
Alexander Galazin [Wed, 3 May 2017 16:13:35 +0000 (16:13 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52 am: 71a9bc447d am: 620c938d61 am: 62aeee5d3e
am: f83b3c5679

Change-Id: Idc2a767f42d571de025ed99538f769e50a6e089d

7 years agoMerge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat...
Pyry Haulos [Wed, 3 May 2017 16:11:42 +0000 (16:11 +0000)]
Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 90e6678bc9" into nyc-mr1-dev am: 26ff3a55fd
am: 4f2accd121

Change-Id: If4e842f041eb09e0b9490944b722fa2f621ddd26

7 years agoMerge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
Pyry Haulos [Wed, 3 May 2017 16:11:34 +0000 (16:11 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 90e6678bc9  -s ours
am: 18231b0d34  -s ours

Change-Id: Icb4d6d9b23cbb19186192b5219f310c157e97922

7 years agoMerge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev...
Alexander Galazin [Wed, 3 May 2017 16:11:31 +0000 (16:11 +0000)]
Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52 am: 2585331908" into nyc-mr1-dev am: cbd57d8ea2
am: e63231fb5e

Change-Id: Iebfca6923d5c6bd9daef134283c5492bc5a88852

7 years agoMerge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:...
Alexander Galazin [Wed, 3 May 2017 16:11:22 +0000 (16:11 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52 am: 2585331908
am: 0543f8e619

Change-Id: I187d2d189d102d193717bf43ca4398cd6e8e975b

7 years agoMerge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: e94af4...
Pyry Haulos [Wed, 3 May 2017 16:11:18 +0000 (16:11 +0000)]
Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: e94af4b69f am: d92ff56cca" into nyc-mr1-dev am: 2e135d60c4
am: b804e15573

Change-Id: I5a67bd5cc95891335f7a78613b8c2754db1b4f59

7 years agoMerge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
Pyry Haulos [Wed, 3 May 2017 16:11:16 +0000 (16:11 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 9443c9c4c0 am: 578ae6d230
am: 6b5103682e

Change-Id: I30320577a9c755ac3c437c8bcc967b20b254652b

7 years agoTry to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387
Pyry Haulos [Wed, 3 May 2017 16:11:10 +0000 (16:11 +0000)]
Try to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387
am: d1aa6c62e3

Change-Id: Ie638176a5fb9b8b843b1c1995c01468c4503d39b

7 years agoTry to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387...
Pyry Haulos [Wed, 3 May 2017 16:11:06 +0000 (16:11 +0000)]
Try to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387 am: 8b78db19fd
am: 9d0568c51e

Change-Id: I0a9effff3029e36c01ac36104ea961afbfa78274

7 years agoMerge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:...
Alexander Galazin [Wed, 3 May 2017 16:11:06 +0000 (16:11 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52 am: 71a9bc447d am: 620c938d61
am: 62aeee5d3e

Change-Id: I0539b2cf51815eef95eba86e72557813e9bd1937

7 years agoMerge "Fix color change verification in dithering tests" into nougat-cts-dev am:...
Pyry Haulos [Wed, 3 May 2017 16:10:09 +0000 (16:10 +0000)]
Merge "Fix color change verification in dithering tests" into nougat-cts-dev am: acf47d464f
am: c2594c65ff

Change-Id: Ifd798f6964576b23950beaedc843a4efce806968

7 years agoMerge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat...
Pyry Haulos [Wed, 3 May 2017 16:09:13 +0000 (16:09 +0000)]
Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 90e6678bc9" into nyc-mr1-dev
am: 26ff3a55fd

Change-Id: I546fb08c2c59d10ca3a95fd2307251e11d72623e

7 years agoMerge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev...
Alexander Galazin [Wed, 3 May 2017 16:09:01 +0000 (16:09 +0000)]
Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52 am: 2585331908" into nyc-mr1-dev
am: cbd57d8ea2

Change-Id: Icc96166d287cf874820f734375a4f60a4620ff43

7 years agoMerge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: e94af4...
Pyry Haulos [Wed, 3 May 2017 16:08:49 +0000 (16:08 +0000)]
Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: e94af4b69f am: d92ff56cca" into nyc-mr1-dev
am: 2e135d60c4

Change-Id: I91b5e5909e78a996273bc7103c5d8978cc6c2a7f

7 years agoMerge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
Pyry Haulos [Wed, 3 May 2017 16:08:46 +0000 (16:08 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 9443c9c4c0
am: 578ae6d230

Change-Id: I36eb3d69950032890a944b6ca326ef9dbcc4221a

7 years agoTry to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387
Pyry Haulos [Wed, 3 May 2017 16:08:36 +0000 (16:08 +0000)]
Try to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387
am: 8b78db19fd

Change-Id: I76337ccc173fb8bce30b26aa1e50a0e88ecc7918

7 years agoMerge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:...
Alexander Galazin [Wed, 3 May 2017 16:08:35 +0000 (16:08 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52 am: 71a9bc447d
am: 620c938d61

Change-Id: I5f0ad6166b794a441678451ccb70c9628f3100ca

7 years agoMerge "Fix color change verification in dithering tests" into nougat-cts-dev
Pyry Haulos [Wed, 3 May 2017 16:07:36 +0000 (16:07 +0000)]
Merge "Fix color change verification in dithering tests" into nougat-cts-dev
am: acf47d464f

Change-Id: I82bfed0cc9cee128a8552b4e8cf3fb87ced37c9f

7 years agoMerge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat...
Android Build Merger (Role) [Wed, 3 May 2017 16:07:03 +0000 (16:07 +0000)]
Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 90e6678bc9" into nyc-mr1-dev

7 years agoMerge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
Pyry Haulos [Wed, 3 May 2017 16:06:57 +0000 (16:06 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47
am: 90e6678bc9

Change-Id: I06a9f451d5ba510d77b89c01dbe33229bbd75319

7 years agoMerge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev...
Android Build Merger (Role) [Wed, 3 May 2017 16:06:52 +0000 (16:06 +0000)]
Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52 am: 2585331908" into nyc-mr1-dev

7 years agoMerge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
Pyry Haulos [Wed, 3 May 2017 16:06:47 +0000 (16:06 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47
am: 9443c9c4c0

Change-Id: Iaab965ccbaeb3ca315a5da67ae342b25b1fccb35

7 years agoMerge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:...
Alexander Galazin [Wed, 3 May 2017 16:06:47 +0000 (16:06 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52
am: 2585331908

Change-Id: Ide25b381041f3c545b53906842a2caa7733b7ddc

7 years agoMerge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: e94af4...
Android Build Merger (Role) [Wed, 3 May 2017 16:06:44 +0000 (16:06 +0000)]
Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: e94af4b69f am: d92ff56cca" into nyc-mr1-dev

7 years agoTry to determine renderable format in lifetime tests am: c0a5dc217f
Pyry Haulos [Wed, 3 May 2017 16:06:36 +0000 (16:06 +0000)]
Try to determine renderable format in lifetime tests am: c0a5dc217f
am: eba26e2387

Change-Id: I849814817f65bd5e127463af9fb5a27a9759870c

7 years agoMerge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:...
Alexander Galazin [Wed, 3 May 2017 16:06:35 +0000 (16:06 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52
am: 71a9bc447d

Change-Id: Iba7f7005d3fe89e5a927cf5afe07a13a3312a525

7 years agoTry to determine renderable format in lifetime tests am: c0a5dc217f am: e94af4b69f
Pyry Haulos [Wed, 3 May 2017 16:06:35 +0000 (16:06 +0000)]
Try to determine renderable format in lifetime tests am: c0a5dc217f am: e94af4b69f
am: d92ff56cca

Change-Id: I4b38bd10ac0d0748948c7ec5e72c5595689ac7b7

7 years agoMerge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
Pyry Haulos [Wed, 3 May 2017 16:05:58 +0000 (16:05 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47
am: 90e6678bc9  -s ours

Change-Id: I157b06b418801793909c853f0e3f51c574283d15

7 years agoMerge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:...
Alexander Galazin [Wed, 3 May 2017 16:05:41 +0000 (16:05 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am: eebcec1b52
am: 2585331908

Change-Id: Ibc91272a8ad15f813f273cf05bb6b6f846ae600f

7 years agoMerge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev
Pyry Haulos [Wed, 3 May 2017 16:04:22 +0000 (16:04 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev
am: 9a83ec3f47

Change-Id: I18cb5efebe1ed2b56818fc2c5b8da89f0a4fd1d7

7 years agoMerge "Fix color change verification in dithering tests" into nougat-cts-dev
Treehugger Robot [Wed, 3 May 2017 16:04:13 +0000 (16:04 +0000)]
Merge "Fix color change verification in dithering tests" into nougat-cts-dev

7 years agoMerge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev
Alexander Galazin [Wed, 3 May 2017 16:04:08 +0000 (16:04 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev
am: eebcec1b52

Change-Id: I4c726cca01d733fadfeef64f9ade6318bed6e66b

7 years agoTry to determine renderable format in lifetime tests am: c0a5dc217f
Pyry Haulos [Wed, 3 May 2017 16:04:06 +0000 (16:04 +0000)]
Try to determine renderable format in lifetime tests am: c0a5dc217f
am: e94af4b69f

Change-Id: Ia413488ae565cb75cc79260362ff4dd7cf1c2ef5

7 years agoMerge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev
Pyry Haulos [Wed, 3 May 2017 16:03:19 +0000 (16:03 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev
am: 9a83ec3f47

Change-Id: I1dfb480ed3b5fb7f384a8fe9b0a852134fde1500

7 years agoMerge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev
Alexander Galazin [Wed, 3 May 2017 16:03:07 +0000 (16:03 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev
am: eebcec1b52

Change-Id: Ib4d673157f82d00d0d27ab3496ac8a1dc6634fe1

7 years agoTry to determine renderable format in lifetime tests
Pyry Haulos [Wed, 3 May 2017 16:02:07 +0000 (16:02 +0000)]
Try to determine renderable format in lifetime tests
am: c0a5dc217f

Change-Id: I36f65b41ac4958f0794e4ca52a9703e80aa37fab

7 years agoTry to determine renderable format in lifetime tests am: c0a5dc217f
Pyry Haulos [Wed, 3 May 2017 16:01:08 +0000 (16:01 +0000)]
Try to determine renderable format in lifetime tests am: c0a5dc217f
am: eba26e2387

Change-Id: I374e4e781d4b3d89c9e6a9e97deffe466298ddea

7 years agoMerge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev
Treehugger Robot [Wed, 3 May 2017 16:01:05 +0000 (16:01 +0000)]
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev

7 years agoMerge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev
Treehugger Robot [Wed, 3 May 2017 15:59:50 +0000 (15:59 +0000)]
Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev

7 years agoTry to determine renderable format in lifetime tests
Pyry Haulos [Wed, 3 May 2017 15:58:34 +0000 (15:58 +0000)]
Try to determine renderable format in lifetime tests
am: c0a5dc217f

Change-Id: I99514ee1a3ccb9a0aa397f0a8e9e7d45b47ec9ba

7 years agoRemove all temporary exclusions
Kalle Raita [Tue, 2 May 2017 20:23:50 +0000 (20:23 +0000)]
Remove all temporary exclusions
am: 8593103416

Change-Id: I81652d6822fe19b993ffc769d2f84c5c380590a6

7 years agoRemove all temporary exclusions
Kalle Raita [Tue, 2 May 2017 17:08:44 +0000 (10:08 -0700)]
Remove all temporary exclusions

Restore following case to the must-pass:
dEQP-VK.ubo.random.all_shared_buffer.48
dEQP-VK.wsi.android.incremental_present.scale_down.fifo.reference
dEQP-VK.wsi.android.incremental_present.scale_down.fifo.incremental_present
dEQP-GLES3.functional.pbo.renderbuffer.rgb565_clears

Reverts commits:
a542a3ad5ba5e03407fcdbce6469bd5a1aaf2b86
82e66a88f0bc8e5450360410720d076170a6d2e9

Bug: 37476650
Bug: 34887315
Bug: 34887800
Bug: 37439915
Test: Via CTS, Angler, Marlin: dEQP-GLES3.functional.pbo.renderbuffer.*
Test: Via CTS, Angler: dEQP-VK.wsi.android.incremental_present.*
Test: Via CTS, Marlin: dEQP-VK.ubo.random.all_shared_buffer.*
Change-Id: I30cebd0f89744a4e8b1363baa60aa13e3b51fb21
Merged-In: Id2b8e4366da75dcb1b3afdeaede325d3a34e3071

7 years agoMerge "Log which watchdog timer was exceeded" am: 9bd0272d00 am: 00bbea1771
Kalle Raita [Fri, 28 Apr 2017 23:12:42 +0000 (23:12 +0000)]
Merge "Log which watchdog timer was exceeded" am: 9bd0272d00 am: 00bbea1771
am: a20ae3d6a8

Change-Id: I7a5bc8bb11c700deffebef11b6d0152c76ff1365

7 years agoMerge "Log which watchdog timer was exceeded" am: 9bd0272d00
Kalle Raita [Fri, 28 Apr 2017 23:09:11 +0000 (23:09 +0000)]
Merge "Log which watchdog timer was exceeded" am: 9bd0272d00
am: 00bbea1771

Change-Id: I20456e4268e1ef0fd7341bc99100366d2bd5e4ea

7 years agoMerge "Log which watchdog timer was exceeded"
Kalle Raita [Fri, 28 Apr 2017 23:05:41 +0000 (23:05 +0000)]
Merge "Log which watchdog timer was exceeded"
am: 9bd0272d00

Change-Id: Ib175faaa4c72f7118bbb34e1921d3cbf780ad5da

7 years agoMerge "Log which watchdog timer was exceeded"
Treehugger Robot [Fri, 28 Apr 2017 22:51:12 +0000 (22:51 +0000)]
Merge "Log which watchdog timer was exceeded"

7 years agoRestore infinite loop tests into the mustpass
Kalle Raita [Fri, 28 Apr 2017 22:04:21 +0000 (22:04 +0000)]
Restore infinite loop tests into the mustpass
am: 39f0e4a6ee

Change-Id: I87c13892801b0f36c9d169b44104bb671db2f9f4

7 years agoLog which watchdog timer was exceeded
Kalle Raita [Thu, 27 Apr 2017 18:43:27 +0000 (11:43 -0700)]
Log which watchdog timer was exceeded

Test: Timeout failure for max_concurrent.framebuffer on Marlin
Change-Id: Ie8396c6506e09bbe94c6d5dc6c29fd6e20c7f436

7 years agoRestore infinite loop tests into the mustpass
Kalle Raita [Thu, 27 Apr 2017 17:32:34 +0000 (10:32 -0700)]
Restore infinite loop tests into the mustpass

Bug: 34887800
Bug: 37476650
Test: dEQP-EGL.functional.robustness.* on Angler, both ABIs
Change-Id: I7313d09ceb6d08ff67c05f573e9fb049de36061e
Merged-In: Id2b8e4366da75dcb1b3afdeaede325d3a34e3071

7 years agoUpdate Android CTS Vulkan waivers list to match Khronos CTS
Pyry Haulos [Fri, 21 Apr 2017 17:48:22 +0000 (17:48 +0000)]
Update Android CTS Vulkan waivers list to match Khronos CTS
am: bc44daba17

Change-Id: I7cc0563599288564e9a40ed8f79935afc9ab7152

7 years agoUpdate Android CTS Vulkan waivers list to match Khronos CTS
Pyry Haulos [Thu, 20 Apr 2017 22:36:04 +0000 (15:36 -0700)]
Update Android CTS Vulkan waivers list to match Khronos CTS

Bug: 36817508
(cherry picked from commit 96cb7026885d2f457fcfe58d4c8035e7a701cff1)

Merged-In: Ice0a23a345585d035b6fc7a869444459ebbbb9a3
Change-Id: I89ccd864c8d3911dc0ce7f7554795a1f0b216817

7 years agoresolve merge conflicts of bf8899d41 to oc-dev-plus-aosp
Pyry Haulos [Fri, 21 Apr 2017 00:29:55 +0000 (17:29 -0700)]
resolve merge conflicts of bf8899d41 to oc-dev-plus-aosp

Change-Id: I05d0a671554b7455b9773a670080fd04f419360d

7 years agoUpdate Android CTS Vulkan waivers list to match Khronos CTS am: 96cb702688
Pyry Haulos [Fri, 21 Apr 2017 00:08:27 +0000 (00:08 +0000)]
Update Android CTS Vulkan waivers list to match Khronos CTS am: 96cb702688
am: 2b7154e1f1

Change-Id: Ibb7a4b51d34da0e5a601ea36774a864c9d410ca2

7 years agoUpdate Android CTS Vulkan waivers list to match Khronos CTS
Pyry Haulos [Fri, 21 Apr 2017 00:04:55 +0000 (00:04 +0000)]
Update Android CTS Vulkan waivers list to match Khronos CTS
am: 96cb702688

Change-Id: I6932d9988c885e2b26fee22845c4e064ea5118b7

7 years agoUpdate Android CTS Vulkan waivers list to match Khronos CTS
Pyry Haulos [Thu, 20 Apr 2017 22:36:04 +0000 (15:36 -0700)]
Update Android CTS Vulkan waivers list to match Khronos CTS

Bug: 36817508
Change-Id: Ib394652ca3229a06704a83bea53806a3397c7ec3