Vulkan: Allow gaps in vertex attributes by packing them.
Work around restrictions with setting null vertex buffers on command buffers
by binding ranges of non-null buffers.
Enable VertexAttributeTest on ES2/Vulkan
BUG=angleproject:2792
BUG=angleproject:2797
Change-Id: Ief9db1e60c8c9045a4101abe859302d529decbcb
Reviewed-on: https://chromium-review.googlesource.com/1194282
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
diff --git a/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp b/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
index e1bd3e9..355fa73 100644
--- a/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
+++ b/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
@@ -51,6 +51,46 @@
ANGLE_TRY(dynamicBuffer->flush(contextVk));
return angle::Result::Continue();
}
+
+void BindNonNullVertexBufferRanges(vk::CommandBuffer *commandBuffer,
+ const gl::AttributesMask &nonNullAttribMask,
+ uint32_t maxAttrib,
+ const gl::AttribArray<VkBuffer> &arrayBufferHandles,
+ const gl::AttribArray<VkDeviceSize> &arrayBufferOffsets)
+{
+ // Vulkan does not allow binding a null vertex buffer but the default state of null buffers is
+ // valid.
+
+ // We can detect if there are no gaps in active attributes by using the mask of the program
+ // attribs and the max enabled attrib.
+ ASSERT(maxAttrib > 0);
+ if (nonNullAttribMask.to_ulong() == (maxAttrib - 1))
+ {
+ commandBuffer->bindVertexBuffers(0, maxAttrib, arrayBufferHandles.data(),
+ arrayBufferOffsets.data());
+ return;
+ }
+
+ // Find ranges of non-null buffers and bind them all together.
+ for (uint32_t attribIdx = 0; attribIdx < maxAttrib; attribIdx++)
+ {
+ if (arrayBufferHandles[attribIdx] != VK_NULL_HANDLE)
+ {
+ // Find the end of this range of non-null handles
+ uint32_t rangeCount = 1;
+ while (attribIdx + rangeCount < maxAttrib &&
+ arrayBufferHandles[attribIdx + rangeCount] != VK_NULL_HANDLE)
+ {
+ rangeCount++;
+ }
+
+ commandBuffer->bindVertexBuffers(attribIdx, rangeCount, &arrayBufferHandles[attribIdx],
+ &arrayBufferOffsets[attribIdx]);
+ attribIdx += rangeCount;
+ }
+ }
+}
+
} // anonymous namespace
#define INIT \
@@ -541,6 +581,7 @@
ContextVk *contextVk = vk::GetImpl(context);
const gl::State &state = context->getGLState();
const gl::Program *programGL = state.getProgram();
+ const gl::AttributesMask &programAttribsMask = programGL->getActiveAttribLocationsMask();
const gl::AttributesMask &clientAttribs = context->getStateCache().getActiveClientAttribsMask();
uint32_t maxAttrib = programGL->getState().getMaxActiveAttribLocation();
@@ -583,15 +624,15 @@
&mCurrentArrayBufferOffsets[attribIndex]));
}
- commandBuffer->bindVertexBuffers(0, maxAttrib, mCurrentArrayBufferHandles.data(),
- mCurrentArrayBufferOffsets.data());
+ BindNonNullVertexBufferRanges(commandBuffer, programAttribsMask, maxAttrib,
+ mCurrentArrayBufferHandles, mCurrentArrayBufferOffsets);
}
else if (mVertexBuffersDirty || newCommandBuffer)
{
if (maxAttrib > 0)
{
- commandBuffer->bindVertexBuffers(0, maxAttrib, mCurrentArrayBufferHandles.data(),
- mCurrentArrayBufferOffsets.data());
+ BindNonNullVertexBufferRanges(commandBuffer, programAttribsMask, maxAttrib,
+ mCurrentArrayBufferHandles, mCurrentArrayBufferOffsets);
const gl::AttributesMask &bufferedAttribs =
context->getStateCache().getActiveBufferedAttribsMask();
diff --git a/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp b/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp
index cd25dfb..7e7432e 100644
--- a/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp
@@ -481,14 +481,11 @@
{
const auto attribIndex = static_cast<uint32_t>(attribIndexSizeT);
- VkVertexInputBindingDescription &bindingDesc = bindingDescs[attribIndex];
- VkVertexInputAttributeDescription &attribDesc = attributeDescs[attribIndex];
+ VkVertexInputBindingDescription &bindingDesc = bindingDescs[vertexAttribCount];
+ VkVertexInputAttributeDescription &attribDesc = attributeDescs[vertexAttribCount];
const PackedVertexInputBindingDesc &packedBinding = mVertexInputBindings[attribIndex];
const PackedVertexInputAttributeDesc &packedAttrib = mVertexInputAttribs[attribIndex];
- // TODO(jmadill): Support for gaps in vertex attribute specification.
- vertexAttribCount = attribIndex + 1;
-
bindingDesc.binding = attribIndex;
bindingDesc.inputRate = static_cast<VkVertexInputRate>(packedBinding.inputRate);
bindingDesc.stride = static_cast<uint32_t>(packedBinding.stride);
@@ -497,6 +494,8 @@
attribDesc.format = static_cast<VkFormat>(packedAttrib.format);
attribDesc.location = static_cast<uint32_t>(packedAttrib.location);
attribDesc.offset = packedAttrib.offset;
+
+ vertexAttribCount++;
}
// The binding descriptions are filled in at draw time.