Pyry Haulos [Tue, 9 May 2017 18:57:30 +0000 (18:57 +0000)]
Merge "Fix GCC 6.3 warnings in aosp/master" am:
1211e9fe1b am:
56ed30da81
am:
2bd761c309
Change-Id: Ib2913a7e951737c23805d2ba25106eb5e695773a
Alexander Galazin [Tue, 9 May 2017 18:57:16 +0000 (18:57 +0000)]
Fix negative CompressedTexImage2D tests am:
9de005f035 am:
958ab8f9cb
am:
b42217f8ce
Change-Id: I64769839e2381c5d7ef0a9c50ca76e5dde82caa9
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
Alexander Galazin [Tue, 9 May 2017 18:53:11 +0000 (18:53 +0000)]
Fix negative CompressedTexImage2D tests am:
9de005f035
am:
958ab8f9cb
Change-Id: Ic59ec5a4da6a3eda979126732480857d9c21044b
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
Alexander Galazin [Tue, 9 May 2017 18:48:41 +0000 (18:48 +0000)]
Fix negative CompressedTexImage2D tests
am:
9de005f035
Change-Id: I6a966a2bf462e77169dd4a15e71f6960ecc55160
Treehugger Robot [Tue, 9 May 2017 18:32:17 +0000 (18:32 +0000)]
Merge "Fix 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
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
Pyry Haulos [Wed, 3 May 2017 18:07:55 +0000 (18:07 +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
am:
705f37810e
Change-Id: I77114e3d87d94c063833c6badd3233428c7cd87c
Pyry Haulos [Wed, 3 May 2017 18:07:38 +0000 (18:07 +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
am:
b552592f77
Change-Id: Ibb1a95b31eb5383d1bb5743c6db298953e47b503
Pyry Haulos [Wed, 3 May 2017 18:07:19 +0000 (18:07 +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
am:
a651781bb8 -s ours
Change-Id: I834a7749709c083b972a23fadfc934d74b20951f
Alexander Galazin [Wed, 3 May 2017 18:07:07 +0000 (18:07 +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:
b06191e636
Change-Id: Ie7bbfbf8149eeaf35df484edce86b2a87c16ff94
Pyry Haulos [Wed, 3 May 2017 18:06:48 +0000 (18:06 +0000)]
resolve merge conflicts of
eb48f49dd to oc-dev
am:
7e37841e4f -s ours
Change-Id: Id0436a84f2f097836264f593a7154475e1e328ab
Pyry Haulos [Wed, 3 May 2017 18:05:12 +0000 (18:05 +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: Ib5d026e7e4e689cf07791e6311d63c0e9561a542
Pyry Haulos [Wed, 3 May 2017 18:04:55 +0000 (18:04 +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: Ifade543e4262d872142c9d3fa7dd54b23f382a8c
Pyry Haulos [Wed, 3 May 2017 18:04:38 +0000 (18:04 +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
Change-Id: I97eba377b795020191d0cfccee80f33188eb9ac2
Alexander Galazin [Wed, 3 May 2017 18:04:20 +0000 (18:04 +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: I707f8523b65c4e6d18f3c30c848359dbefc140c5
Pyry Haulos [Wed, 3 May 2017 16:17:01 +0000 (09:17 -0700)]
resolve merge conflicts of
eb48f49dd to oc-dev
Test: scripts/check_build_sanity.py
Change-Id: Iebca655530a000eb96e744fae44a4a9f740c91af
Pyry Haulos [Wed, 3 May 2017 16:21:39 +0000 (16:21 +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
am:
27ac88fa73
Change-Id: I1a3b820753b889a66fa5101d7ddb7ec4b3d723af
Pyry Haulos [Wed, 3 May 2017 16:21:26 +0000 (16:21 +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
am:
7399cb4e48
Change-Id: Ie6880a1e23650f5e7f95a20fe358115424fa8801
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
projects / platform / upstream / VK-GL-CTS.git / log