Remove IndexRange retrieving in validation
This change can improve the performance of drawElements which uses
the path without translation.
Paste a set of mean data (repeated 30) for reference on Intel skylake
Win10 desktop.
DrawElementsPerfBenchmark.Run/d3d11:
before after
mean: 13644.4666667 -> mean: 13887.8333333
DrawElementsPerfBenchmark.Run/d3d11_index_buffer_changed:
before after
mean: 45.8 -> mean: 46.3666666667
BUG=755897, angleproject:1393
Change-Id: I11f5db25445346958dfef52b1d23df5483cda32f
Reviewed-on: https://chromium-review.googlesource.com/607413
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
diff --git a/src/libANGLE/renderer/d3d/VertexDataManager.cpp b/src/libANGLE/renderer/d3d/VertexDataManager.cpp
index f5c6cf0..578283b 100644
--- a/src/libANGLE/renderer/d3d/VertexDataManager.cpp
+++ b/src/libANGLE/renderer/d3d/VertexDataManager.cpp
@@ -410,7 +410,7 @@
for (auto attribIndex : dynamicAttribsMask)
{
const auto &dynamicAttrib = (*translatedAttribs)[attribIndex];
- ANGLE_TRY(reserveSpaceForAttrib(dynamicAttrib, count, instances));
+ ANGLE_TRY(reserveSpaceForAttrib(dynamicAttrib, start, count, instances));
}
// Store dynamic attributes
@@ -445,6 +445,7 @@
}
gl::Error VertexDataManager::reserveSpaceForAttrib(const TranslatedAttribute &translatedAttrib,
+ GLint start,
GLsizei count,
GLsizei instances) const
{
@@ -460,9 +461,21 @@
size_t totalCount = gl::ComputeVertexBindingElementCount(
binding.getDivisor(), static_cast<size_t>(count), static_cast<size_t>(instances));
- ASSERT(!bufferD3D ||
- ElementsInBuffer(attrib, binding, static_cast<unsigned int>(bufferD3D->getSize())) >=
- static_cast<int>(totalCount));
+ if (bufferD3D)
+ {
+ // Vertices do not apply the 'start' offset when the divisor is non-zero even when doing
+ // a non-instanced draw call
+ GLint firstVertexIndex = binding.getDivisor() > 0 ? 0 : start;
+ int64_t maxVertexCount =
+ static_cast<int64_t>(firstVertexIndex) + static_cast<int64_t>(totalCount);
+ int elementsInBuffer =
+ ElementsInBuffer(attrib, binding, static_cast<unsigned int>(bufferD3D->getSize()));
+
+ if (maxVertexCount > elementsInBuffer)
+ {
+ return gl::InvalidOperation() << "Vertex buffer is not big enough for the draw call.";
+ }
+ }
return mStreamingBuffer->reserveVertexSpace(attrib, binding, static_cast<GLsizei>(totalCount),
instances);