summaryrefslogtreecommitdiff
path: root/chromium/third_party/angle/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/angle/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp')
-rw-r--r--chromium/third_party/angle/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp27
1 files changed, 13 insertions, 14 deletions
diff --git a/chromium/third_party/angle/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp b/chromium/third_party/angle/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
index 7aa54d33c73..2eec0a3b50a 100644
--- a/chromium/third_party/angle/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
+++ b/chromium/third_party/angle/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
@@ -121,14 +121,13 @@ VertexArrayVk::VertexArrayVk(ContextVk *contextVk, const gl::VertexArrayState &s
mLineLoopHelper(contextVk->getRenderer()),
mDirtyLineLoopTranslation(true)
{
- RendererVk *renderer = contextVk->getRenderer();
-
- vk::BufferHelper &nullBuffer = renderer->getNullBuffer();
+ RendererVk *renderer = contextVk->getRenderer();
+ vk::BufferHelper &emptyBuffer = contextVk->getEmptyBuffer();
- mCurrentArrayBufferHandles.fill(nullBuffer.getBuffer().getHandle());
+ mCurrentArrayBufferHandles.fill(emptyBuffer.getBuffer().getHandle());
mCurrentArrayBufferOffsets.fill(0);
mCurrentArrayBufferRelativeOffsets.fill(0);
- mCurrentArrayBuffers.fill(&nullBuffer);
+ mCurrentArrayBuffers.fill(&emptyBuffer);
mDynamicVertexData.init(renderer, vk::kVertexBufferUsageFlags, vk::kVertexBufferAlignment,
kDynamicVertexDataSize, true);
@@ -619,10 +618,10 @@ angle::Result VertexArrayVk::syncDirtyAttrib(ContextVk *contextVk,
{
if (bufferVk->getSize() == 0)
{
- vk::BufferHelper &nullBuffer = renderer->getNullBuffer();
+ vk::BufferHelper &emptyBuffer = contextVk->getEmptyBuffer();
- mCurrentArrayBuffers[attribIndex] = &nullBuffer;
- mCurrentArrayBufferHandles[attribIndex] = nullBuffer.getBuffer().getHandle();
+ mCurrentArrayBuffers[attribIndex] = &emptyBuffer;
+ mCurrentArrayBufferHandles[attribIndex] = emptyBuffer.getBuffer().getHandle();
mCurrentArrayBufferOffsets[attribIndex] = 0;
stride = 0;
}
@@ -643,9 +642,9 @@ angle::Result VertexArrayVk::syncDirtyAttrib(ContextVk *contextVk,
}
else
{
- vk::BufferHelper &nullBuffer = renderer->getNullBuffer();
- mCurrentArrayBuffers[attribIndex] = &nullBuffer;
- mCurrentArrayBufferHandles[attribIndex] = nullBuffer.getBuffer().getHandle();
+ vk::BufferHelper &emptyBuffer = contextVk->getEmptyBuffer();
+ mCurrentArrayBuffers[attribIndex] = &emptyBuffer;
+ mCurrentArrayBufferHandles[attribIndex] = emptyBuffer.getBuffer().getHandle();
mCurrentArrayBufferOffsets[attribIndex] = 0;
// Client side buffer will be transfered to a tightly packed buffer later
stride = vertexFormat.actualBufferFormat().pixelBytes;
@@ -676,9 +675,9 @@ angle::Result VertexArrayVk::syncDirtyAttrib(ContextVk *contextVk,
contextVk->invalidateDefaultAttribute(attribIndex);
// These will be filled out by the ContextVk.
- vk::BufferHelper &nullBuffer = renderer->getNullBuffer();
- mCurrentArrayBuffers[attribIndex] = &nullBuffer;
- mCurrentArrayBufferHandles[attribIndex] = nullBuffer.getBuffer().getHandle();
+ vk::BufferHelper &emptyBuffer = contextVk->getEmptyBuffer();
+ mCurrentArrayBuffers[attribIndex] = &emptyBuffer;
+ mCurrentArrayBufferHandles[attribIndex] = emptyBuffer.getBuffer().getHandle();
mCurrentArrayBufferOffsets[attribIndex] = 0;
mCurrentArrayBufferStrides[attribIndex] = 0;
mCurrentArrayBufferRelativeOffsets[attribIndex] = 0;