Merge branch 'issue_81' into 'master'

issue 81: Change descriptor type from UBO -> uniform texel buffer, since UBOs do…

…n't use views. Change fragment shader to match. Change buffer contents to a vector of uint32 to match the R32_UINT view format. Update reference value selection to match. Remove 'offset' which was just added into elementOffset, and just cause alignment problems.

WIP to allow time for review.

See #81 and #57.

See merge request !141

diff --combined external/vulkancts/modules/vulkan/api/vktApiBufferViewAccessTests.cpp
index 7bff391,a2ad0c3..b12a0e2
--- 1/external/vulkancts/modules/vulkan/api/vktApiBufferViewAccessTests.cpp
--- 2/external/vulkancts/modules/vulkan/api/vktApiBufferViewAccessTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiBufferViewAccessTests.cpp
@@@ -66,7 -66,6 +66,6 @@@ struct BufferViewCaseParam
        deUint32        bufferSize;
        deUint32        bufferViewSize;
        deUint32        elementOffset;
-       deUint32        offset;
  };
  
  class BufferViewTestInstance : public vkt::TestInstance
@@@ -122,10 -121,10 +121,10 @@@ private
        Move<VkFence>                                           m_fence;
  };
  
- static void generateBuffer (std::vector<tcu::IVec4>& uniformData, deUint32 bufferSize, deInt8 factor = 1)
+ static void generateBuffer (std::vector<deUint32>& uniformData, deUint32 bufferSize, deInt8 factor = 1)
  {
        for (deUint32 i = 0; i < bufferSize; ++i)
-               uniformData.push_back(tcu::IVec4(factor * i, factor * (i + 1), factor * (i + 2), factor * (i + 3)));
+               uniformData.push_back(factor * i);
  }
  
  void BufferViewTestInstance::createQuad (void)
@@@ -308,7 -307,7 +307,7 @@@ BufferViewTestInstance::BufferViewTestI
                {
                        {
                                0u,                                                                                     // deUint32                             binding;
-                               VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,                      // VkDescriptorType             descriptorType;
+                               VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER,        // VkDescriptorType             descriptorType;
                                1u,                                                                                     // deUint32                             arraySize;
                                VK_SHADER_STAGE_ALL,                                            // VkShaderStageFlags   stageFlags;
                                DE_NULL                                                                         // const VkSampler*             pImmutableSamplers;
@@@ -327,10 -326,10 +326,10 @@@
                m_descriptorSetLayout = createDescriptorSetLayout(vk, vkDevice, &descriptorLayoutParams);
  
                // Generate buffer
-               std::vector<tcu::IVec4> uniformData;
+               std::vector<deUint32> uniformData;
                generateBuffer(uniformData, testCase.bufferSize);
  
-               const VkDeviceSize uniformSize = testCase.bufferSize * sizeof(tcu::Vec4);
+               const VkDeviceSize uniformSize = testCase.bufferSize * sizeof(deUint32);
                const VkBufferCreateInfo uniformBufferParams =
                {
                        VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,           // VkStructureType              sType;
@@@ -347,7 -346,7 +346,7 @@@
                m_uniformBufferAlloc    = memAlloc.allocate(getBufferMemoryRequirements(vk, vkDevice, *m_uniformBuffer), MemoryRequirement::HostVisible);
  
                VK_CHECK(vk.bindBufferMemory(vkDevice, *m_uniformBuffer, m_uniformBufferAlloc->getMemory(), 0));
 -              deMemcpy(m_uniformBufferAlloc->getHostPtr(), uniformData.data(), uniformSize);
 +              deMemcpy(m_uniformBufferAlloc->getHostPtr(), uniformData.data(), (size_t)uniformSize);
  
                const VkBufferViewCreateInfo viewInfo =
                {
@@@ -356,8 -355,8 +355,8 @@@
                        (VkBufferViewCreateFlags)0,
                        *m_uniformBuffer,                                                                                                       // VkBuffer                     buffer;
                        m_colorFormat,                                                                                                          // VkFormat                     format;
-                       m_testCase.elementOffset * sizeof(tcu::IVec4) + m_testCase.offset,      // VkDeviceSize         offset;
-                       m_testCase.bufferViewSize * sizeof(tcu::IVec4)                                          // VkDeviceSize         range;
+                       m_testCase.elementOffset * sizeof(deUint32),                                            // VkDeviceSize         offset;
+                       m_testCase.bufferViewSize * sizeof(deUint32)                                            // VkDeviceSize         range;
                };
  
                m_uniformBufferView = createBufferView(vk, vkDevice, &viewInfo);
@@@ -365,7 -364,7 +364,7 @@@
                const VkDescriptorPoolSize descriptorTypes[1] =
                {
                        {
-                               VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,                              // VkDescriptorType             type;
+                               VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER,                // VkDescriptorType             type;
                                1                                                                                               // deUint32                             count;
                        }
                };
@@@ -621,7 -620,7 +620,7 @@@
                VK_CHECK(vk.bindBufferMemory(vkDevice, *m_vertexBuffer, m_vertexBufferAlloc->getMemory(), m_vertexBufferAlloc->getOffset()));
  
                // Load vertices into vertex buffer
 -              deMemcpy(m_vertexBufferAlloc->getHostPtr(), m_vertices.data(), vertexDataSize);
 +              deMemcpy(m_vertexBufferAlloc->getHostPtr(), m_vertices.data(), (size_t)vertexDataSize);
                flushMappedMemoryRange(vk, vkDevice, m_vertexBufferAlloc->getMemory(), m_vertexBufferAlloc->getOffset(), vertexDataSize);
        }
  
@@@ -773,7 -772,7 +772,7 @@@ tcu::TestStatus BufferViewTestInstance:
        for (deInt32 i = 0; i < (deInt32) m_renderSize.x(); ++i)
        {
                tcu::IVec4 pixel        = pixelBuffer.getPixelInt(i, i);
-               deInt32 expected        = factor * (m_testCase.elementOffset + i + (m_testCase.offset / 4) % 4);
+               deInt32 expected        = factor * (m_testCase.elementOffset + i);
                deInt32 actual          = pixel[0];
                if (expected != actual)
                {
@@@ -814,12 -813,12 +813,12 @@@ tcu::TestStatus BufferViewTestInstance:
        }
  
        // Generate and bind another buffer
-       std::vector<tcu::IVec4>         uniformData;
-       const VkDeviceSize                      uniformSize     = m_testCase.bufferSize * sizeof(tcu::Vec4);
+       std::vector<deUint32>           uniformData;
+       const VkDeviceSize                      uniformSize = m_testCase.bufferSize * sizeof(deUint32);
        const deInt8                            factor          = 2;
  
        generateBuffer(uniformData, m_testCase.bufferSize, factor);
 -      deMemcpy(m_uniformBufferAlloc->getHostPtr(), uniformData.data(), uniformSize);
 +      deMemcpy(m_uniformBufferAlloc->getHostPtr(), uniformData.data(), (size_t)uniformSize);
  
        VK_CHECK(vk.resetFences(vkDevice, 1, &m_fence.get()));
        VK_CHECK(vk.queueSubmit(queue, 1, &submitInfo, *m_fence));
@@@ -863,13 -862,12 +862,12 @@@ void BufferViewTestCase::initPrograms (
  
        programCollection.glslSources.add("frag") << glu::FragmentSource(
                "#version 310 es\n"
-               "layout (set=0, binding=0) uniform u_buffer {\n"
-               "       highp uint item[" + de::toString(m_bufferViewTestInfo.bufferViewSize) + "];\n"
-               "};\n"
+               "#extension GL_EXT_texture_buffer : enable\n"
+               "layout (set=0, binding=0) uniform highp usamplerBuffer u_buffer;\n"
                "layout (location = 0) out highp uint o_color;\n"
                "void main()\n"
                "{\n"
-               "       o_color = item[int(gl_FragCoord.x)];\n"
+               "       o_color = texelFetch(u_buffer, int(gl_FragCoord.x)).x;\n"
                "}\n");
  }
  
@@@ -885,10 -883,9 +883,9 @@@ tcu::TestCaseGroup* createBufferViewAcc
                        512,    // deUint32     bufferSize
                        512,    // deUint32     bufferViewSize
                        0,              // deUint32     elementOffset
-                       0,              // deUint32 offset
                };
                std::ostringstream description;
-               description << "bufferSize: " << info.bufferSize << " bufferViewSize: " << " bufferView element offset: " << info.elementOffset << " offset: " << info.offset;
+               description << "bufferSize: " << info.bufferSize << " bufferViewSize: " << info.bufferViewSize << " bufferView element offset: " << info.elementOffset;
                bufferViewTests->addChild(new BufferViewTestCase(testCtx, "buffer_view_memory_test_complete", description.str(), info));
        }
  
@@@ -898,10 -895,9 +895,9 @@@
                        4096,   // deUint32     bufferSize
                        512,    // deUint32     bufferViewSize
                        0,              // deUint32     elementOffset
-                       0,              // deUint32 offset
                };
                std::ostringstream description;
-               description << "bufferSize: " << info.bufferSize << " bufferViewSize: " << " bufferView element offset: " << info.elementOffset << " offset: " << info.offset;
+               description << "bufferSize: " << info.bufferSize << " bufferViewSize: " << info.bufferViewSize << " bufferView element offset: " << info.elementOffset;
                bufferViewTests->addChild(new BufferViewTestCase(testCtx, "buffer_view_memory_test_partial_offset0", description.str(), info));
        }
  
@@@ -911,26 -907,12 +907,12 @@@
                        4096,   // deUint32     bufferSize
                        512,    // deUint32     bufferViewSize
                        128,    // deUint32     elementOffset
-                       0,              // deUint32 offset
                };
                std::ostringstream description;
-               description << "bufferSize: " << info.bufferSize << " bufferViewSize: " << " bufferView element offset: " << info.elementOffset << " offset: " << info.offset;
+               description << "bufferSize: " << info.bufferSize << " bufferViewSize: " << info.bufferViewSize << " bufferView element offset: " << info.elementOffset;
                bufferViewTests->addChild(new BufferViewTestCase(testCtx, "buffer_view_memory_test_partial_offset1", description.str(), info));
        }
  
-       {
-               BufferViewCaseParams info =
-               {
-                       4096,   // deUint32     bufferSize
-                       512,    // deUint32     bufferViewSize
-                       128,    // deUint32     elementOffset
-                       4,              // deUint32 offset
-               };
-               std::ostringstream description;
-               description << "bufferSize: " << info.bufferSize << " bufferViewSize: " << " bufferView element offset: " << info.elementOffset << " offset: " << info.offset;
-               bufferViewTests->addChild(new BufferViewTestCase(testCtx, "buffer_view_memory_test_partial_offset2", description.str(), info));
-       }
- 
        return bufferViewTests.release();
  }