Only use single-mipped MS images when testing textureSamples()

This MR changes two aspects of the
dEQP-VK.glsl.texture_functions.query.texturesamples tests:

 * Only MS images are now bound to sampled image bindings.
 * As per recent spec clarification, MS images should always be
single-mipped.

Fixes #432

diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp
index 8f428cc..371698a 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp
+++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp
@@ -1734,7 +1734,7 @@ void ShaderRenderCaseInstance::useSampler (deUint32 bindingLocation, deUint32 te
 
                texFormat                                                                       = texture.getFormat();
                texSize                                                                         = tcu::UVec3(texture.getWidth(), texture.getHeight(), 1u);
-               mipLevels                                                                       = (deUint32)texture.getNumLevels();
+               mipLevels                                                                       = isMSTexture ? 1u : (deUint32)texture.getNumLevels();
                arrayLayers                                                                     = 1u;
 
                textureData.resize(mipLevels);
@@ -1753,7 +1753,7 @@ void ShaderRenderCaseInstance::useSampler (deUint32 bindingLocation, deUint32 te
 
                texFormat                                                                       = texture.getFormat();
                texSize                                                                         = tcu::UVec3(texture.getSize(), texture.getSize(), 1u);
-               mipLevels                                                                       = (deUint32)texture.getNumLevels();
+               mipLevels                                                                       = isMSTexture ? 1u : (deUint32)texture.getNumLevels();
                arrayLayers                                                                     = 6u;
 
                static const tcu::CubeFace              cubeFaceMapping[tcu::CUBEFACE_LAST] =
@@ -1787,7 +1787,7 @@ void ShaderRenderCaseInstance::useSampler (deUint32 bindingLocation, deUint32 te
 
                texFormat                                                                       = texture.getFormat();
                texSize                                                                         = tcu::UVec3(texture.getWidth(), texture.getHeight(), 1u);
-               mipLevels                                                                       = (deUint32)texture.getNumLevels();
+               mipLevels                                                                       = isMSTexture ? 1u : (deUint32)texture.getNumLevels();
                arrayLayers                                                                     = (deUint32)texture.getNumLayers();
 
                textureData.resize(mipLevels);
@@ -1814,7 +1814,7 @@ void ShaderRenderCaseInstance::useSampler (deUint32 bindingLocation, deUint32 te
 
                texFormat                                                                       = texture.getFormat();
                texSize                                                                         = tcu::UVec3(texture.getWidth(), texture.getHeight(), texture.getDepth());
-               mipLevels                                                                       = (deUint32)texture.getNumLevels();
+               mipLevels                                                                       = isMSTexture ? 1u : (deUint32)texture.getNumLevels();
                arrayLayers                                                                     = 1u;
 
                textureData.resize(mipLevels);

diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderTextureFunctionTests.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderTextureFunctionTests.cpp
index a0e24b3..f696690 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderTextureFunctionTests.cpp
+++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderTextureFunctionTests.cpp
@@ -1703,7 +1703,6 @@ TextureSamplesInstance::TextureSamplesInstance (Context&                          context,
 
                static const vk::VkSampleCountFlagBits  sampleFlags[]   =
                {
-                       vk::VK_SAMPLE_COUNT_1_BIT,
                        vk::VK_SAMPLE_COUNT_2_BIT,
                        vk::VK_SAMPLE_COUNT_4_BIT,
                        vk::VK_SAMPLE_COUNT_8_BIT,