platform/upstream/VK-GL-CTS.git
7 years agoMerge vulkan-cts-1.0.2 into goog/oc-dev
Pyry Haulos [Fri, 7 Apr 2017 00:44:25 +0000 (00:44 +0000)]
Merge vulkan-cts-1.0.2 into goog/oc-dev
am: 605556c673

Change-Id: I44b218450c8f6208594294be0aa07db2f2224c0d

7 years agoMerge vulkan-cts-1.0.2 into goog/oc-dev
Pyry Haulos [Thu, 6 Apr 2017 22:40:05 +0000 (15:40 -0700)]
Merge vulkan-cts-1.0.2 into goog/oc-dev

Contains following fixes that have been made after vulkan-cts-1.0.2.2:

 * 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

This merge doesn't match any Vulkan CTS release tag.

Bug: 36899783
Bug: 36817508
Change-Id: Id94c70d824ca503666adf16c56ccd3de48edac05

7 years agoMerge vulkan-cts-1.0.2 into aosp/master am: 55da06144c am: d905a013d0
Pyry Haulos [Thu, 6 Apr 2017 22:38:47 +0000 (22:38 +0000)]
Merge vulkan-cts-1.0.2 into aosp/master am: 55da06144c am: d905a013d0
am: c91ce3f2a2

Change-Id: Icb5a99c9ff720093b01f2dc667bd81dda12a5eb5

7 years agoMerge vulkan-cts-1.0.2 into aosp/master am: 55da06144c
Pyry Haulos [Thu, 6 Apr 2017 22:35:15 +0000 (22:35 +0000)]
Merge vulkan-cts-1.0.2 into aosp/master am: 55da06144c
am: d905a013d0

Change-Id: I11090976693bc93d2c7e788787117d8827085307

7 years agoMerge vulkan-cts-1.0.2 into aosp/master
Pyry Haulos [Thu, 6 Apr 2017 22:31:15 +0000 (22:31 +0000)]
Merge vulkan-cts-1.0.2 into aosp/master
am: 55da06144c

Change-Id: Icf62fe8d7d8d905fd5fde4e7e4b5543ef4cfe4ca

7 years agoMerge "x11_egl: search for glesv1_cm, toggle DEQP_SUPPORT_GLES1 on if found" am:...
Pyry Haulos [Thu, 6 Apr 2017 22:17:25 +0000 (22:17 +0000)]
Merge "x11_egl: search for glesv1_cm, toggle DEQP_SUPPORT_GLES1 on if found" am: 89c3844ccb am: 17ff0445a7
am: 5fa0204a0a

Change-Id: I41392804c122b06db95263aca81aa64bc22eb0f3

7 years agoMerge "x11_egl: search for glesv1_cm, toggle DEQP_SUPPORT_GLES1 on if found" am:...
Pyry Haulos [Thu, 6 Apr 2017 22:11:48 +0000 (22:11 +0000)]
Merge "x11_egl: search for glesv1_cm, toggle DEQP_SUPPORT_GLES1 on if found" am: 89c3844ccb
am: 17ff0445a7

Change-Id: Ide162a44dc871ed6667348e3ab6fb19cddbfa1fa

7 years agoMerge "x11_egl: search for glesv1_cm, toggle DEQP_SUPPORT_GLES1 on if found"
Pyry Haulos [Thu, 6 Apr 2017 22:07:10 +0000 (22:07 +0000)]
Merge "x11_egl: search for glesv1_cm, toggle DEQP_SUPPORT_GLES1 on if found"
am: 89c3844ccb

Change-Id: I07f4c66c34d7f55dc3116fe65902f7a932f2a059

7 years agoMerge vulkan-cts-1.0.2 into aosp/master
Pyry Haulos [Thu, 6 Apr 2017 22:02:17 +0000 (15:02 -0700)]
Merge vulkan-cts-1.0.2 into aosp/master

Contains following fixes that have been made after vulkan-cts-1.0.2.2:

 * 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

This merge doesn't match any Vulkan CTS release tag.

Bug: 36899783
Bug: 36817508
Change-Id: I5dff02835e5296e1c25ba67675c06e2261e5c476

7 years agoMerge "x11_egl: search for glesv1_cm, toggle DEQP_SUPPORT_GLES1 on if found"
Pyry Haulos [Thu, 6 Apr 2017 22:00:39 +0000 (22:00 +0000)]
Merge "x11_egl: search for glesv1_cm, toggle DEQP_SUPPORT_GLES1 on if found"

7 years agoDo not re-init GL functions after context reset
Pyry Haulos [Thu, 6 Apr 2017 19:57:13 +0000 (19:57 +0000)]
Do not re-init GL functions after context reset
am: 48870ebe72

Change-Id: Iea6d880b20a2df8bbb6b495a1529e9205faf87d4

7 years agoMerge vk-gl-cts/vulkan-cts-1.0.1 into vk-gl-cts/vulkan-cts-1.0.2
Pyry Haulos [Thu, 6 Apr 2017 18:04:35 +0000 (11:04 -0700)]
Merge vk-gl-cts/vulkan-cts-1.0.1 into vk-gl-cts/vulkan-cts-1.0.2

Change-Id: Iaedfbb3579c55d33ebfc415197a67b8145725f4f

7 years agoFix - uniform buffer incorrectly dereferenced
Marcin Kańtoch [Tue, 4 Apr 2017 12:31:34 +0000 (14:31 +0200)]
Fix - uniform buffer incorrectly dereferenced

Uniform buffer is incorrectly dereferenced in
ssbo layout tests.

Affected tests: dEQP-VK.ssbo.layout.*

Change-Id: I5831ad75f558f8992bed6bdc48b1833d2ee13d26

7 years agoDo not re-init GL functions after context reset am: 72c880b4c9 am: a5c0bd16ed
Pyry Haulos [Thu, 6 Apr 2017 17:55:51 +0000 (17:55 +0000)]
Do not re-init GL functions after context reset am: 72c880b4c9 am: a5c0bd16ed
am: 8fd7fdf3df

Change-Id: I0d5ba172952237bf5d364e2a9da0212b0d783780

7 years agoDo not re-init GL functions after context reset
Pyry Haulos [Thu, 6 Apr 2017 16:03:37 +0000 (09:03 -0700)]
Do not re-init GL functions after context reset

SharedContextResetCase was calling initGLFunctions() using a context
belonging to a share group where context reset has occurred.
initGLFunctions() calls glGetError() internally and at that point it
would return GL_CONTEXT_LOST.

Affects:

dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.shared_context_status.vertex
dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.shared_context_status.fragment
dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.shared_context_status.vertex_and_fragment
dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.shared_context_status.compute

Bug: 37077017
Change-Id: I27ae0951565760dee0bcc5040bb02a45c8f568f3
(cherry picked from commit 72c880b4c940ca4435f87a4d1679a14678cea364)

7 years agoDo not re-init GL functions after context reset am: 72c880b4c9
Pyry Haulos [Thu, 6 Apr 2017 17:52:51 +0000 (17:52 +0000)]
Do not re-init GL functions after context reset am: 72c880b4c9
am: a5c0bd16ed

Change-Id: I323f8b67e1ace7c2811230d3591582fe9bfa7812

7 years agoUse vkGetInstanceProcAddr(NULL) to load platform funcs
Pyry Haulos [Wed, 5 Apr 2017 18:05:03 +0000 (11:05 -0700)]
Use vkGetInstanceProcAddr(NULL) to load platform funcs

Vulkan specification says that only vkGetInstanceProcAddr() has to be
loaded using platform-specific means. Other 'platform'-class functions,
listed below, can be loaded using vkGetInstanceProcAddr(NULL, pName).

Following functions are loaded with vkGetInstanceProcAddr():
 * vkEnumerateInstanceExtensionProperties
 * vkEnumerateInstanceLayerProperties
 * vkCreateInstance

Change-Id: Iab0657bf93d3a36e4f4dda4a1f1550024db0890e

7 years agoDo not re-init GL functions after context reset
Pyry Haulos [Thu, 6 Apr 2017 17:48:51 +0000 (17:48 +0000)]
Do not re-init GL functions after context reset
am: 72c880b4c9

Change-Id: Ia5c242d2bb897ff2a5424efd41b15127ef0683c0

7 years agoDo not re-init GL functions after context reset
Pyry Haulos [Thu, 6 Apr 2017 16:03:37 +0000 (09:03 -0700)]
Do not re-init GL functions after context reset

SharedContextResetCase was calling initGLFunctions() using a context
belonging to a share group where context reset has occurred.
initGLFunctions() calls glGetError() internally and at that point it
would return GL_CONTEXT_LOST.

Affects:

dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.shared_context_status.vertex
dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.shared_context_status.fragment
dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.shared_context_status.vertex_and_fragment
dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.shared_context_status.compute

Bug: 37077017
Change-Id: I27ae0951565760dee0bcc5040bb02a45c8f568f3

7 years agoFix shader bugs in OOB tests
Alexander Galazin [Wed, 5 Apr 2017 19:11:48 +0000 (19:11 +0000)]
Fix shader bugs in OOB tests
am: 609d108f89

Change-Id: I6eefd4a9fb92e18086c1574430633c46870a204b

7 years agoMerge vk-gl-cts/vulkan-cts-1.0.1 into vk-gl-cts/vulkan-cts-1.0.2
Pyry Haulos [Wed, 5 Apr 2017 18:34:23 +0000 (11:34 -0700)]
Merge vk-gl-cts/vulkan-cts-1.0.1 into vk-gl-cts/vulkan-cts-1.0.2

Change-Id: I2614d3a7ce451d47418e7c850a7c2c372f2189a9

7 years agoImgtec Waiver for texture_gather*cube*depth32f*
Alex Walters [Mon, 3 Apr 2017 10:46:36 +0000 (11:46 +0100)]
Imgtec Waiver for texture_gather*cube*depth32f*

Some versions of Imagination Technologies G6200, G6230, G6400, and
G6430 Rogue Series 6 GPU's are unable to correctly filter CEM corners
with F32 textures, this includes the ability to gather texels for texel
gather instructions.

This CL excludes the affected tests from mustpass.

Affects:

All dEQP-VK.glsl.texture_gather.basic.cube.depth32f* tests except:

dEQP-VK.glsl.texture_gather.basic.cube.depth32f.no_corners*

Components: Vulkan

VK-GL-CTS issue: 336

Change-Id: I4e20d887ad2901f78a7af326035d7a2a9ae5e76a

7 years agoFix shader bugs in OOB tests
Alexander Galazin [Wed, 5 Apr 2017 07:30:06 +0000 (09:30 +0200)]
Fix shader bugs in OOB tests

1. Check that the required number of vertex shader storage blocks is supported,
   throw NotSupported otherwise.
2. Use an array instead of a vector in local_array tests.
3. Try harder to defeat compiler optimizations on arrays, i.e. initialize it
   with different values.

Components: AOSP

Affects:
dEQP-EGL.functional.robustness.reset_context.shaders.out_of_bounds_non_robust.*.shader_storage_block.vertex*
dEQP-EGL.functional.robustness.reset_context.shaders.out_of_bounds_non_robust.*.local_array.*

Google bug: 36891454

Change-Id: I2aeb2d454295993126d4048759e5981421d5c0db
(cherry picked from commit cf65c56fb46b75e3c9819218165d9b97acf25c4a)

7 years agoFix shader bugs in OOB tests am: cf65c56fb4 am: baf5ae40a9
Alexander Galazin [Wed, 5 Apr 2017 16:15:08 +0000 (16:15 +0000)]
Fix shader bugs in OOB tests am: cf65c56fb4 am: baf5ae40a9
am: afc0b6a272

Change-Id: I30c0ba16f3d004ab73624632d97246f991bc637f

7 years agoFix shader bugs in OOB tests am: cf65c56fb4
Alexander Galazin [Wed, 5 Apr 2017 16:12:39 +0000 (16:12 +0000)]
Fix shader bugs in OOB tests am: cf65c56fb4
am: baf5ae40a9

Change-Id: Ifa47f0d5b8c2f1812464953a2686b473d074c97e

7 years agoFix shader bugs in OOB tests
Alexander Galazin [Wed, 5 Apr 2017 16:10:08 +0000 (16:10 +0000)]
Fix shader bugs in OOB tests
am: cf65c56fb4

Change-Id: Ica7e10c7cf362a452776ff3297a4df9d7ac4eef4

7 years agox11_egl: search for glesv1_cm, toggle DEQP_SUPPORT_GLES1 on if found
Tapani Pälli [Wed, 5 Apr 2017 06:39:17 +0000 (09:39 +0300)]
x11_egl: search for glesv1_cm, toggle DEQP_SUPPORT_GLES1 on if found

Some tests require GLES1 support and report test failure if support
has not been built. Patch changes build time configure to check GLES1
via pkg-config. If it is found, we turn on GLES1 support so that tests
will run and pass.

Change-Id: I586464c5fb7bffc40355caf57b30438f37ce1f6c
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
7 years agoFix shader bugs in OOB tests
Alexander Galazin [Wed, 5 Apr 2017 07:30:06 +0000 (09:30 +0200)]
Fix shader bugs in OOB tests

1. Check that the required number of vertex shader storage blocks is supported,
   throw NotSupported otherwise.
2. Use an array instead of a vector in local_array tests.
3. Try harder to defeat compiler optimizations on arrays, i.e. initialize it
   with different values.

Components: AOSP

Affects:
dEQP-EGL.functional.robustness.reset_context.shaders.out_of_bounds_non_robust.*.shader_storage_block.vertex*
dEQP-EGL.functional.robustness.reset_context.shaders.out_of_bounds_non_robust.*.local_array.*

Google bug: 36891454

Change-Id: I2aeb2d454295993126d4048759e5981421d5c0db

7 years agoAdd VK_KHR_incremental_present to the list of allowed device extensions
Iago Toral Quiroga [Tue, 4 Apr 2017 09:50:37 +0000 (11:50 +0200)]
Add VK_KHR_incremental_present to the list of allowed device extensions

Otherwise dEQP-VK.api.info.device.extensions will fail
for drivers that expose the extension.

Components: Vulkan
VK-GL-CTS issue: 346

Affects:
dEQP-VK.api.info.device.extensions

Change-Id: If1a5d971226adca2bfd1586cb1f568e2ca244b6d

7 years agoUse -std=c++03 with GCC and clang
Pyry Haulos [Thu, 30 Mar 2017 23:59:27 +0000 (16:59 -0700)]
Use -std=c++03 with GCC and clang

dEQP currently maintains minimum requirement of c++03 support from
toolchains. Use of c++11 or newer is not allowed

GCC 6.1 enables c++14 mode by default and developers might accidentally
use features from it unless we specify c++03 version.

Change-Id: If9ed0f009310b63b29b6a8a355969030b45139ba
Components: Framework

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

Change-Id: Iede7ed79a031ab38c0665d1a115e34d034d2b662

7 years agoImprove check_build_sanity.py
Pyry Haulos [Fri, 27 Jan 2017 00:36:18 +0000 (16:36 -0800)]
Improve check_build_sanity.py

 * All steps now respect --tmp-dir argument. This required adding
--build-dir and other args to mustpass scripts.

 * --recipe command line argument allows running only a specific build
check recipe.

 * --dump-recipes option allows printing out all recipes that are
supported in the current environment.

Components: Vulkan, Framework, AOSP

Change-Id: I6ba4f1369def14dc4ea6b398f367366549eecdc5
(cherry picked from commit 8849259035284f5506802f54f09f99f2b146e0b0)

7 years agoresolve merge conflicts of 433645782 to oc-dev-plus-aosp
Pyry Haulos [Mon, 3 Apr 2017 01:17:46 +0000 (18:17 -0700)]
resolve merge conflicts of 433645782 to oc-dev-plus-aosp

7 years agoRelax image verification in anisotropic filtering tests
Alexander Galazin [Wed, 29 Mar 2017 07:14:36 +0000 (09:14 +0200)]
Relax image verification in anisotropic filtering tests

Combining nearest texel selection with anisotropic filtering
is implementation dependent and may not be supported.
Do not expect differences between the rendered and the reference images
for such combination of parameters.

Affects:
dEQP-VK.texture.filtering_anisotropy.basic.anisotropy_2.mag_nearest_min_nearest
dEQP-VK.texture.filtering_anisotropy.basic.anisotropy_4.mag_nearest_min_nearest
dEQP-VK.texture.filtering_anisotropy.basic.anisotropy_8.mag_nearest_min_nearest
dEQP-VK.texture.filtering_anisotropy.basic.anisotropy_max.mag_nearest_min_nearest
dEQP-VK.texture.filtering_anisotropy.mipmap.anisotropy_2.mag_nearest_min_nearest_mipmap_nearest
dEQP-VK.texture.filtering_anisotropy.mipmap.anisotropy_2.mag_nearest_min_nearest_mipmap_linear
dEQP-VK.texture.filtering_anisotropy.mipmap.anisotropy_4.mag_nearest_min_nearest_mipmap_nearest
dEQP-VK.texture.filtering_anisotropy.mipmap.anisotropy_4.mag_nearest_min_nearest_mipmap_linear
dEQP-VK.texture.filtering_anisotropy.mipmap.anisotropy_8.mag_nearest_min_nearest_mipmap_nearest
dEQP-VK.texture.filtering_anisotropy.mipmap.anisotropy_8.mag_nearest_min_nearest_mipmap_linear
dEQP-VK.texture.filtering_anisotropy.mipmap.anisotropy_max.mag_nearest_min_nearest_mipmap_nearest
dEQP-VK.texture.filtering_anisotropy.mipmap.anisotropy_max.mag_nearest_min_nearest_mipmap_linear

Components: Vulkan

VL-GL-CTS issue: 267

Change-Id: I064c507aea0b8d72205f4399fcf4a91684536667

7 years agoUse new LOD approximation rules for OpenGL ES am: 0b6dbeb93e am: d05ba20fed
Pyry Haulos [Sun, 2 Apr 2017 23:29:00 +0000 (23:29 +0000)]
Use new LOD approximation rules for OpenGL ES am: 0b6dbeb93e am: d05ba20fed
am: 097f4d1511

Change-Id: Ic884f894c91edfbbd6f82f23da97ce811314b395

7 years agoRelax LOD computation bounds am: a9a793142c am: 1aae7665eb
Pyry Haulos [Sun, 2 Apr 2017 23:28:55 +0000 (23:28 +0000)]
Relax LOD computation bounds am: a9a793142c am: 1aae7665eb
am: 126f23f1f4

Change-Id: I0e217f7db726aae86b068345adeb29d2455fa760

7 years agoUse new LOD approximation rules for OpenGL ES am: 0b6dbeb93e
Pyry Haulos [Sun, 2 Apr 2017 23:25:28 +0000 (23:25 +0000)]
Use new LOD approximation rules for OpenGL ES am: 0b6dbeb93e
am: d05ba20fed

Change-Id: I0bf8d40403d169c45d99f2215837791ec4b63219

7 years agoRelax LOD computation bounds am: a9a793142c
Pyry Haulos [Sun, 2 Apr 2017 23:25:25 +0000 (23:25 +0000)]
Relax LOD computation bounds am: a9a793142c
am: 1aae7665eb

Change-Id: I014c58306e2f56b7c25614032b99e28f90d3723e

7 years agoUse new LOD approximation rules for OpenGL ES
Pyry Haulos [Sun, 2 Apr 2017 23:21:57 +0000 (23:21 +0000)]
Use new LOD approximation rules for OpenGL ES
am: 0b6dbeb93e

Change-Id: I6b21c0e848086e1d0d37f24a68728adf2858727c

7 years agoRelax LOD computation bounds
Pyry Haulos [Sun, 2 Apr 2017 23:21:54 +0000 (23:21 +0000)]
Relax LOD computation bounds
am: a9a793142c

Change-Id: I57b81a54c124694adde363aa5d27d92707ce58e2

7 years agoUse new LOD approximation rules for OpenGL ES
Pyry Haulos [Tue, 28 Mar 2017 20:17:39 +0000 (13:17 -0700)]
Use new LOD approximation rules for OpenGL ES

This change updates OpenGL ES texture LOD approximation bounds to match
Vulkan. Since rules are now same for both APIs the LodPrecision
parameter introduced in 9f0ff9f49ae3359d9b2e50f5d720fc77460d0f4f is
removed.

Affects:

dEQP-GLES2.texture.*
dEQP-GLES3.texture.*
dEQP-GLES31.texture.*

Khronos spec bug: 16179
Google bug: 28200359
Components: AOSP, Vulkan, Framework

Change-Id: I55ff2e6296c7947af7ee5b7cf915d24c260ae374
(cherry picked from commit 0b6dbeb93e83dcf3b55d2eccce7cb1517c2caee5)

7 years agoRelax LOD computation bounds
Pyry Haulos [Tue, 28 Mar 2017 20:10:53 +0000 (13:10 -0700)]
Relax LOD computation bounds

This change updates LOD approximation rules to match proposed spec
language in Vulkan texture filtering and mipmap tests.

This is partial cherry-pick of 9f0ff9f49ae3359d9b2e50f5d720fc77460d0f4f.
Mustpass changes are not included.

Affects: dEQP-VK.texture.*

Change-Id: Ic786bc733913a76d27f0cba31f3a61a10f8144fc
(cherry picked from commit a9a793142c75c8537b3a2229f1e3289278d19fd6)

7 years agoMerge Vulkan CTS 1.0.2.2 into goog/oc-dev
Pyry Haulos [Sat, 1 Apr 2017 03:46:38 +0000 (03:46 +0000)]
Merge Vulkan CTS 1.0.2.2 into goog/oc-dev
am: a44ba43f52

Change-Id: I50f88d0862528311afc082f45d09839c452dc480

7 years agoMerge Vulkan CTS 1.0.2.2 into aosp/master am: d4891aeb29 am: 9e51a9547a
Pyry Haulos [Sat, 1 Apr 2017 01:11:55 +0000 (01:11 +0000)]
Merge Vulkan CTS 1.0.2.2 into aosp/master am: d4891aeb29 am: 9e51a9547a
am: f6b03a3a50

Change-Id: I33768c0f45804de60b8c2a29c6deb106dbeeb974

7 years agoMerge Vulkan CTS 1.0.2.2 into aosp/master am: d4891aeb29
Pyry Haulos [Sat, 1 Apr 2017 01:08:57 +0000 (01:08 +0000)]
Merge Vulkan CTS 1.0.2.2 into aosp/master am: d4891aeb29
am: 9e51a9547a

Change-Id: Iff1addaa5a158087a6f076a84c816c63fcd9d7cc

7 years agoMerge Vulkan CTS 1.0.2.2 into aosp/master
Pyry Haulos [Sat, 1 Apr 2017 01:06:32 +0000 (01:06 +0000)]
Merge Vulkan CTS 1.0.2.2 into aosp/master
am: d4891aeb29

Change-Id: Id94d2f40cda6be6d83d7d5f4d920e9294f5b40c4

7 years agoMerge Vulkan CTS 1.0.2.2 into goog/oc-dev
Pyry Haulos [Fri, 31 Mar 2017 21:32:14 +0000 (14:32 -0700)]
Merge Vulkan CTS 1.0.2.2 into goog/oc-dev

Bug: 36780905

New tests:

 * Add tests for VK_KHR_incremental_present
 * Add tests for VK_GOOGLE_display_timing
 * Handle VK_EXT_swapchain_colorspace in swapchain tests

Fixes:

 * Imgtec Waiver for SNORM linear filtering
 * Check DynamicIndexing in pipeline.image count tests
 * Add missing barrier in synchronization tests
 * Fix invalid SPIR-V in dEQP-VK.sparse_resources
 * Add missing flushes for basic draws
 * Add missing flushes for indirect draws
 * Fix precision mismatch issues in dEQP-VK.glsl
 * Fix validation errors in dEQP-VK.tessellation
 * Fix precision mismatch in dEQP-VK.binding_model
 * Fix depth stencil aspect flag in render pass input tests
 * Fix image layout in dEQP-VK.image
 * Fix validation errors in dEQP-VK.geometry
 * Fix issues in pipeline.timestamp.transfer_tests
 * Refactor vktShaderExecutor
 * Improve precision handling in texture.explicit_lod
 * Fix a compilation error on GCC 5.4
 * Fix a compilation error on MSVC12
 * Fix bug in reallocation callback validation
 * Fix input attachment layout in renderpass tests

Change-Id: Ic6689e68194aeb0857a4223b523e2e893e7a2ddc

7 years agoUse new LOD approximation rules for OpenGL ES
Pyry Haulos [Tue, 28 Mar 2017 20:17:39 +0000 (13:17 -0700)]
Use new LOD approximation rules for OpenGL ES

This change updates OpenGL ES texture LOD approximation bounds to match
Vulkan. Since rules are now same for both APIs the LodPrecision
parameter introduced in 9f0ff9f49ae3359d9b2e50f5d720fc77460d0f4f is
removed.

Affects:

dEQP-GLES2.texture.*
dEQP-GLES3.texture.*
dEQP-GLES31.texture.*

Khronos spec bug: 16179
Google bug: 28200359
Components: AOSP, Vulkan, Framework

Change-Id: I55ff2e6296c7947af7ee5b7cf915d24c260ae374

7 years agoRelax LOD computation bounds
Pyry Haulos [Tue, 28 Mar 2017 20:10:53 +0000 (13:10 -0700)]
Relax LOD computation bounds

This change updates LOD approximation rules to match proposed spec
language in Vulkan texture filtering and mipmap tests.

This is partial cherry-pick of 9f0ff9f49ae3359d9b2e50f5d720fc77460d0f4f.
Mustpass changes are not included.

Affects: dEQP-VK.texture.*

Change-Id: Ic786bc733913a76d27f0cba31f3a61a10f8144fc

7 years agoMerge Vulkan CTS 1.0.2.2 into aosp/master
Pyry Haulos [Fri, 31 Mar 2017 21:12:43 +0000 (14:12 -0700)]
Merge Vulkan CTS 1.0.2.2 into aosp/master

Bug: 36780905

New tests:

 * Add tests for VK_KHR_incremental_present
 * Add tests for VK_GOOGLE_display_timing
 * Handle VK_EXT_swapchain_colorspace in swapchain tests

Fixes:

 * Imgtec Waiver for SNORM linear filtering
 * Check DynamicIndexing in pipeline.image count tests
 * Add missing barrier in synchronization tests
 * Fix invalid SPIR-V in dEQP-VK.sparse_resources
 * Add missing flushes for basic draws
 * Add missing flushes for indirect draws
 * Fix precision mismatch issues in dEQP-VK.glsl
 * Fix validation errors in dEQP-VK.tessellation
 * Fix precision mismatch in dEQP-VK.binding_model
 * Fix depth stencil aspect flag in render pass input tests
 * Fix image layout in dEQP-VK.image
 * Fix validation errors in dEQP-VK.geometry
 * Fix issues in pipeline.timestamp.transfer_tests
 * Refactor vktShaderExecutor
 * Improve precision handling in texture.explicit_lod
 * Fix a compilation error on GCC 5.4
 * Fix a compilation error on MSVC12
 * Fix bug in reallocation callback validation
 * Fix input attachment layout in renderpass tests

Change-Id: I76a768de047020d4624afa0aee2232e9e022f8d2

7 years agoCP: Update runtime hints for master and Nougat
Kalle Raita [Fri, 31 Mar 2017 19:56:57 +0000 (19:56 +0000)]
CP: Update runtime hints for master and Nougat
am: 37fdf46649

Change-Id: I87c4498564ffa3e5150e162d305401cdb5b5cb1d

7 years agoRespect maxColorAttachments in image tests
Steve Hill [Tue, 28 Mar 2017 12:40:59 +0000 (13:40 +0100)]
Respect maxColorAttachments in image tests

Tests in the image section were using up to 8 framebuffer
attachments.  The minumum required number is 4.

Affects:

dEQP-VK.pipeline.image.sampling_type.*.count_8.*

Components: Vulkan

VK-GL-CTS issue: 192

Change-Id: I21d957f17ec5ef7f9efc8d49f91c7a6d521da053

7 years agoMerge vk-gl-cts/vulkan-cts-1.0.1 into vk-gl-cts/vulkan-cts-1.0.2
Pyry Haulos [Fri, 31 Mar 2017 16:38:21 +0000 (09:38 -0700)]
Merge vk-gl-cts/vulkan-cts-1.0.1 into vk-gl-cts/vulkan-cts-1.0.2

7 years agoFix SPIR-V generation in dEQP-VK.spirv_assembly
Andrey Tuganov [Fri, 3 Mar 2017 21:52:58 +0000 (16:52 -0500)]
Fix SPIR-V generation in dEQP-VK.spirv_assembly

SPIR-V code generated in vktSpvAsmInstructionTests.cpp violates
non-aggregate type declaration uniqueness rule of SPIR-V
specification.

Fixed some of the tests which don't require exstensive changes.

Affects: dEQP-VK.spirv_assembly.instruction.*
Components: Vulkan

VK-GL-CTS issue: 195

Change-Id: Ib352323b08e10f83a0f5371dbf2bbb8b6d1182dd

7 years agoFix - depth/stencil images mandatory only for VK_IMAGE_TYPE_2D
Marcin Kańtoch [Tue, 28 Mar 2017 13:06:59 +0000 (15:06 +0200)]
Fix - depth/stencil images mandatory only for VK_IMAGE_TYPE_2D

Vulkan spec change https://gitlab.khronos.org/vulkan/vulkan/issues/719
made it mandatory to support depth/stencil formats only for
image type VK_IMAGE_TYPE_2D. For VK_IMAGE_TYPE_1D and VK_IMAGE_TYPE_3D
this support is optional.

Made changes to isRequiredImageParameterCombination()

Tests affected: dEQP-VK.api.info.image_format_properties.*

Change-Id: I9df990ced2e0a735078897324211c6b2a3923f2e

7 years agoAdd missing barrier in ssbo layout tests
Iago Toral Quiroga [Fri, 24 Mar 2017 11:51:08 +0000 (12:51 +0100)]
Add missing barrier in ssbo layout tests

The tests map storage buffers written by compute shaders
to verify results. Add a barrier before host access to
these buffers.

Components: Vulkan
VK-GL-CTS issue: 326

Affected tests:
dEQP-VK.ssbo.layout.*

Change-Id: I760969e6a572c0f79a6ff2b41721445016a8bba4

7 years agoCP: Update runtime hints for master and Nougat
Kalle Raita [Thu, 30 Mar 2017 18:15:44 +0000 (11:15 -0700)]
CP: Update runtime hints for master and Nougat

Original change:

2b1250ebaa646ec10989c132686e9ea3e19dd7a8
Update runtime hints used by the Android CTS to reflect measured times
for recent automated runs.

Test: run build_android_mustpass.py and diff check
Bug: 36776549
Change-Id: I77b0e95666ca6e220b2a618280fcece0b1c3a858

7 years agoMerge "Update runtime hints for master and Nougat" am: c29c5a7b35 am: d25e6dcca6
Kalle Raita [Thu, 30 Mar 2017 21:13:46 +0000 (21:13 +0000)]
Merge "Update runtime hints for master and Nougat" am: c29c5a7b35 am: d25e6dcca6
am: 9a3ee57a75

Change-Id: If3673b1525e74be33567803d08e91a711488b265

7 years agoRevert "Allow old behavior in image format property tests" am: 6d962c2a6f am: 8c75e4b367
Pyry Haulos [Thu, 30 Mar 2017 21:13:36 +0000 (21:13 +0000)]
Revert "Allow old behavior in image format property tests" am: 6d962c2a6f am: 8c75e4b367
am: 8ecb06a488

Change-Id: I14f51a2107678fa91d22d8d94e912d980458a2f2

7 years agoMerge "Update runtime hints for master and Nougat" am: c29c5a7b35
Kalle Raita [Thu, 30 Mar 2017 21:11:44 +0000 (21:11 +0000)]
Merge "Update runtime hints for master and Nougat" am: c29c5a7b35
am: d25e6dcca6

Change-Id: I9a6bcc958b174998199366e9e287d1fad43ab6a4

7 years agoRevert "Allow old behavior in image format property tests" am: 6d962c2a6f
Pyry Haulos [Thu, 30 Mar 2017 21:11:35 +0000 (21:11 +0000)]
Revert "Allow old behavior in image format property tests" am: 6d962c2a6f
am: 8c75e4b367

Change-Id: Ib97185e5e39c815f517f90ce4b84345ea72c5bb7

7 years agoMerge "Update runtime hints for master and Nougat"
Kalle Raita [Thu, 30 Mar 2017 21:09:15 +0000 (21:09 +0000)]
Merge "Update runtime hints for master and Nougat"
am: c29c5a7b35

Change-Id: I84161628d6b7ccc47fc2a12074a1f26f2814a3ff

7 years agoRevert "Allow old behavior in image format property tests"
Pyry Haulos [Thu, 30 Mar 2017 21:09:05 +0000 (21:09 +0000)]
Revert "Allow old behavior in image format property tests"
am: 6d962c2a6f

Change-Id: I41419ba8efe22223a4d16e79198e10e07dfad084

7 years agoMerge "Update runtime hints for master and Nougat"
Treehugger Robot [Thu, 30 Mar 2017 21:07:26 +0000 (21:07 +0000)]
Merge "Update runtime hints for master and Nougat"

7 years agoRevert "Allow old behavior in image format property tests"
Pyry Haulos [Thu, 30 Mar 2017 19:11:43 +0000 (12:11 -0700)]
Revert "Allow old behavior in image format property tests"

This reverts commit a25304112b0a3dba4082a1e7904b4f8149b2b9c8.

7 years agoUpdate runtime hints for master and Nougat
Kalle Raita [Thu, 30 Mar 2017 18:15:44 +0000 (11:15 -0700)]
Update runtime hints for master and Nougat

Update runtime hints used by the Android CTS to reflect measured times
for recent automated runs.

Test: run build_android_mustpass.py and diff check
Bug: 36776549
Change-Id: I77b0e95666ca6e220b2a618280fcece0b1c3a858

7 years agoFix tests in dEQP-EGL.functional.robustness* am: fd0b6eda1c am: d3ac80fae5
James Glanville [Fri, 24 Mar 2017 16:30:54 +0000 (16:30 +0000)]
Fix tests in dEQP-EGL.functional.robustness* am: fd0b6eda1c am: d3ac80fae5
am: 54c4090dfe

Change-Id: I5c6cc5d6e0d29abeea16fe131fcf18f4b26249e2

7 years agoFix GL entry point loading in robustness tests am: ee81fc2044 am: 7af7cc4764
Pyry Haulos [Fri, 24 Mar 2017 16:30:43 +0000 (16:30 +0000)]
Fix GL entry point loading in robustness tests am: ee81fc2044 am: 7af7cc4764
am: 5222daa01a

Change-Id: I5826a858cf5228e6c7422c25726eb5a051f9ce6a

7 years agoFix tests in dEQP-EGL.functional.robustness* am: fd0b6eda1c
James Glanville [Fri, 24 Mar 2017 16:28:53 +0000 (16:28 +0000)]
Fix tests in dEQP-EGL.functional.robustness* am: fd0b6eda1c
am: d3ac80fae5

Change-Id: Ifb88228b63525a96918381cf1e34e31fae0d4657

7 years agoFix GL entry point loading in robustness tests am: ee81fc2044
Pyry Haulos [Fri, 24 Mar 2017 16:28:43 +0000 (16:28 +0000)]
Fix GL entry point loading in robustness tests am: ee81fc2044
am: 7af7cc4764

Change-Id: Ided3a6da6bec65dffcd3f75c543206f62850adfa

7 years agoFix tests in dEQP-EGL.functional.robustness*
James Glanville [Fri, 24 Mar 2017 16:26:25 +0000 (16:26 +0000)]
Fix tests in dEQP-EGL.functional.robustness*
am: fd0b6eda1c

Change-Id: I433792d201c95baddda44d1937288a05faf5f69d

7 years agoFix GL entry point loading in robustness tests
Pyry Haulos [Fri, 24 Mar 2017 16:26:13 +0000 (16:26 +0000)]
Fix GL entry point loading in robustness tests
am: ee81fc2044

Change-Id: I28f7222d49ec629dd05984f58d034b178b52864d

7 years agoFix tests in dEQP-EGL.functional.robustness*
James Glanville [Wed, 22 Mar 2017 14:02:48 +0000 (14:02 +0000)]
Fix tests in dEQP-EGL.functional.robustness*

The shader storage buffer used for compute was not
correctly bound. This caused glDispatchCompute()
to return an error instead of submitting work, so
the context would never reset.

Affects:
dEQP-EGL.functional.robustness*compute
Components: AOSP
Google bug: 36565815

Change-Id: I4fb807b49ab806c7de968b54b8e5fd5abfd87fcd
(cherry picked from commit a7a065346ffe38a895c461b638f2c6377cbd7bcf)

7 years agoFix GL entry point loading in robustness tests
Pyry Haulos [Thu, 23 Mar 2017 21:00:44 +0000 (14:00 -0700)]
Fix GL entry point loading in robustness tests

Tests were not loading robustness-related entry points if implementation
supported only GL_EXT_robustness and thus had EXT-suffixed entry points.

Bug: 36564789
Bug: 34887315
Change-Id: I70e610dd3083e7c09050e24ef829c71f950d82a1

7 years agoAdd tests for VK_KHR_incremental_present
Mika Isojärvi [Mon, 14 Nov 2016 20:47:29 +0000 (12:47 -0800)]
Add tests for VK_KHR_incremental_present

VK-GL-CTS issue: 228

Change-Id: Ib295de6e449fce56b1f94f2e80a9de52faa56a11
(cherry picked from commit 5319ab26dd8586121adfcc98bcd9f907a5a21aac)

7 years agoHandle VK_EXT_swapchain_colorspace in swapchain tests
Pyry Haulos [Wed, 15 Mar 2017 17:24:15 +0000 (10:24 -0700)]
Handle VK_EXT_swapchain_colorspace in swapchain tests

VK_EXT_swapchain_colorspace adds new surface formats. Driver can enumerate
the formats regardless of whether VK_EXT_swapchain_colorspace was enabled,
but using them without enabling the extension is not allowed. Thus we have
two options:

1) Filter out non-core formats to stay within valid usage.

2) Enable VK_EXT_swapchain colorspace if advertised by the driver.

We opt for (2) as it provides basic coverage for the extension as a bonus.

Affects: dEQP-VK.wsi.*.swapchain.*
Components: Vulkan
VK-GL-CTS issue: 237

Change-Id: I5f905e5fb7ceaf83dacca57ef60d65487ff96d5d
(cherry picked from commit 703e4baead3c08331ee7604539d7a68a8b960c84)

7 years agoMerge vk-gl-cts/vulkan-cts-1.0.1 into vk-gl-cts/vulkan-cts-1.0.2
Pyry Haulos [Thu, 23 Mar 2017 16:47:05 +0000 (09:47 -0700)]
Merge vk-gl-cts/vulkan-cts-1.0.1 into vk-gl-cts/vulkan-cts-1.0.2

Change-Id: I73deeb16880948addabb1d8755ee00084aa346cf

7 years agoImgtec Waiver for SNORM linear filtering
Pyry Haulos [Thu, 16 Mar 2017 21:50:40 +0000 (14:50 -0700)]
Imgtec Waiver for SNORM linear filtering

Due to an error in bit replication of the fixed point SNORM values,
linear filtered negative SNORM values will differ slightly from ideal
precision in the last bit, moving the values towards 0.

This occurs on all members of the PowerVR Rogue family of GPUs

Affected tests are changed to allow for larger error and issue
QualityWarning when inaccurate results are found.

Affects:

dEQP-VK.pipeline.sampler.view_type*format*_snorm*_filter.linear

Components: Vulkan

VK-GL-CTS issue: 229

Change-Id: I59fa0f7acdcaa49fc84f17b22be1cc805da593a2

7 years agoMerge vk-gl-cts/vulkan-cts-1.0.1 into vk-gl-cts/vulkan-cts-1.0.2
Pyry Haulos [Thu, 23 Mar 2017 16:28:51 +0000 (09:28 -0700)]
Merge vk-gl-cts/vulkan-cts-1.0.1 into vk-gl-cts/vulkan-cts-1.0.2

Change-Id: I3c3914cc9fe22c4815b3261c9b0fbcf1e184316b

7 years agoCheck DynamicIndexing in pipeline.image count tests
Alex Walters [Thu, 23 Mar 2017 11:42:50 +0000 (11:42 +0000)]
Check DynamicIndexing in pipeline.image count tests

The pipeline.image.sampling_type*count_* tests where the count of images
is greater than 1 use an array of images/samplers which requires the use
of shaderSampledImageArrayDynamicIndexing, which the test does not
currently check for.

Adds a check and throws NotSupportedError if the feature is not present.

Affects:

dEQP-VK.pipeline.image.sampling_type*count_*

Components: Vulkan

VK-GL-CTS issue: 296

Change-Id: I7b4244bcf4371e41c2121812362db166dc1d4c16

7 years agoAdd missing barrier in synchronization tests
Iago Toral Quiroga [Tue, 21 Mar 2017 11:34:07 +0000 (12:34 +0100)]
Add missing barrier in synchronization tests

The *read_vertex_input* tests write to a storage
buffer in the vertex stage, which will later
be mapped by the host to read and verify the
results. Add a barrier before attemptig to read
the data from the host.

Components: Vulkan
Vk-GL-CTS issue: 266

Affected tests:
dEQP-VK.synchronization.op.single_queue.semaphore.*read_vertex_input*

Change-Id: Ibda3c54aaa0ba82bdb29422aadcf5df90101411d

7 years agoRemove retire event from eglGetFrameTimestamps am: 1c43c47725 am: be7f9f0a83
Brian Anderson [Mon, 20 Mar 2017 23:59:54 +0000 (23:59 +0000)]
Remove retire event from eglGetFrameTimestamps am: 1c43c47725 am: be7f9f0a83
am: 00f5a5956b

Change-Id: Ie6d59ba42b1eb1fdeb6d350f9e3b733bc5cff2b0

7 years agoRemove retire event from eglGetFrameTimestamps am: 1c43c47725
Brian Anderson [Mon, 20 Mar 2017 23:57:24 +0000 (23:57 +0000)]
Remove retire event from eglGetFrameTimestamps am: 1c43c47725
am: be7f9f0a83

Change-Id: I629d414069e950630fc50aba40802ffecf9f4c74

7 years agoRemove retire event from eglGetFrameTimestamps
Brian Anderson [Mon, 20 Mar 2017 23:53:54 +0000 (23:53 +0000)]
Remove retire event from eglGetFrameTimestamps
am: 1c43c47725

Change-Id: Ib41e15d994f2675815ed3d21b711ce817e46c9c8

7 years agoRemove retire event from eglGetFrameTimestamps
Brian Anderson [Fri, 17 Mar 2017 23:18:11 +0000 (16:18 -0700)]
Remove retire event from eglGetFrameTimestamps

This will be removed from the API and transparently
translated to the present event instead.

Test: --deqp-case=dEQP-EGL*get_frame_timestamps*

Change-Id: If33653efcaaca8a701008ccb0e6c9450e2c0e9dc

7 years agoMerge vk-gl-cts/vulkan-cts-1.0.1 into vk-gl-cts/vulkan-cts-1.0.2
Pyry Haulos [Mon, 20 Mar 2017 16:35:30 +0000 (09:35 -0700)]
Merge vk-gl-cts/vulkan-cts-1.0.1 into vk-gl-cts/vulkan-cts-1.0.2

Change-Id: I9f1ac0266e8b5f869e70ef3d8eaec9a7481fdef9

7 years agoFix invalid SPIR-V in dEQP-VK.sparse_resources
Andrey Tuganov [Thu, 2 Mar 2017 20:23:02 +0000 (15:23 -0500)]
Fix invalid SPIR-V in dEQP-VK.sparse_resources

Fixed issue:
SPIR-V code generated in
 - vktSparseResourcesShaderIntrinsicsStorage.cpp
 - vktSparseResourcesShaderIntrinsicsSampled.cpp
violates non-aggregate type declaration uniqueness rule of SPIR-V
specification.

Affects: dEQP-VK.sparse_resources.shader_intrinsics.*
Components: Vulkan

VK-GL-CTS issue: 230

Change-Id: Id39663a17684923f37924559917af524cf68f6c0

7 years agoFix warning introduced in 2c9e3ec9 am: 521361d83d am: 19bf995047 am: 80b99cc54a am...
Pyry Haulos [Fri, 17 Mar 2017 12:48:34 +0000 (12:48 +0000)]
Fix warning introduced in 2c9e3ec9 am: 521361d83d am: 19bf995047 am: 80b99cc54a am: b39a206388 am: 5006352564
am: 8aa6812b7c

Change-Id: I6328d884f5f11d2e4ebbb4b1d1dce10429ba920e

7 years agoFix warning introduced in 2c9e3ec9 am: 521361d83d am: 19bf995047 am: 80b99cc54a am...
Pyry Haulos [Fri, 17 Mar 2017 12:44:09 +0000 (12:44 +0000)]
Fix warning introduced in 2c9e3ec9 am: 521361d83d am: 19bf995047 am: 80b99cc54a am: b39a206388
am: 5006352564

Change-Id: I0afde27c779a151404e06f25045d3d757bdb74ae

7 years agoFix warning introduced in 2c9e3ec9 am: 521361d83d am: 19bf995047 am: c4c0f6d489 am...
Pyry Haulos [Fri, 17 Mar 2017 12:38:02 +0000 (12:38 +0000)]
Fix warning introduced in 2c9e3ec9 am: 521361d83d am: 19bf995047 am: c4c0f6d489 am: 31d2e24daf
am: e615f79c5a

Change-Id: Ibf686c314b69cadd674b568a60084fa1f2f8434d

7 years agoFix warning introduced in 2c9e3ec9 am: 521361d83d am: 19bf995047 am: 80b99cc54a
Pyry Haulos [Fri, 17 Mar 2017 12:37:35 +0000 (12:37 +0000)]
Fix warning introduced in 2c9e3ec9 am: 521361d83d am: 19bf995047 am: 80b99cc54a
am: b39a206388

Change-Id: I9090b68b50e4ea78de045ee0a303815970d0fb32

7 years agoFix warning introduced in 2c9e3ec9 am: 521361d83d am: 19bf995047 am: c4c0f6d489
Pyry Haulos [Fri, 17 Mar 2017 12:35:27 +0000 (12:35 +0000)]
Fix warning introduced in 2c9e3ec9 am: 521361d83d am: 19bf995047 am: c4c0f6d489
am: 31d2e24daf

Change-Id: I66142b7ed575f76a6e20400daead93df0a139291

7 years agoFix warning introduced in 2c9e3ec9 am: 521361d83d am: 19bf995047
Pyry Haulos [Fri, 17 Mar 2017 12:30:01 +0000 (12:30 +0000)]
Fix warning introduced in 2c9e3ec9 am: 521361d83d am: 19bf995047
am: 80b99cc54a

Change-Id: If15160bc9cb51778d6805b0ea33336dc8c660b99

7 years agoFix warning introduced in 2c9e3ec9 am: 521361d83d am: 5f34117776 am: eba2559865 am...
Pyry Haulos [Fri, 17 Mar 2017 12:28:03 +0000 (12:28 +0000)]
Fix warning introduced in 2c9e3ec9 am: 521361d83d am: 5f34117776 am: eba2559865 am: 99f3ab7c5a am: 91a3078a37 am: bcca961424
am: d3a3351f43

Change-Id: I7227ec5d36e2283f5bc16bb25d297aff6213713d

7 years agoFix warning introduced in 2c9e3ec9 am: 521361d83d am: 19bf995047
Pyry Haulos [Fri, 17 Mar 2017 12:26:54 +0000 (12:26 +0000)]
Fix warning introduced in 2c9e3ec9 am: 521361d83d am: 19bf995047
am: c4c0f6d489

Change-Id: I35d4537a215f067ca3d0a6547d867980cd312c7c

7 years agoFix warning introduced in 2c9e3ec9 am: 521361d83d am: 5f34117776 am: eba2559865 am...
Pyry Haulos [Fri, 17 Mar 2017 12:25:07 +0000 (12:25 +0000)]
Fix warning introduced in 2c9e3ec9 am: 521361d83d am: 5f34117776 am: eba2559865 am: 99f3ab7c5a am: 91a3078a37
am: bcca961424

Change-Id: I2199bbcf5752b74f2b8640db481c968962280ad5

7 years agoFix warning introduced in 2c9e3ec9 am: 521361d83d
Pyry Haulos [Fri, 17 Mar 2017 12:22:38 +0000 (12:22 +0000)]
Fix warning introduced in 2c9e3ec9 am: 521361d83d
am: 19bf995047

Change-Id: I092e8e8e119e4e004bb1451cb1fb999bf2e9a42d

7 years agoFix warning introduced in 2c9e3ec9 am: 521361d83d am: 5f34117776 am: eba2559865 am...
Pyry Haulos [Fri, 17 Mar 2017 12:21:04 +0000 (12:21 +0000)]
Fix warning introduced in 2c9e3ec9 am: 521361d83d am: 5f34117776 am: eba2559865 am: 99f3ab7c5a
am: 91a3078a37

Change-Id: Ifcb62bf0bad43f5bde5e1a693f886292a7ac2d42

7 years agoFix warning introduced in 2c9e3ec9 am: 521361d83d am: 5f34117776 am: eba2559865
Pyry Haulos [Fri, 17 Mar 2017 12:18:04 +0000 (12:18 +0000)]
Fix warning introduced in 2c9e3ec9 am: 521361d83d am: 5f34117776 am: eba2559865
am: 99f3ab7c5a

Change-Id: I94915828f9db6edce08b0ca860de8f7eeb6ffdd8

7 years agoFix warning introduced in 2c9e3ec9 am: 521361d83d am: 5f34117776
Pyry Haulos [Fri, 17 Mar 2017 12:14:33 +0000 (12:14 +0000)]
Fix warning introduced in 2c9e3ec9 am: 521361d83d am: 5f34117776
am: eba2559865

Change-Id: Ic1f2a2853173047311052607311518ea9b3b5264