platform/upstream/VK-GL-CTS.git
7 years agoMerge "add component metadata tag to CTS DEQP module"
Guang Zhu [Tue, 6 Jun 2017 19:02:39 +0000 (19:02 +0000)]
Merge "add component metadata tag to CTS DEQP module"

7 years agoAdd OWNERS in external/deqp am: ea5d0ac339 am: d8d22c9c34 am: 90707d5538
Chih-Hung Hsieh [Tue, 6 Jun 2017 02:51:20 +0000 (02:51 +0000)]
Add OWNERS in external/deqp am: ea5d0ac339 am: d8d22c9c34 am: 90707d5538
am: 2698dbc280

Change-Id: I826aab9c6f19537bfcc40ec997d874806b8f2d4b

7 years agoAdd OWNERS in external/deqp am: ea5d0ac339 am: d8d22c9c34
Chih-Hung Hsieh [Tue, 6 Jun 2017 02:45:32 +0000 (02:45 +0000)]
Add OWNERS in external/deqp am: ea5d0ac339 am: d8d22c9c34
am: 90707d5538

Change-Id: I3297d657fd67a3d1e32c150f295e23329a59b52c

7 years agoAdd OWNERS in external/deqp am: ea5d0ac339
Chih-Hung Hsieh [Tue, 6 Jun 2017 02:39:31 +0000 (02:39 +0000)]
Add OWNERS in external/deqp am: ea5d0ac339
am: d8d22c9c34

Change-Id: I1f8b8c408980f7d6abaea41b82642a80e72de905

7 years agoAdd OWNERS in external/deqp
Chih-Hung Hsieh [Tue, 6 Jun 2017 02:34:00 +0000 (02:34 +0000)]
Add OWNERS in external/deqp
am: ea5d0ac339

Change-Id: I2a467b66ddf9de5d3bb6c7f7130277c33d15c85b

7 years agoadd component metadata tag to CTS DEQP module
Guang Zhu [Mon, 5 Jun 2017 21:38:08 +0000 (14:38 -0700)]
add component metadata tag to CTS DEQP module

Bug: 36140955
Bug: 35360169
Test: new unit test to ensure that all modules have this field
Change-Id: I3fe6bc2f35b253a4a15f3a133c42e522fb0ae277

7 years agoAdd OWNERS in external/deqp
Chih-Hung Hsieh [Mon, 5 Jun 2017 17:48:12 +0000 (10:48 -0700)]
Add OWNERS in external/deqp

* Owners are selected from top CL approvals or owners.
  They will be suggested to review/approve future CLs.
* OWNERS files are recognized by the new find-owners plugin, see .md files in
  https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/

Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: I0d256181d2ca0c0ec55cf5479ff34aa68f3190a9

7 years agoAdd getAbi new interface am: 16fd5275d6
jdesprez [Fri, 2 Jun 2017 22:03:01 +0000 (22:03 +0000)]
Add getAbi new interface am: 16fd5275d6
am: 37ca881df0

Change-Id: Ie79f740db2e35e7358331f0fe0d4a7af2a774e49

7 years agoAdd getAbi new interface
jdesprez [Fri, 2 Jun 2017 21:59:21 +0000 (21:59 +0000)]
Add getAbi new interface
am: 16fd5275d6

Change-Id: I06754ca2d59542f81bb5eaee836cd6553c599a97

7 years agoAdd getAbi new interface
jdesprez [Mon, 15 May 2017 17:12:55 +0000 (10:12 -0700)]
Add getAbi new interface

To handle new sharding more cleanly.

Test: deqp unit tests
cts full run
Bug: 37211399

Change-Id: I3683cf36b1fc9defae27db52378d270681e99264
(cherry picked from commit 1d16f247bb951dcdea15f5e2738d9c66f7f336e7)

7 years agoAdd getAbi new interface
jdesprez [Mon, 15 May 2017 17:12:55 +0000 (10:12 -0700)]
Add getAbi new interface

To handle new sharding more cleanly.

Test: deqp unit tests
cts full run
Bug: 37211399

Change-Id: I3683cf36b1fc9defae27db52378d270681e99264

7 years agoRemove unused function from es31fSRGBDecodeTests.cpp am: 1ee59ff986 am: 2e80d40a0b...
Pyry Haulos [Tue, 16 May 2017 16:13:34 +0000 (16:13 +0000)]
Remove unused function from es31fSRGBDecodeTests.cpp am: 1ee59ff986 am: 2e80d40a0b am: 4e9833b13f
am: 7935d416ee

Change-Id: I2939c52a6b08e71518697c638a50d8a7299a5118

7 years agoRemove unused function from es31fSRGBDecodeTests.cpp am: 1ee59ff986 am: 2e80d40a0b
Pyry Haulos [Tue, 16 May 2017 16:10:34 +0000 (16:10 +0000)]
Remove unused function from es31fSRGBDecodeTests.cpp am: 1ee59ff986 am: 2e80d40a0b
am: 4e9833b13f

Change-Id: Id25728595843101b58f9907065207f46b2c6d609

7 years agoRemove unused function from es31fSRGBDecodeTests.cpp am: 1ee59ff986
Pyry Haulos [Tue, 16 May 2017 16:07:31 +0000 (16:07 +0000)]
Remove unused function from es31fSRGBDecodeTests.cpp am: 1ee59ff986
am: 2e80d40a0b

Change-Id: I7352ec017454aec896878d32aae6ef7043b2ab61

7 years agoRemove unused function from es31fSRGBDecodeTests.cpp
Pyry Haulos [Tue, 16 May 2017 16:04:16 +0000 (16:04 +0000)]
Remove unused function from es31fSRGBDecodeTests.cpp
am: 1ee59ff986

Change-Id: I383e48b3b7ee18cb00913eb7f106e5f539d33977

7 years agoRemove unused function from es31fSRGBDecodeTests.cpp
Pyry Haulos [Tue, 16 May 2017 14:25:35 +0000 (07:25 -0700)]
Remove unused function from es31fSRGBDecodeTests.cpp

Unused function causes compiler warnings to appear with recent GCC
versions.

Change-Id: I941c579994acbc9146df86acf5b9da9ee85341f5

7 years agoFix texture/sampler mapping in sRGB tests am: 102cfe8b11
Alexander Galazin [Mon, 15 May 2017 22:24:48 +0000 (22:24 +0000)]
Fix texture/sampler mapping in sRGB tests am: 102cfe8b11
am: ce808c1fa0

Change-Id: Iad6a632d4105b96fa54774c7aca0a990a17efd2d

7 years agoFix texture/sampler mapping in sRGB tests
Alexander Galazin [Mon, 15 May 2017 22:21:47 +0000 (22:21 +0000)]
Fix texture/sampler mapping in sRGB tests
am: 102cfe8b11

Change-Id: If217f88d5c02f27ea98a7704756ca1cc81b62a90

7 years agoFix texture/sampler mapping in sRGB tests am: c8efb45ead am: 984445983d am: bd25f07ba0
Alexander Galazin [Mon, 15 May 2017 20:38:20 +0000 (20:38 +0000)]
Fix texture/sampler mapping in sRGB tests am: c8efb45ead am: 984445983d am: bd25f07ba0
am: 2ec9385767

Change-Id: I2e0b44ed1baefe435f5d246038088d58468753ca

7 years agoFix texture/sampler mapping in sRGB tests am: c8efb45ead am: 984445983d
Alexander Galazin [Mon, 15 May 2017 20:26:41 +0000 (20:26 +0000)]
Fix texture/sampler mapping in sRGB tests am: c8efb45ead am: 984445983d
am: bd25f07ba0

Change-Id: I29029039970d3e7e2ed0535606c2472aa13add34

7 years agoFix texture/sampler mapping in sRGB tests am: c8efb45ead
Alexander Galazin [Mon, 15 May 2017 20:23:41 +0000 (20:23 +0000)]
Fix texture/sampler mapping in sRGB tests am: c8efb45ead
am: 984445983d

Change-Id: I3e7ffe2585e8b5ea8cf8b5212df4422a99ac3f50

7 years agoFix texture/sampler mapping in sRGB tests
Alexander Galazin [Mon, 15 May 2017 20:20:41 +0000 (20:20 +0000)]
Fix texture/sampler mapping in sRGB tests
am: c8efb45ead

Change-Id: Icd43c9b411dbc052ee99c2acee6ee18635950511

7 years agoFix texture/sampler mapping in sRGB tests
Alexander Galazin [Thu, 11 May 2017 12:27:20 +0000 (14:27 +0200)]
Fix texture/sampler mapping in sRGB tests

sRGB decode tests assume that an API side texture with index i
is connected with a shader sampler variable uTexture with index i.

This relation was however incorrectly established, e.g.
the tests were mapping texture0 to a sampler with location 0, while
such sampler was not necessarily uTexture0.

This change fixes the mapping and makes the relation more obvious.

Components: AOSP
Affects:
dEQP-GLES31.functional.srgb_texture_decode.skip_decode.*.toggled
dEQP-GLES31.functional.srgb_texture_decode.skip_decode.*.conversion_gpu

Google bug: 38257749

Change-Id: I16508f6033b31583b1c5973b70a610dd59e78e8f
(cherry picked from commit c8efb45eadba4a910ab5770b2207582cf1bb7ca0)

7 years agoFix texture/sampler mapping in sRGB tests
Alexander Galazin [Thu, 11 May 2017 12:27:20 +0000 (14:27 +0200)]
Fix texture/sampler mapping in sRGB tests

sRGB decode tests assume that an API side texture with index i
is connected with a shader sampler variable uTexture with index i.

This relation was however incorrectly established, e.g.
the tests were mapping texture0 to a sampler with location 0, while
such sampler was not necessarily uTexture0.

This change fixes the mapping and makes the relation more obvious.

Components: AOSP
Affects:
dEQP-GLES31.functional.srgb_texture_decode.skip_decode.*.toggled
dEQP-GLES31.functional.srgb_texture_decode.skip_decode.*.conversion_gpu

Google bug: 38257749

Change-Id: I16508f6033b31583b1c5973b70a610dd59e78e8f

7 years agoUpdate Vulkan CTS to version 1.0.2.3 am: 148890e79f
Pyry Haulos [Sat, 13 May 2017 14:53:47 +0000 (14:53 +0000)]
Update Vulkan CTS to version 1.0.2.3 am: 148890e79f
am: 826d389a17

Change-Id: I198bc99b3290e04e95a9386d8e32e00642ea5755

7 years agoUpdate Vulkan CTS to version 1.0.2.3
Pyry Haulos [Sat, 13 May 2017 14:51:19 +0000 (14:51 +0000)]
Update Vulkan CTS to version 1.0.2.3
am: 148890e79f

Change-Id: I224efd6c7eddc315499dc595f169b6927e4f9715

7 years agoUpdate Vulkan CTS to version 1.0.2.3 am: 633ab6f3c8 am: 399ba4a5ec am: a339444f14
Pyry Haulos [Fri, 12 May 2017 20:57:34 +0000 (20:57 +0000)]
Update Vulkan CTS to version 1.0.2.3 am: 633ab6f3c8 am: 399ba4a5ec am: a339444f14
am: 17e9ff6806

Change-Id: I9ca5c8e35311d10810c42ae515662edc5a8f02e7

7 years agoUpdate Vulkan CTS to version 1.0.2.3 am: 633ab6f3c8 am: 399ba4a5ec
Pyry Haulos [Fri, 12 May 2017 20:51:50 +0000 (20:51 +0000)]
Update Vulkan CTS to version 1.0.2.3 am: 633ab6f3c8 am: 399ba4a5ec
am: a339444f14

Change-Id: Ic36f577140bc34410ab2a3bdecb2b7c00c7c5649

7 years agoUpdate Vulkan CTS to version 1.0.2.3 am: 633ab6f3c8
Pyry Haulos [Fri, 12 May 2017 20:50:20 +0000 (20:50 +0000)]
Update Vulkan CTS to version 1.0.2.3 am: 633ab6f3c8
am: 399ba4a5ec

Change-Id: I50d0e7f5ec133d90ab5f3f43ef05f0e06a6c45c2

7 years agoUpdate Vulkan CTS to version 1.0.2.3
Pyry Haulos [Fri, 12 May 2017 20:48:20 +0000 (20:48 +0000)]
Update Vulkan CTS to version 1.0.2.3
am: 633ab6f3c8

Change-Id: I34c5df3f1b36d1d30ac9331ab4e58b3a47499ec2

7 years agoUpdate Vulkan CTS to version 1.0.2.3
Pyry Haulos [Fri, 12 May 2017 19:58:30 +0000 (12:58 -0700)]
Update Vulkan CTS to version 1.0.2.3

New tests:

 * Add tests for VK_KHR_shared_presentable_image
 * Add tests for VK_KHR_get_surface_capabilities2

Fixes:

 * makeFramebufferWithoutAttachments creates invalid framebuffer
 * Fix typo in dE-IT.build_info.de_endianness_consistent name
 * Fix - uniform buffer incorrectly dereferenced
 * Use vkGetInstanceProcAddr(NULL) to load platform funcs
 * Imgtec Waiver for texture_gather*cube*depth32f*
 * Add VK_KHR_incremental_present to the list of allowed device
extensions
 * Use -std=c++03 with GCC and clang
 * Fix GCC 6.3 warnings in vulkan-cts-1.0.2
 * Improve check_build_sanity.py
 * Relax image verification in anisotropic filtering tests
 * Respect maxColorAttachments in image tests
 * Fix SPIR-V generation in dEQP-VK.spirv_assembly
 * Fix - depth/stencil images mandatory only for VK_IMAGE_TYPE_2D
 * Add missing barrier in ssbo layout tests

Bug: 38260702
Change-Id: I1c00d4b63c339ba69990b64a5bb225c661957e4c

7 years agoUpdate Vulkan CTS to version 1.0.2.3
Pyry Haulos [Fri, 12 May 2017 16:38:51 +0000 (09:38 -0700)]
Update Vulkan CTS to version 1.0.2.3

New tests:

 * Add tests for VK_KHR_shared_presentable_image
 * Add tests for VK_KHR_get_surface_capabilities2

Fixes:

 * makeFramebufferWithoutAttachments creates invalid framebuffer
 * Fix typo in dE-IT.build_info.de_endianness_consistent name
 * Fix - uniform buffer incorrectly dereferenced
 * Use vkGetInstanceProcAddr(NULL) to load platform funcs
 * Imgtec Waiver for texture_gather*cube*depth32f*
 * Add VK_KHR_incremental_present to the list of allowed device
extensions
 * Use -std=c++03 with GCC and clang
 * Fix GCC 6.3 warnings in vulkan-cts-1.0.2
 * Improve check_build_sanity.py
 * Relax image verification in anisotropic filtering tests
 * Respect maxColorAttachments in image tests
 * Fix SPIR-V generation in dEQP-VK.spirv_assembly
 * Fix - depth/stencil images mandatory only for VK_IMAGE_TYPE_2D
 * Add missing barrier in ssbo layout tests

Bug: 38260702
Change-Id: I1c00d4b63c339ba69990b64a5bb225c661957e4c

7 years agoFix negative CompressedTexImage2D tests am: 4b6115726c
Alexander Galazin [Tue, 9 May 2017 23:04:53 +0000 (23:04 +0000)]
Fix negative CompressedTexImage2D tests am: 4b6115726c
am: 3c3614565e

Change-Id: I1bb71fb1dd6e331f1b522ce8ab6679ee92671244

7 years agoFix negative CompressedTexImage2D tests
Alexander Galazin [Tue, 9 May 2017 20:52:40 +0000 (20:52 +0000)]
Fix negative CompressedTexImage2D tests
am: 4b6115726c

Change-Id: I72f09486156a660697d4f00e41207a2c2a2a5521

7 years agoMerge "Fix GCC 6.3 warnings in aosp/master" am: 1211e9fe1b am: 56ed30da81 am: 2bd761c309
Pyry Haulos [Tue, 9 May 2017 19:28:26 +0000 (19:28 +0000)]
Merge "Fix GCC 6.3 warnings in aosp/master" am: 1211e9fe1b am: 56ed30da81 am: 2bd761c309
am: 10d242c3d6

Change-Id: I36d13ffd548cfa752c1fceb8d95bc6092762eb43

7 years agoFix negative CompressedTexImage2D tests am: 9de005f035 am: 958ab8f9cb am: b42217f8ce
Alexander Galazin [Tue, 9 May 2017 19:28:07 +0000 (19:28 +0000)]
Fix negative CompressedTexImage2D tests am: 9de005f035 am: 958ab8f9cb am: b42217f8ce
am: fa2e139731

Change-Id: I80eec07583a2f64c3279b07da4ec8a431c68b287

7 years agoMerge "Fix GCC 6.3 warnings in aosp/master" am: 1211e9fe1b am: 56ed30da81
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

7 years agoFix negative CompressedTexImage2D tests am: 9de005f035 am: 958ab8f9cb
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

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 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
(cherry picked from commit 9de005f0355e389f1782543f34e0fb3c65a0a700)

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 18:12:59 +0000 (18:12 +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
am: 6ec69a101d

Change-Id: Ie861a8e32fc6a63c6663c387c999acbeda864985

7 years agoMerge "Fix color change verification in dithering tests" into nougat-cts-dev am:...
Pyry Haulos [Wed, 3 May 2017 18:12:11 +0000 (18:12 +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
am: a5f4638914

Change-Id: I931c0c06849dcec2f66f8ed0b78d28fd9c0af834

7 years agoMerge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
Pyry Haulos [Wed, 3 May 2017 18:11:52 +0000 (18: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 am: 28cc3b34a9 am: c99530440b am: a651781bb8  -s ours
am: d57f61995e  -s ours

Change-Id: I4ac46de2204b02939b22b35572c7c6561364b18a

7 years agoMerge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:...
Alexander Galazin [Wed, 3 May 2017 18:11:34 +0000 (18:11 +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
am: dcb6d80d7a

Change-Id: I399a62cbf4ad5b60320e8ae952a8239dba03d0bf

7 years agoresolve merge conflicts of eb48f49dd to oc-dev am: 7e37841e4f -s ours
Pyry Haulos [Wed, 3 May 2017 18:11:16 +0000 (18:11 +0000)]
resolve merge conflicts of eb48f49dd to oc-dev am: 7e37841e4f  -s ours
am: a8938da884  -s ours

Change-Id: I16f210f7fa3dae8994f5b62fafb28dfe61cb9d9d

7 years agoMerge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev...
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

7 years agoMerge "Fix color change verification in dithering tests" into nougat-cts-dev am:...
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

7 years agoMerge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
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

7 years agoMerge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:...
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

7 years agoresolve merge conflicts of eb48f49dd to oc-dev
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

7 years agoMerge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev...
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

7 years agoMerge "Fix color change verification in dithering tests" into nougat-cts-dev am:...
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

7 years agoMerge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
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

7 years agoMerge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:...
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

7 years agoMerge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev...
Pyry Haulos [Wed, 3 May 2017 16:25:09 +0000 (16:25 +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
am: af56714a9b

Change-Id: I2700b9cbc985a22837cac5535d09379035a4b3c5

7 years agoMerge "Fix color change verification in dithering tests" into nougat-cts-dev am:...
Pyry Haulos [Wed, 3 May 2017 16:24:51 +0000 (16:24 +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
am: a8ec7e0231

Change-Id: I75a34225e93f2bd903e9d1f219b2ea7e93f6e569

7 years agoresolve merge conflicts of eb48f49dd to oc-dev
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

7 years agoMerge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat...
Pyry Haulos [Wed, 3 May 2017 16:24:32 +0000 (16:24 +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
am: 5da73a2fc6  -s ours

Change-Id: I9bf93b4385ceef0db9daba02b32f96061cb9ba74

7 years agoMerge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev...
Pyry Haulos [Wed, 3 May 2017 16:24:14 +0000 (16:24 +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
am: 7697d09e8e

Change-Id: I4add135bb10be4157a679330945c861140542774

7 years agoMerge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:...
Alexander Galazin [Wed, 3 May 2017 16:23:59 +0000 (16:23 +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
am: d2425448d5

Change-Id: I90553fb1eb9b1c403dbb20a46702d8b44b941dde

7 years agoMerge "Merge "Fix color change verification in dithering tests" into nougat-cts-dev...
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

7 years agoMerge "Fix color change verification in dithering tests" into nougat-cts-dev am:...
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

7 years agoMerge "Merge "Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_textur...
Pyry Haulos [Wed, 3 May 2017 16:21:25 +0000 (16:21 +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
am: b8886e0cec  -s ours

Change-Id: I03e60ccdaf3ab28915a200357929eec2e8761f9e

7 years agoMerge "Merge "Merge "Merge "Fix error mask generation in checkLineContinuity" into...
Alexander Galazin [Wed, 3 May 2017 16:21:07 +0000 (16:21 +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
am: 8ff375b503

Change-Id: I7d5667a14e2a4bb85d5a19970d1d466750fcae1a

7 years agoMerge "Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture"...
Pyry Haulos [Wed, 3 May 2017 16:20:50 +0000 (16:20 +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
am: 2d576a8876  -s ours

Change-Id: I82866cc719b3f93f8e3d5f3e733b150d4d07edf4

7 years agoMerge "Merge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc2...
Pyry Haulos [Wed, 3 May 2017 16:20:31 +0000 (16:20 +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
am: 12c6adf6f9

Change-Id: Ia4f57e8e675b0646153bc50c59b8401dffc9cb93

7 years agoMerge "Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat...
Alexander Galazin [Wed, 3 May 2017 16:20:12 +0000 (16:20 +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
am: 932a74d3d2

Change-Id: I99c2f0d295b7cbde55512951168eb60e4871b4f8

7 years agoMerge "Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat...
Alexander Galazin [Wed, 3 May 2017 16:19:53 +0000 (16:19 +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
am: a03f6ca147

Change-Id: I0b6dace39931d8941f7bd012d636b73eff7097d6

7 years agoMerge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f...
Pyry Haulos [Wed, 3 May 2017 16:19:34 +0000 (16:19 +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
am: 136bd5f683

Change-Id: I1950d324277fd52a4a6592fac936160da9cec9b4

7 years agoMerge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f...
Pyry Haulos [Wed, 3 May 2017 16:19:14 +0000 (16:19 +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
am: 3112afb203

Change-Id: I1c18d2febe3a2747cdd9fd360d4ac94c352838e7

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: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 "Try to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e...
Pyry Haulos [Wed, 3 May 2017 16:18:55 +0000 (16:18 +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
am: cd13f199b8

Change-Id: I15f9dec76e3ffaa3d184808060137fe34a831b36

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 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 "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 agoTry to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387...
Pyry Haulos [Wed, 3 May 2017 16:18:37 +0000 (16:18 +0000)]
Try to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387 am: d1aa6c62e3 am: 347c7f4d8b am: ca28cf3dee
am: 0c3bd38647

Change-Id: Iceb417dffee5b992a3370a3b710ca2e6ee6322e4

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