Merge vulkan-cts-1.0 to vulkan-cts-1.0-dev

diff --cc external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp
index 0667e22,d799f42..35a5397
--- 1/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp
--- 2/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp
@@@ -988,16 -989,20 +989,20 @@@ tcu::TestStatus ImageSamplingInstance::
                const deUint32                          queueFamilyIndex                        = m_context.getUniversalQueueFamilyIndex();
                SimpleAllocator                         memAlloc                                        (vk, vkDevice, getPhysicalDeviceMemoryProperties(m_context.getInstanceInterface(), m_context.getPhysicalDevice()));
                MovePtr<tcu::TextureLevel>      result                                          = readColorAttachment(vk, vkDevice, queue, queueFamilyIndex, memAlloc, *m_colorImage, m_colorFormat, m_renderSize);
+               tcu::UVec4                                      threshold                                       = tcu::UVec4(4, 4, 4, 4);
+ 
+               if ((m_imageFormat == vk::VK_FORMAT_EAC_R11G11_SNORM_BLOCK) || (m_imageFormat == vk::VK_FORMAT_EAC_R11_SNORM_BLOCK))
+                       threshold = tcu::UVec4(8, 8, 8, 8);
  
                compareOk = tcu::intThresholdPositionDeviationCompare(m_context.getTestContext().getLog(),
 -                                                                    "IntImageCompare",
 -                                                                    "Image comparison",
 -                                                                    refRenderer->getAccess(),
 -                                                                    result->getAccess(),
 -                                                                    threshold,
 -                                                                    tcu::IVec3(1, 1, 0),
 -                                                                    true,
 -                                                                    tcu::COMPARE_LOG_RESULT);
 +                                                                                                                        "IntImageCompare",
 +                                                                                                                        "Image comparison",
 +                                                                                                                        refRenderer->getAccess(),
 +                                                                                                                        result->getAccess(),
-                                                                                                                         tcu::UVec4(4, 4, 4, 4),
++                                                                                                                        threshold,
 +                                                                                                                        tcu::IVec3(1, 1, 0),
 +                                                                                                                        true,
 +                                                                                                                        tcu::COMPARE_LOG_RESULT);
        }
  
        if (compareOk)

diff --cc external/vulkancts/mustpass/1.0.0/src/test-issues.txt
index a0a3563,7d1c445..00a155b
--- 1/external/vulkancts/mustpass/1.0.0/src/test-issues.txt
--- 2/external/vulkancts/mustpass/1.0.0/src/test-issues.txt
+++ b/external/vulkancts/mustpass/1.0.0/src/test-issues.txt
@@@ -19,3 -19,9 +19,6 @@@ dEQP-VK.glsl.builtin.function.common.fr
  dEQP-VK.glsl.builtin.function.common.frexp.vec2_highp_vertex
  dEQP-VK.glsl.builtin.function.common.frexp.vec3_highp_vertex
  dEQP-VK.glsl.builtin.function.common.frexp.vec4_highp_vertex
 -# Issue 274: Invalid round tests for fraction 0.5
 -dEQP-VK.glsl.operator.common_functions.round.*
 -
+ 
+ # Issue 340: Cube map corner texel selection
+ dEQP-VK.pipeline.sampler.view_type.cube.format.r5g6b5_unorm_pack16.mag_filter.linear

diff --cc external/vulkancts/mustpass/1.0.0/vk-default.txt
Simple merge