dEQP-VK.pipeline.vertex_input.* fixes:

- Check if 64-bit float types are supported.
- Use correct alignment of vertex attributes.

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexInputTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexInputTests.cpp
index 6af31c8a2476e2b41b66a805f0f4efcd886c8e3a..67cc4d3dde13d04970bea0a8bc410d80065a70df 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexInputTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexInputTests.cpp
@@ -67,11 +67,14 @@ using namespace vk;
 namespace
 {
 
-bool isSupportedVertexFormat (const InstanceInterface& instanceInterface, VkPhysicalDevice device, VkFormat format)
+bool isSupportedVertexFormat (Context& context, VkFormat format)
 {
+       if (isVertexFormatDouble(format) && !context.getDeviceFeatures().shaderFloat64)
+               return false;
+
        VkFormatProperties  formatProps;
        deMemset(&formatProps, 0, sizeof(VkFormatProperties));
-       instanceInterface.getPhysicalDeviceFormatProperties(device, format, &formatProps);
+       context.getInstanceInterface().getPhysicalDeviceFormatProperties(context.getPhysicalDevice(), format, &formatProps);
 
        return (formatProps.bufferFeatures & VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT) != 0u;
 }
@@ -90,6 +93,14 @@ float getRepresentableDifferenceSnorm (VkFormat format)
        return 1.0f / float((1 << (getVertexFormatComponentSize(format) * 8 - 1)) - 1);
 }
 
+deUint32 getNextMultipleOffset (deUint32 divisor, deUint32 value)
+{
+       if (value % divisor == 0)
+               return 0;
+       else
+               return divisor - (value % divisor);
+}
+
 class VertexInputTest : public vkt::TestCase
 {
 public:
@@ -174,6 +185,7 @@ private:
 
        const std::vector<AttributeInfo>                m_attributeInfos;
        const BindingMapping                                    m_bindingMapping;
+       bool                                                                    m_usesDoubleType;
 };
 
 class GlslTypeCombinationsIterator : public CombinationsIterator< std::vector<VertexInputTest::GlslType> >
@@ -282,6 +294,16 @@ VertexInputTest::VertexInputTest (tcu::TestContext&                                                testContext,
        , m_attributeInfos              (attributeInfos)
        , m_bindingMapping              (bindingMapping)
 {
+       m_usesDoubleType = false;
+
+       for (size_t attributeNdx = 0; attributeNdx < m_attributeInfos.size(); attributeNdx++)
+       {
+               if (s_glslTypeDescriptions[m_attributeInfos[attributeNdx].glslType].basicType == GLSL_BASIC_TYPE_DOUBLE)
+               {
+                       m_usesDoubleType = true;
+                       break;
+               }
+       }
 }
 
 TestInstance* VertexInputTest::createInstance (Context& context) const
@@ -310,7 +332,7 @@ TestInstance* VertexInputTest::createInstance (Context& context) const
        // Create attribute descriptions, assign them to bindings and update .strideInBytes
        std::vector<VertexInputInstance::VertexInputAttributeDescription>       attributeDescriptions;
        deUint32                                                                                                                        attributeLocation               = 0;
-       std::vector<deUint32>                                                                                           attributeOffsets                        (bindingDescriptions.size(), 0);
+       std::vector<deUint32>                                                                                           attributeOffsets                (bindingDescriptions.size(), 0);
 
        for (size_t attributeNdx = 0; attributeNdx < m_attributeInfos.size(); attributeNdx++)
        {
@@ -344,6 +366,11 @@ TestInstance* VertexInputTest::createInstance (Context& context) const
 
                for (int descNdx = 0; descNdx < glslTypeDescription.vertexInputCount; descNdx++)
                {
+                       const deUint32  offsetToComponentAlignment      = getNextMultipleOffset(getVertexFormatComponentSize(attributeInfo.vkType),
+                                                                                                                                                               (deUint32)bindingOffsets[attributeBinding] + attributeOffsets[attributeBinding]);
+
+                       attributeOffsets[attributeBinding] += offsetToComponentAlignment;
+
                        const VertexInputInstance::VertexInputAttributeDescription attributeDescription =
                        {
                                attributeInfo.glslType,                                                 // GlslType     glslType;
@@ -356,8 +383,8 @@ TestInstance* VertexInputTest::createInstance (Context& context) const
                                },
                        };
 
-                       bindingDescriptions[attributeBinding].stride += inputSize;
-                       attributeOffsets[attributeBinding] += inputSize;
+                       bindingDescriptions[attributeBinding].stride    += offsetToComponentAlignment + inputSize;
+                       attributeOffsets[attributeBinding]                              += inputSize;
 
                        //double formats with more than 2 components will take 2 locations
                        const GlslType type = attributeInfo.glslType;
@@ -385,9 +412,13 @@ void VertexInputTest::initPrograms (SourceCollections& programCollection) const
                          << "layout(location = 0) out highp vec4 vtxColor;\n"
                          << "out gl_PerVertex {\n"
                          << "  vec4 gl_Position;\n"
-                         << "};\n"
-                         << "double abs (double x) { if (x < 0.0LF) return -x; else return x; }\n" // NOTE: Currently undefined in glslang ??
-                         << "void main (void)\n"
+                         << "};\n";
+
+       // NOTE: double abs(double x) undefined in glslang ??
+       if (m_usesDoubleType)
+               vertexSrc << "double abs (double x) { if (x < 0.0LF) return -x; else return x; }\n";
+
+       vertexSrc << "void main (void)\n"
                          << "{\n"
                          << getGlslVertexCheck()
                          << "}\n";
@@ -785,7 +816,7 @@ VertexInputInstance::VertexInputInstance (Context&                                                                                          context,
                {
                        const VkVertexInputAttributeDescription& attributeDescription = attributeDescriptions[attributeNdx].vkDescription;
 
-                       if (!isSupportedVertexFormat(context.getInstanceInterface(), context.getPhysicalDevice(), attributeDescription.format))
+                       if (!isSupportedVertexFormat(context, attributeDescription.format))
                                throw tcu::NotSupportedError(std::string("Unsupported format for vertex input: ") + getFormatName(attributeDescription.format));
 
                        vkAttributeDescriptions.push_back(attributeDescription);
@@ -1103,7 +1134,6 @@ void VertexInputInstance::writeVertexInputData(deUint8* destPtr, const VkVertexI
        deUint8* destOffsetPtr = ((deUint8 *)destPtr) + bindingOffset;
        for (deUint32 vertexNdx = 0; vertexNdx < vertexCount; vertexNdx++)
        {
-               deUint32 vertexInputOffset = 0;
                for (size_t attributeNdx = 0; attributeNdx < attributes.size(); attributeNdx++)
                {
                        const VertexInputAttributeDescription& attribDesc = attributes[attributeNdx];
@@ -1111,11 +1141,9 @@ void VertexInputInstance::writeVertexInputData(deUint8* destPtr, const VkVertexI
                        // Only write vertex input data to bindings referenced by attribute descriptions
                        if (attribDesc.vkDescription.binding == bindingDescription.binding)
                        {
-                               writeVertexInputValue(destOffsetPtr + vertexInputOffset, attribDesc, vertexNdx);
-                               vertexInputOffset += getVertexFormatSize(attribDesc.vkDescription.format);
+                               writeVertexInputValue(destOffsetPtr + attribDesc.vkDescription.offset, attribDesc, vertexNdx);
                        }
                }
-               DE_ASSERT(vertexInputOffset <= bindingDescription.stride);
                destOffsetPtr += bindingDescription.stride;
        }
 }

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexUtil.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexUtil.cpp
index 4cdf3c7094bc1188f13e6ded7d6ddb496c2f9e7b..13b9fd4a2a5157032eb3bae3555fa0de33d44318 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexUtil.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexUtil.cpp
@@ -670,6 +670,30 @@ bool isVertexFormatUscaled (VkFormat format)
 
 }
 
+bool isVertexFormatDouble (VkFormat format)
+{
+       switch (format)
+       {
+               case VK_FORMAT_R64_UINT:
+               case VK_FORMAT_R64_SINT:
+               case VK_FORMAT_R64_SFLOAT:
+               case VK_FORMAT_R64G64_UINT:
+               case VK_FORMAT_R64G64_SINT:
+               case VK_FORMAT_R64G64_SFLOAT:
+               case VK_FORMAT_R64G64B64_UINT:
+               case VK_FORMAT_R64G64B64_SINT:
+               case VK_FORMAT_R64G64B64_SFLOAT:
+               case VK_FORMAT_R64G64B64A64_UINT:
+               case VK_FORMAT_R64G64B64A64_SINT:
+               case VK_FORMAT_R64G64B64A64_SFLOAT:
+                       return true;
+
+               default:
+                       break;
+       }
+       return false;
+}
+
 std::vector<Vertex4RGBA> createOverlappingQuads (void)
 {
        using tcu::Vec2;

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexUtil.hpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexUtil.hpp
index 4e76f48d5dd188a75aa51a71543e7c5fc921dc87..c00e9fe74b8304db439cd0c7ce8b72c8a1ea17d7 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexUtil.hpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexUtil.hpp
@@ -71,6 +71,7 @@ bool                                          isVertexFormatSnorm                             (vk::VkFormat format);
 bool                                           isVertexFormatSRGB                              (vk::VkFormat format);
 bool                                           isVertexFormatSscaled                   (vk::VkFormat format);
 bool                                           isVertexFormatUscaled                   (vk::VkFormat format);
+bool                                           isVertexFormatDouble                    (vk::VkFormat format);
 
 /*! \brief Creates a pattern of 4 overlapping quads.
  *