platform/upstream/VK-GL-CTS.git
7 years agoMerge "Fix GCC 6.3 warnings in aosp/master" am: 1211e9fe1b
Pyry Haulos [Tue, 9 May 2017 18:53:23 +0000 (18:53 +0000)]
Merge "Fix GCC 6.3 warnings in aosp/master" am: 1211e9fe1b
am: 56ed30da81

Change-Id: I226c177f0351e56858170914ecbf3debf459fd44

7 years agoFix negative CompressedTexImage2D tests am: 9de005f035
Alexander Galazin [Tue, 9 May 2017 18:53:11 +0000 (18:53 +0000)]
Fix negative CompressedTexImage2D tests am: 9de005f035
am: 958ab8f9cb

Change-Id: Ic59ec5a4da6a3eda979126732480857d9c21044b

7 years agoMerge "Fix GCC 6.3 warnings in aosp/master"
Pyry Haulos [Tue, 9 May 2017 18:48:54 +0000 (18:48 +0000)]
Merge "Fix GCC 6.3 warnings in aosp/master"
am: 1211e9fe1b

Change-Id: I8d413cdae5423ba690af7e5b7f114771f94ad35b

7 years agoFix negative CompressedTexImage2D tests
Alexander Galazin [Tue, 9 May 2017 18:48:41 +0000 (18:48 +0000)]
Fix negative CompressedTexImage2D tests
am: 9de005f035

Change-Id: I6a966a2bf462e77169dd4a15e71f6960ecc55160

7 years agoMerge "Fix GCC 6.3 warnings in aosp/master"
Treehugger Robot [Tue, 9 May 2017 18:32:17 +0000 (18:32 +0000)]
Merge "Fix GCC 6.3 warnings in aosp/master"

7 years agoFix GCC 6.3 warnings in aosp/master
Pyry Haulos [Thu, 30 Mar 2017 23:42:23 +0000 (16:42 -0700)]
Fix GCC 6.3 warnings in aosp/master

Change-Id: I0a90ba7ed2e52fdadf554236850533298b2e1a9e

7 years agoFix negative CompressedTexImage2D tests
Alexander Galazin [Mon, 8 May 2017 12:31:15 +0000 (14:31 +0200)]
Fix negative CompressedTexImage2D tests

Certain tests expect GL_VALID_VAULE for
glCompressedTexImage2D(GL_TEXTURE_2D, -1, 0x8b90, 0, 0, 0, 0, 0).

0x8b90 is a palette format PALETTE4_RGB8 and
the OES_compressed_paletted_texture extension allows
negative values for the level parameter:
    Accepted by the <level> parameter of CompressedTexImage2D
        Zero and negative values.  |level| + 1 determines the number of
        mip levels defined for the paletted texture.

This change fixes the tests in presence of
the OES_compressed_paletted_texture extension.

Components: AOSP
Google bug: 38109626

Affects:
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_neg_level_tex2d
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_neg_level_cube

Change-Id: Ia37e3fecaf3547abfb209803378114043c63a243

7 years agoMerge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev...
Pyry Haulos [Wed, 3 May 2017 16:18:55 +0000 (16:18 +0000)]
Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev am: acf47d464f am: c2594c65ff" into nyc-mr1-dev am: 2190aa2642 am: 7394ee84a1
am: 579c101261

Change-Id: Idf4f6941e51b2cc8c54a378550e4da9df49a52dc

7 years agoMerge "Fix color change verification in dithering tests" into nougat-cts-dev am:...
Pyry Haulos [Wed, 3 May 2017 16:18:40 +0000 (16:18 +0000)]
Merge "Fix color change verification in dithering tests" into nougat-cts-dev am: acf47d464f am: 45d860b737 am: 2196375b32 am: 84ee6b2620 am: d4c8a3ac82
am: 862196b30a

Change-Id: Id3414d1e9546f6df8605fd23d48a22c49d0f5bdf

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 "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...
Pyry Haulos [Wed, 3 May 2017 16:16:19 +0000 (16:16 +0000)]
Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev am: acf47d464f am: c2594c65ff" into nyc-mr1-dev am: 2190aa2642
am: 7394ee84a1

Change-Id: I3c7400d5f5b25062d72b00a1fba0719f6bdad171

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 "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 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 "Fix color change verification in dithering tests" into nougat-cts-dev am:...
Pyry Haulos [Wed, 3 May 2017 16:16:06 +0000 (16:16 +0000)]
Merge "Fix color change verification in dithering tests" into nougat-cts-dev am: acf47d464f am: 45d860b737 am: 2196375b32 am: 84ee6b2620
am: d4c8a3ac82

Change-Id: I6d9f11eab0cddb3abe8beb8af5cacfc3f538a23a

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 "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: 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 "Merge "Fix color change verification in dithering tests" into nougat-cts-dev...
Pyry Haulos [Wed, 3 May 2017 16:13:46 +0000 (16:13 +0000)]
Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev am: acf47d464f am: c2594c65ff" into nyc-mr1-dev
am: 2190aa2642

Change-Id: I0ca69aeb72966ca1760ddb1b52af5b0896200936

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: 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 "Fix color change verification in dithering tests" into nougat-cts-dev am:...
Pyry Haulos [Wed, 3 May 2017 16:13:35 +0000 (16:13 +0000)]
Merge "Fix color change verification in dithering tests" into nougat-cts-dev am: acf47d464f am: 45d860b737 am: 2196375b32
am: 84ee6b2620

Change-Id: Icbd6e2e82dd0dda0e28881154e1d0ba2ed24af7e

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 "Merge "Fix color change verification in dithering tests" into nougat-cts-dev...
Android Build Merger (Role) [Wed, 3 May 2017 16:11:18 +0000 (16:11 +0000)]
Merge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev am: acf47d464f am: c2594c65ff" 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: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 agoMerge "Fix color change verification in dithering tests" into nougat-cts-dev am:...
Pyry Haulos [Wed, 3 May 2017 16:11:07 +0000 (16:11 +0000)]
Merge "Fix color change verification in dithering tests" into nougat-cts-dev am: acf47d464f am: 45d860b737
am: 2196375b32

Change-Id: If38159d29357c10a4fcae002dee923433cf48ff6

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:11:06 +0000 (16:11 +0000)]
Merge "Fix color change verification in dithering tests" into nougat-cts-dev am: acf47d464f
am: c2594c65ff

Change-Id: I8b7fab12228e9366c9f96280288a88867bbd4724

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 color change verification in dithering tests" into nougat-cts-dev am:...
Pyry Haulos [Wed, 3 May 2017 16:08:35 +0000 (16:08 +0000)]
Merge "Fix color change verification in dithering tests" into nougat-cts-dev am: acf47d464f
am: 45d860b737

Change-Id: I9bfa731b074538d354a25945f760ba00d9c31ad1

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 agoMerge "Fix color change verification in dithering tests" into nougat-cts-dev
Pyry Haulos [Wed, 3 May 2017 16:06:40 +0000 (16:06 +0000)]
Merge "Fix color change verification in dithering tests" into nougat-cts-dev
am: acf47d464f

Change-Id: Iabf1c0d76db9f83f64cae805f89bd60230cd0408

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

7 years agoFix error mask generation in checkLineContinuity
Alexander Galazin [Thu, 20 Apr 2017 12:08:44 +0000 (14:08 +0200)]
Fix error mask generation in checkLineContinuity

Even if some pixels are missing the function could return
all-zero errorMask if the messageLimitcounter was exhausted.

Components: AOSP
Affects: dEQP-GLES31.functional.primitive_bounding_box.lines.*

Google bug: 35987764

7 years agoEnsure expected error in copytexsubimage2d_incomplete_framebuffer am: 89bb39d249
Alexander Galazin [Wed, 19 Apr 2017 16:44:16 +0000 (16:44 +0000)]
Ensure expected error in copytexsubimage2d_incomplete_framebuffer am: 89bb39d249
am: fc8c8e4d78

Change-Id: I1542a80ff511796208da91bd64a9759543464628

7 years agoEnsure expected error in copytexsubimage2d_incomplete_framebuffer
Alexander Galazin [Wed, 19 Apr 2017 16:42:16 +0000 (16:42 +0000)]
Ensure expected error in copytexsubimage2d_incomplete_framebuffer
am: 89bb39d249

Change-Id: Iddf43b14d658dc2847f6bdab12258d9015c9e770

7 years agoEnsure expected error in copytexsubimage2d_incomplete_framebuffer
Alexander Galazin [Wed, 19 Apr 2017 06:33:39 +0000 (08:33 +0200)]
Ensure expected error in copytexsubimage2d_incomplete_framebuffer

The GLES2 version of the copytexsubimage2d_incomplete_framebuffer test could
potentially throw INVALID_OPERATION instead of expected INVALID_FRAMEBUFFER_OPERATION
due to the cubemap texture not being defined by a previous TexImage2D.
This change re-uses the GLES3 version of the same test and ensures that
INVALID_FRAMEBUFFER_OPERATION is thrown.

Affects:
dEQP-GLES2.functional.negative_api.texture.copytexsubimage2d_incomplete_framebuffer

Change-Id: I7b3f770ff31c73d770a53f6b6bdae3ea4a37b63a
Components: AOSP
Google bug: 37497541

7 years agoFix color change verification in dithering tests
Pyry Haulos [Tue, 18 Apr 2017 23:13:59 +0000 (16:13 -0700)]
Fix color change verification in dithering tests

Tests were supposed to allow color change once per row/column depending
on gradient direction but instead allowed color change in constant
direction only once over whole image.

Affects:

dEQP-GLES2.functional.dither.disabled.gradient_*
dEQP-GLES3.functional.dither.disabled.gradient_*

Bug: 37477346
Change-Id: I37ef06b4ff527f8c316eae56c8a99c88cdaaf4b4

7 years agoTry to determine renderable format in lifetime tests
Pyry Haulos [Mon, 17 Apr 2017 21:34:27 +0000 (14:34 -0700)]
Try to determine renderable format in lifetime tests

Affects:

dEQP-GLES2.functional.lifetime.attach.deleted_input.renderbuffer_framebuffer
dEQP-GLES2.functional.lifetime.attach.deleted_input.texture_framebuffer
dEQP-GLES2.functional.lifetime.attach.deleted_output.renderbuffer_framebuffer
dEQP-GLES2.functional.lifetime.attach.deleted_output.texture_framebuffer

Bug: 36724173

Change-Id: I46196317c144f294adce65ff4690571d28e1caf3

7 years agoDEPTH_STENCIL_OES as tex format requires OES_depth_texture am: 8290443470
Pyry Haulos [Tue, 18 Apr 2017 00:13:03 +0000 (00:13 +0000)]
DEPTH_STENCIL_OES as tex format requires OES_depth_texture am: 8290443470
am: 7e7f286dce

Change-Id: Ibca9b3e20d1aa048c5fe19bee1fbed4259a3cac5

7 years agoDEPTH_STENCIL_OES as tex format requires OES_depth_texture
Pyry Haulos [Tue, 18 Apr 2017 00:08:58 +0000 (00:08 +0000)]
DEPTH_STENCIL_OES as tex format requires OES_depth_texture
am: 8290443470

Change-Id: Ie9f0302738035df22b5c355412c72d68d27b3388

7 years agoDEPTH_STENCIL_OES as tex format requires OES_depth_texture
Pyry Haulos [Mon, 17 Apr 2017 19:34:26 +0000 (12:34 -0700)]
DEPTH_STENCIL_OES as tex format requires OES_depth_texture

Affects:

dEQP-GLES2.functional.fbo.completeness.*
dEQP-GLES3.functional.fbo.completeness.*

Bug: 36727598
Merged-In: Ic79408c21b80ea458baecf79c042e2694e72e0b2
Change-Id: Ib302b21b2b28d4f13aa6df8bdcac878f22ae51be

7 years agoDEPTH_STENCIL_OES as tex format requires OES_depth_texture
Pyry Haulos [Mon, 17 Apr 2017 19:34:26 +0000 (12:34 -0700)]
DEPTH_STENCIL_OES as tex format requires OES_depth_texture

Affects:

dEQP-GLES2.functional.fbo.completeness.*
dEQP-GLES3.functional.fbo.completeness.*

Bug: 36727598
Change-Id: Ic79408c21b80ea458baecf79c042e2694e72e0b2

7 years agoeglGetFrameTimestamps: Use reserved enum values. am: 84574b5c7b
Brian Anderson [Wed, 12 Apr 2017 21:44:47 +0000 (21:44 +0000)]
eglGetFrameTimestamps: Use reserved enum values. am: 84574b5c7b
am: 6ee57fc890

Change-Id: I714be1607bbcfa77e5589f632d76f139ba5e6c82

7 years agoeglGetFrameTimestamps: Allow optional present support. am: afb7428641
Brian Anderson [Wed, 12 Apr 2017 21:44:45 +0000 (21:44 +0000)]
eglGetFrameTimestamps: Allow optional present support. am: afb7428641
am: 4563d47710

Change-Id: I7a72a2f446ca2c8bd739e6b77dcf3933b5e26a7c

7 years agoeglGetFrameTimestamps: pending vs. invalid timestamps. am: b4e217e4a1
Brian Anderson [Wed, 12 Apr 2017 21:44:42 +0000 (21:44 +0000)]
eglGetFrameTimestamps: pending vs. invalid timestamps. am: b4e217e4a1
am: 61e9fbabf0

Change-Id: I18300b52d4d195b2b87a0a38744e997640b2a54e

7 years agoeglGetFrameTimestamps: Use reserved enum values.
Brian Anderson [Wed, 12 Apr 2017 21:39:49 +0000 (21:39 +0000)]
eglGetFrameTimestamps: Use reserved enum values.
am: 84574b5c7b

Change-Id: Id7278a7635e01366e9a85800ab2716121b31dc8b

7 years agoeglGetFrameTimestamps: Allow optional present support.
Brian Anderson [Wed, 12 Apr 2017 21:39:46 +0000 (21:39 +0000)]
eglGetFrameTimestamps: Allow optional present support.
am: afb7428641

Change-Id: Iedc02e435a0b340b2ba8ee4edcccb39f60bfd1d1