Pyry Haulos [Thu, 29 Sep 2016 23:10:48 +0000 (23:10 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
am:
2f2ce0f048
Change-Id: I11d4986391731720f65922dd2ae4223812055999
Pyry Haulos [Thu, 29 Sep 2016 21:13:52 +0000 (14:13 -0700)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
Change-Id: I0a9fb821325ade846a4fd77e6bc54ed315892f42
Pyry Haulos [Wed, 28 Sep 2016 21:27:28 +0000 (14:27 -0700)]
Start a new mustpass for 1.0.2 and archive 1.0.1
Change-Id: I7519c1d5862885be08dd203c620037f9593c66b9
Maciej Jesionowski [Mon, 19 Sep 2016 09:15:31 +0000 (11:15 +0200)]
Add VK_INCOMPLETE result code tests
New tests:
- dEQP-VK.wsi.*.swapchain.get_images.incomplete
Modified tests:
- dEQP-VK.api.info.instance.physical_devices
- dEQP-VK.api.info.instance.layers
- dEQP-VK.api.info.instance.extensions
- dEQP-VK.api.info.device.layers
- dEQP-VK.api.info.device.extensions
- dEQP-VK.wsi.*.surface.query_formats
- dEQP-VK.wsi.*.surface.query_present_modes
Fixes #495
Change-Id: I1b493acf2df3039705e3d404c2cdcbb084495f33
Szilard Ledan [Wed, 24 Aug 2016 16:04:02 +0000 (18:04 +0200)]
Test copying data between buffers and images
Add new tests to vkCmdCopyBufferToImage
Add two new tests for testing vkCmdCopyImageToBuffer.
Fix one existing test. The test's description and it's
behaviour didn't match.
Change-Id: I5a2da940c1b6e285954ae39f8bb77d6138053bdd
Maciej Jesionowski [Fri, 16 Sep 2016 11:07:28 +0000 (13:07 +0200)]
Add VK_NULL_HANDLE destroy/free tests
New tests:
- dEQP-VK.api.null_handle.*
- dEQP-VK.wsi.*.surface.destroy_null_handle
- dEQP-VK.wsi.*.swapchain.destroy.null_handle
Fixes #493
Change-Id: I44541b4d1b44ed8da2ba23e5ae9ba1106ee2c015
Pyry Haulos [Thu, 29 Sep 2016 19:25:08 +0000 (12:25 -0700)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev
Change-Id: Ia7127ed7764c5276a32388ab2bba024d54dfea5b
Pyry Haulos [Thu, 29 Sep 2016 19:25:06 +0000 (12:25 -0700)]
Merge gerrit/vulkan-cts-1.0.0 into gerrit/vulkan-cts-1.0.1
Change-Id: I23cda772fc12dc44429c6a8b69cb2896b442c285
Pyry Haulos [Tue, 27 Sep 2016 23:01:53 +0000 (16:01 -0700)]
Remove use of alloc recorder from descriptor_pool.repeated_reset
Recording all allocations can take considerable amount of memory and it
appears that the tests just log the total memory usage and don't
otherwise need or check it.
Fixes #472
Change-Id: Ic8804b6781329a03e42fc481c0d430151b60ca88
Pyry Haulos [Tue, 27 Sep 2016 22:49:46 +0000 (15:49 -0700)]
Fix alignment issues in uploading image data in ShaderExecutor
Fixes #485
Change-Id: If04aebab19fb25ef26b51b4af86e718004438d82
Lionel Landwerlin [Tue, 9 Aug 2016 12:13:27 +0000 (13:13 +0100)]
blit_image: compute validation threshold based on I/O formats
Whereas dEQP-GLES3.functional.fbo.blit.conversion.rgb565_to_rgba32f is
passing on my Haswell machine,
dEQP-VK.api.copy_and_blit.blit_image.all_formats.r5g6b5_unorm_pack16_r32g32b32a32_sfloat_linear
is failing. It seems the criteria is different between the 2 tests. This
change puts the vulkan tests a bit closer to the GLES3 ones.
Change-Id: I4e4879270baaf707e71de030b916ea49ee0f65ba
Pyry Haulos [Mon, 26 Sep 2016 16:04:55 +0000 (09:04 -0700)]
Fix VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT handling in query tests
83f90be9 added a check that was intended to make tests treat combination
of TRANSIENT_ATTACHMENT_BIT with non-RT usages invalid. However, that
change was buggy and lead the tests to treat _all_ usages of
TRANSIENT_ATTACHMENT_BIT invalid and thus skip testing them.
Change-Id: I512fbea6046a5c1a87e2ea957eebe38ac713ac87
Maciej Jesionowski [Tue, 27 Sep 2016 11:09:32 +0000 (13:09 +0200)]
Fix incorrect limits in device properties test
- alignment/offset type limits must be greater than 0
- nonCoherentAtomSize must be in range [1, 256] (the upper limit was
relaxed with spec update 1.0.27
- point sizes and line widths must be positive
Modified test:
- dEQP-VK.api.info.device.properties
Fixes #502
Change-Id: I98a956d1cea741dd6d787415a0ad91178ffa0abf
Pyry Haulos [Tue, 27 Sep 2016 20:21:48 +0000 (20:21 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
am:
c85249943b
Change-Id: Iab6a4cbb50ac863a4600fd636a886368b6e7a1a8
Pyry Haulos [Tue, 27 Sep 2016 18:42:17 +0000 (18:42 +0000)]
Add license to a few utility scripts
am:
f85b5c9705
Change-Id: Ibf2d2171f2bf8e3ca005526c259c3cda083cc55b
Pyry Haulos [Tue, 27 Sep 2016 18:37:22 +0000 (11:37 -0700)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
Change-Id: Ic57898b48c27812332fd03f000f80af9555a878f
Pyry Haulos [Tue, 27 Sep 2016 18:37:11 +0000 (11:37 -0700)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev
Change-Id: I27021effa17e025cef4a85fb015b905b82bf1667
Pyry Haulos [Mon, 26 Sep 2016 21:26:04 +0000 (14:26 -0700)]
Add license to a few utility scripts
Change-Id: I2233a68e2480fe07a6800c16d4a83e387b4c328a
Pyry Haulos [Tue, 27 Sep 2016 15:52:36 +0000 (15:52 +0000)]
Merge "Get rid of indirection when adding module directories in build"
am:
fb175316d0
Change-Id: I7a165eb112c32a9e30069b81204b6e22f526b57a
Pyry Haulos [Tue, 27 Sep 2016 15:47:29 +0000 (15:47 +0000)]
Merge "Get rid of indirection when adding module directories in build"
Pyry Haulos [Tue, 27 Sep 2016 00:39:40 +0000 (00:39 +0000)]
Merge "Remove few obsolete target files"
am:
082248137d
Change-Id: Id376d6dec598435c43aa6cfbc0c68e04ec6854ec
Pyry Haulos [Tue, 27 Sep 2016 00:32:38 +0000 (00:32 +0000)]
Merge "Add license header to main CMake files"
am:
e2b5873fd8
Change-Id: If5a447428add8f8ad2ef4c28081ed6e914f71ad1
Treehugger Robot [Tue, 27 Sep 2016 00:32:29 +0000 (00:32 +0000)]
Merge "Remove few obsolete target files"
Pyry Haulos [Tue, 27 Sep 2016 00:30:23 +0000 (00:30 +0000)]
Merge "Be more civil in comments"
am:
775f724bcc
Change-Id: Icdcfd7d5645e9403aa0b31f1a90e6dc1143cebe1
Treehugger Robot [Tue, 27 Sep 2016 00:27:19 +0000 (00:27 +0000)]
Merge "Add license header to main CMake files"
Treehugger Robot [Tue, 27 Sep 2016 00:26:12 +0000 (00:26 +0000)]
Merge "Be more civil in comments"
Pyry Haulos [Tue, 27 Sep 2016 00:10:09 +0000 (00:10 +0000)]
Remove obsolete cmake toolchain files
am:
2e95c38041
Change-Id: I19d506fd483d3f24bffee4db9867420d8b488d84
Pyry Haulos [Mon, 26 Sep 2016 22:44:06 +0000 (15:44 -0700)]
Add license header to main CMake files
Change-Id: Ia37e8c0435f3c13403faa6a80585712367bcb1f2
Pyry Haulos [Mon, 26 Sep 2016 22:28:57 +0000 (15:28 -0700)]
Be more civil in comments
Change-Id: I47d75f6d558a80263d4a3cdeaa84f780db02403a
Pyry Haulos [Mon, 26 Sep 2016 22:21:38 +0000 (15:21 -0700)]
Get rid of indirection when adding module directories in build
The machinery was needed in the past when some of the test module
directories could have been missing when building the source.
Change-Id: Ibf96483f70b1ae19a672c91603243dd06d286f08
Pyry Haulos [Mon, 26 Sep 2016 22:12:11 +0000 (15:12 -0700)]
Remove obsolete cmake toolchain files
These have not been used for a while and are likely broken at this
point.
Change-Id: I3d470e76b8dc89836eb6baa1377bfb7cd91b65ef
Pyry Haulos [Mon, 26 Sep 2016 22:07:45 +0000 (15:07 -0700)]
Remove few obsolete target files
Unmaintained, likely broken at this point.
Change-Id: Ic38ab7c3bdd78e9e0c9a88ecf6fecaa993eecc7c
Pyry Haulos [Mon, 26 Sep 2016 21:23:26 +0000 (14:23 -0700)]
Fix license header on a few Vulkan CTS files
Change-Id: If640754e1581f15e933c118338d835c18c0d7b77
Maciej Jesionowski [Mon, 26 Sep 2016 08:11:47 +0000 (10:11 +0200)]
Add PointSize to scissoring tests
Change-Id: Ib4c019416da5d4461213ce8a73e78d94644af500
Pyry Haulos [Fri, 23 Sep 2016 21:06:40 +0000 (21:06 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
am:
d04e72de0b
Change-Id: Idf39bf7b3d87b897c3263a0ab8053c0cb21d9059
Pyry Haulos [Fri, 23 Sep 2016 19:23:40 +0000 (12:23 -0700)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
Change-Id: Ie1fb552e9f5e1c00ea0c986579e6e81681fdf9c1
Pyry Haulos [Fri, 23 Sep 2016 19:23:30 +0000 (12:23 -0700)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev
Change-Id: If48367bc695ffe9b74ddcd98936e05ef005eb96c
Pyry Haulos [Fri, 23 Sep 2016 19:21:37 +0000 (15:21 -0400)]
Merge "Build fix for the Glx platform" into vulkan-cts-1.0.1
Kristof Kosztyo [Fri, 23 Sep 2016 08:48:01 +0000 (10:48 +0200)]
Build fix for the Glx platform
Change-Id: I9f3e0254c289c015f61570f71215900e0ab9bfd9
Petros Bantolas [Tue, 20 Sep 2016 08:45:03 +0000 (09:45 +0100)]
Fix clip_volume test drawing points
According to spec, "[...] if no value was written to PointSize, results
are undefined".
Modified tests:
- dEQP-VK.clipping.clip_volume.{inside,outside,depth_clamp}.point_list
- dEQP-VK.clipping.clip_volume.clipped.large_points
Change-Id: I06ed228a9e4563df15801ff402ed5eac946ac9a6
Pyry Haulos [Thu, 22 Sep 2016 22:44:07 +0000 (22:44 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
am:
b3729a6431
Change-Id: I31218eb8140c0ab39e07f987d273ef7c8f748e3a
Pyry Haulos [Thu, 22 Sep 2016 20:16:08 +0000 (13:16 -0700)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
Change-Id: I9a4ae0c9e469c2cd6b865a67bf659dee0e078c4b
Pyry Haulos [Thu, 22 Sep 2016 20:12:16 +0000 (13:12 -0700)]
Add new files to Android.mk
Change-Id: I31d5918e4ce2a367599aeafba45c58c1eb7c4392
Pyry Haulos [Thu, 22 Sep 2016 20:09:30 +0000 (13:09 -0700)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev
Change-Id: Ie6d0a102b147cf96fd0442fbf601765c3acf0835
Pyry Haulos [Mon, 19 Sep 2016 20:45:45 +0000 (13:45 -0700)]
Validate KHR extensions reported by the driver
Change-Id: I30f1c86cd0b4db63b7adf0860cfbc32a0d8b75ee
Arkadiusz Sarwa [Wed, 24 Aug 2016 12:43:23 +0000 (14:43 +0200)]
Added xcb and xlib platform support for Vulkan
Fixes #390
Change-Id: I650838665f630c794f4667f518713a7ae87c8955
Szilard Ledan [Fri, 15 Jul 2016 10:28:23 +0000 (12:28 +0200)]
Add Vulkan port of the GLES3 texture shadow tests
Change-Id: I25eaaec34393de76f215c3f553e5f52d5744cd85
Slawomir Cygan [Wed, 10 Aug 2016 17:39:32 +0000 (19:39 +0200)]
Add tests for indexed indirect draw calls and VertexIndex semantics
Fixes #460
- dEQP-VK.draw.indirect_draw.indexed tests are added
- Each VS in these tests now also validates VertexIndex value
- firstVertex and vertexOffset values are no longer 0
Change-Id: Id78bd4c446b3e75a11e824f00775dc7ab96432cc
Pyry Haulos [Thu, 22 Sep 2016 19:13:37 +0000 (12:13 -0700)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev
Change-Id: Ie53548764c5b2041cab70286b131bd13c2b21655
Pyry Haulos [Thu, 22 Sep 2016 19:13:36 +0000 (12:13 -0700)]
Merge gerrit/vulkan-cts-1.0.0 into gerrit/vulkan-cts-1.0.1
Change-Id: Idcc42afbec63aa6463be09e87dc57247275c6818
Pyry Haulos [Thu, 22 Sep 2016 19:12:53 +0000 (15:12 -0400)]
Merge "Fix barrier stage masks in synchronization tests" into vulkan-cts-1.0.1
Pyry Haulos [Thu, 22 Sep 2016 19:04:59 +0000 (15:04 -0400)]
Merge "Add VK_REMAINING_* defines to vulkan framework" into vulkan-cts-1.0-dev
Slawomir Cygan [Thu, 22 Sep 2016 14:33:02 +0000 (16:33 +0200)]
dEQP-VK.dynamic_state tests: fix sizeof(size) bug
Change-Id: I7e90b30a88bb59bbe73fec00ecb8ce0fd92ac1f0
Pyry Haulos [Thu, 22 Sep 2016 18:50:46 +0000 (14:50 -0400)]
Merge "Fix precision issue in MS interpolation test" into vulkan-cts-1.0-dev
Maciej Jesionowski [Thu, 22 Sep 2016 09:15:18 +0000 (11:15 +0200)]
Add VK_REMAINING_* defines to vulkan framework
Change-Id: I4d4693bab868cdf904d2b4c706fdb954f282ab13
Mika Isojrvi [Wed, 21 Sep 2016 17:38:23 +0000 (17:38 +0000)]
Use LDR decompression in reference for SRGB ASTC formats.
am:
4db2fa91a1
Change-Id: Ifbb4be431d3c8b959c2967b55541b9f496edb92e
Pyry Haulos [Wed, 21 Sep 2016 17:12:59 +0000 (13:12 -0400)]
Merge "Update glslang" into vulkan-cts-1.0-dev
Pyry Haulos [Wed, 21 Sep 2016 17:12:01 +0000 (13:12 -0400)]
Merge "Update SPIR-V tools" into vulkan-cts-1.0-dev
Maciej Jesionowski [Wed, 21 Sep 2016 10:05:47 +0000 (12:05 +0200)]
Fix precision issue in MS interpolation test
Modified test:
- dEQP-VK.pipeline.multisample_interpolation.offset_interpolate_at_pixel_center.*
Fixes #494
Change-Id: I608294bf190bb50292fa4d7dd72e0f6b18dac3ee
Mika Isojärvi [Tue, 20 Sep 2016 23:19:01 +0000 (16:19 -0700)]
Use LDR decompression in reference for SRGB ASTC formats.
Bug:
31587228
Test: Ran tests on Nexus devices.
Change-Id: Ia5a3c37e45e13acf9078741188821b7be87da6fd
Pyry Haulos [Tue, 20 Sep 2016 22:20:41 +0000 (15:20 -0700)]
Update glslang
Change-Id: I095574ac4969033f1e3929371f7962b7b96a8039
Pyry Haulos [Tue, 20 Sep 2016 22:49:01 +0000 (15:49 -0700)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev
Change-Id: Ifea48fac6730fbcaa294c1109a1ee2579298e05b
Pyry Haulos [Tue, 20 Sep 2016 22:48:44 +0000 (18:48 -0400)]
Merge "Remove invalid precision qualifier usage" into vulkan-cts-1.0.1
Pyry Haulos [Tue, 20 Sep 2016 22:14:52 +0000 (15:14 -0700)]
Update SPIR-V tools
Change-Id: Iec5ba9bc4c061a0efe2979761e2f9d24d5fea596
Pyry Haulos [Tue, 20 Sep 2016 22:11:11 +0000 (15:11 -0700)]
Remove invalid precision qualifier usage
dEQP-VK.pipeline.vertex_input tests were incorrectly using highp
qualifier with double types. That is not allowed, and default precision
in GLSL 4.4 shaders is highp anyway.
Fixes #458
Change-Id: I4b17b2273a8bf258bb8aec5737bd1c2a38aa49ce
Pyry Haulos [Tue, 20 Sep 2016 21:56:25 +0000 (14:56 -0700)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev
Change-Id: I71b844cd76da9c64b1545a6e583f9fc8681c4b34
Pyry Haulos [Tue, 20 Sep 2016 21:47:29 +0000 (14:47 -0700)]
Do not use pointer value after deleting it
Pointer value is undefined after 'delete'.
Change-Id: I30dab519db61073932e3e35cd87809bf89b18dfc
Pyry Haulos [Tue, 20 Sep 2016 20:51:03 +0000 (16:51 -0400)]
Merge "Check line endings in check_whitespace.py" into vulkan-cts-1.0-dev
Pyry Haulos [Tue, 20 Sep 2016 20:19:25 +0000 (13:19 -0700)]
Check line endings in check_whitespace.py
Change-Id: I33f9f64478bcb2792cae3e2d4b6501496a54191d
Pyry Haulos [Tue, 20 Sep 2016 20:15:00 +0000 (13:15 -0700)]
Print test log path into console output
Having test log path printed out is helpful as it makes it clearer
that the console output is not the actual test log. Additionally, on
some platforms, such as Android, the log might be written into
non-obvious location.
Change-Id: I954550f96b2b910eb0cbfd8b83612b2a758669db
Vidar Lilleboe [Fri, 16 Sep 2016 11:21:02 +0000 (13:21 +0200)]
Fix barrier stage masks in synchronization tests
Fixes #497
Change-Id: I225344335a13b0347cf6ad34e38c3f0a181d41cd
Pyry Haulos [Mon, 19 Sep 2016 21:51:00 +0000 (14:51 -0700)]
Update Vulkan framework to vulkan.h 1.0.27
Change-Id: I3c1bf3295982792c4fa47263f7f3868758d4aedb
Pyry Haulos [Mon, 19 Sep 2016 21:49:34 +0000 (17:49 -0400)]
Merge "Fix OpVariable position in OpInBoundsAccessChain tests." into vulkan-cts-1.0-dev
Pyry Haulos [Thu, 15 Sep 2016 23:31:58 +0000 (23:31 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
am:
1a6d3c9ee7
Change-Id: I632b1f98db42f54c4798f51d77a1e743ca3934c6
Pyry Haulos [Thu, 15 Sep 2016 21:43:57 +0000 (14:43 -0700)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
Change-Id: I850bae53652ab1e2475754324d972e85f2daff99
Pyry Haulos [Thu, 15 Sep 2016 20:03:24 +0000 (13:03 -0700)]
Move texture_filtering.explicit_lod under dEQP-VK.texture
Change-Id: I25a1a6e5910814ef010942d11787b6c5969b4021
Zoltan Janos Szabo [Fri, 15 Jul 2016 10:21:05 +0000 (12:21 +0200)]
Add Vulkan port of the GLES3 texture mipmap tests
Change-Id: I5c5d9d83a7f284cf0f561d4a4725f95e37cb2842
Peter Siket [Fri, 15 Jul 2016 10:14:39 +0000 (12:14 +0200)]
Add Vulkan port of the GLES3 texture filtering tests
Change-Id: I3aaf5ed38ba63067f5d205317f26818ba42df925
Pyry Haulos [Thu, 15 Sep 2016 20:16:46 +0000 (16:16 -0400)]
Merge "Add new files to Android.mk" into vulkan-cts-1.0-dev
Pyry Haulos [Thu, 15 Sep 2016 20:05:03 +0000 (13:05 -0700)]
Add new files to Android.mk
Change-Id: Ie9dee591212230db3a2d9cafcbdfbc794c966965
Arkadiusz Sarwa [Thu, 21 Jul 2016 07:38:11 +0000 (09:38 +0200)]
Resolve image test: 2d array
New tests:
- dEQP-VK.api.copy_and_blit.resolve_image.whole_copy_before_resolving*
- dEQP-VK.api.copy_and_blit.resolve_image.whole_array_image*
Fixes #438
Change-Id: Idfc02e7ada4c53b5706ac17cb9d32dfd77d22869
Pyry Haulos [Thu, 15 Sep 2016 19:23:11 +0000 (15:23 -0400)]
Merge "Add multisampled storage image load/store test" into vulkan-cts-1.0-dev
Pyry Haulos [Tue, 30 Aug 2016 22:50:53 +0000 (15:50 -0700)]
Update framework to vulkan.h 1.0.26
Change-Id: I7ecdeb1dbadd0fb3983f4a49db87781220ef172a
Daniel Xie [Wed, 14 Sep 2016 20:03:35 +0000 (20:03 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev am:
ec5c5c216e
am:
7664fa49e5
Change-Id: I0d5742b8d753b9e00e4c688828f4e6461181e2a5
Pyry Haulos [Wed, 14 Sep 2016 20:03:34 +0000 (20:03 +0000)]
resolve merge conflicts of
b172f9e to master
am:
ed8e08ff82
Change-Id: I87eea013265484e330874608de507e8f6c193e02
Daniel Xie [Wed, 14 Sep 2016 19:54:32 +0000 (19:54 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev
am:
ec5c5c216e
Change-Id: I740f1709bd42aa1986e31a5d9b3192f9070212e0
Pyry Haulos [Wed, 14 Sep 2016 18:21:59 +0000 (11:21 -0700)]
resolve merge conflicts of
b172f9e to master
Change-Id: I0c7d20251f170c86f21312222abfc0803a697c1d
Daniel Xie [Wed, 14 Sep 2016 18:15:10 +0000 (18:15 +0000)]
Merge "CP: Split load/store image tests into sub-groups" into nougat-cts-dev
Maciej Jesionowski [Thu, 28 Jul 2016 08:57:30 +0000 (10:57 +0200)]
Add multisampled storage image load/store test
New tests:
- dEQP-VK.image.load_store_multisample.2d.*
- dEQP-VK.image.load_store_multisample.2d_array.*
Fixes #439
Change-Id: I584f3795dc8f50af753d8dea8b8c47906840770a
Jamie Madill [Tue, 13 Sep 2016 19:09:49 +0000 (19:09 +0000)]
Merge "Remove use of varargs.h from deString.c."
am:
ca988480be
Change-Id: Ia5d220880a054269ef1d2f21297086ec9f4a700d
Daniel Xie [Tue, 13 Sep 2016 19:07:35 +0000 (19:07 +0000)]
Merge "CP: Require 'master' config to be supported in Android CTS" into nougat-cts-dev am:
84173082ee
am:
e9835d0aa0
Change-Id: Ife2715575e55a709cda64fb854743d40cf38332c
Pyry Haulos [Tue, 13 Sep 2016 19:07:34 +0000 (19:07 +0000)]
CP: Require 'master' config to be supported in Android CTS am:
03d217bb53
am:
5eaf6f98bd
Change-Id: If2ce0d401e5d46e6746bdbb0ec248bf49fa0d6b3
Daniel Xie [Tue, 13 Sep 2016 19:07:33 +0000 (19:07 +0000)]
Merge "CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests" into nougat-cts-dev am:
1ad2703e25
am:
913aabf8c3
Change-Id: I8c32d73f6585e7b0c9c28ed19d3a645f8b95c816
Pyry Haulos [Tue, 13 Sep 2016 19:07:33 +0000 (19:07 +0000)]
CP: Handle EGL_EXT_yuv_surface in eglChooseConfig() tests am:
521bb16575
am:
8d8aa8f78a
Change-Id: I4ba15b1907dce4478ab5c6e532de6c5a962acd31
Daniel Xie [Tue, 13 Sep 2016 19:07:32 +0000 (19:07 +0000)]
Merge "Remove a few EGL tests using RGBA4 format from mustpass" into nougat-cts-dev am:
451fa7c581
am:
65b5f9fa73
Change-Id: I4d37488b7995de46c34b0018a3f07ef98a89f335
Pyry Haulos [Tue, 13 Sep 2016 19:05:21 +0000 (19:05 +0000)]
resolve merge conflicts of
3ffc2f2 to master
am:
f2c82779ae
Change-Id: If42ab81eae41f7e0c61abb4997df4221361fd0b7
Daniel Xie [Tue, 13 Sep 2016 19:05:20 +0000 (19:05 +0000)]
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am:
a268fcbaff
am:
30b11fbc7b
Change-Id: I6bd7765879a05665e975b97ae501fcb1616159dd
Pyry Haulos [Tue, 13 Sep 2016 19:04:45 +0000 (19:04 +0000)]
CP: Reduce max iter count in alloc_callback_fail.device am:
ef5688dda6
am:
9872f68221
Change-Id: I397b9b4f8abc857ce917e8a539a65ad4f965715b
Daniel Xie [Tue, 13 Sep 2016 19:04:44 +0000 (19:04 +0000)]
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am:
83683a367f
am:
a69387d887
Change-Id: I9c336b20b449ba22fa94b3a61bbcb9bbec76e8d8
Pyry Haulos [Tue, 13 Sep 2016 19:04:38 +0000 (19:04 +0000)]
DO NOT MERGE Allow old behavior in image format property tests am:
0825a289c0 -s ours
am:
c9b0c26d5c -s ours
Change-Id: I28c85a91c915aee441951ffaffcb7b8fe0c57f5e