Vulkan:Integrate SecondaryCommandBuffers
Integrate the custom SecondaryCommandBuffer type into the CommandGraph
nodes by adding new ANGLE_USE_CUSTOM_VULKAN_CMD_BUFFERS define that can
be set in the BUILD gn args with angle_enable_custom_vulkan_cmd_buffers
set to "true."
Initially the custom cmd buffers are disabled by default.
This adds some support functions to SecondaryCommandBuffer to make the
integration easier by matching the wrapped cmd buffer interface:
initialize(), end(), valid().
Bug: angleproject:3136
Change-Id: Ib910554583192550757bb8ce89914e3ea8737988
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1526556
Commit-Queue: Tobin Ehlis <tobine@google.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
diff --git a/src/libANGLE/renderer/vulkan/ContextVk.cpp b/src/libANGLE/renderer/vulkan/ContextVk.cpp
index 4c16aac..035d577 100644
--- a/src/libANGLE/renderer/vulkan/ContextVk.cpp
+++ b/src/libANGLE/renderer/vulkan/ContextVk.cpp
@@ -206,7 +206,7 @@
gl::DrawElementsType indexTypeOrNone,
const void *indices,
DirtyBits dirtyBitMask,
- vk::CommandBuffer **commandBufferOut)
+ CommandBufferT **commandBufferOut)
{
// Set any dirty bits that depend on draw call parameters or other objects.
if (mode != mCurrentDrawMode)
@@ -273,7 +273,7 @@
GLsizei instanceCount,
gl::DrawElementsType indexType,
const void *indices,
- vk::CommandBuffer **commandBufferOut)
+ CommandBufferT **commandBufferOut)
{
if (indexType != mCurrentDrawElementsType)
{
@@ -312,7 +312,7 @@
GLsizei vertexOrIndexCount,
gl::DrawElementsType indexTypeOrInvalid,
const void *indices,
- vk::CommandBuffer **commandBufferOut)
+ CommandBufferT **commandBufferOut)
{
ANGLE_TRY(mVertexArray->handleLineLoop(this, firstVertex, vertexOrIndexCount,
indexTypeOrInvalid, indices));
@@ -325,7 +325,7 @@
}
angle::Result ContextVk::handleDirtyDefaultAttribs(const gl::Context *context,
- vk::CommandBuffer *commandBuffer)
+ CommandBufferT *commandBuffer)
{
ASSERT(mDirtyDefaultAttribsMask.any());
@@ -339,7 +339,7 @@
}
angle::Result ContextVk::handleDirtyPipeline(const gl::Context *context,
- vk::CommandBuffer *commandBuffer)
+ CommandBufferT *commandBuffer)
{
if (!mCurrentPipeline)
{
@@ -379,7 +379,7 @@
}
angle::Result ContextVk::handleDirtyTextures(const gl::Context *context,
- vk::CommandBuffer *commandBuffer)
+ CommandBufferT *commandBuffer)
{
ANGLE_TRY(updateActiveTextures(context));
@@ -391,7 +391,7 @@
}
angle::Result ContextVk::handleDirtyVertexBuffers(const gl::Context *context,
- vk::CommandBuffer *commandBuffer)
+ CommandBufferT *commandBuffer)
{
uint32_t maxAttrib = mProgram->getState().getMaxActiveAttribLocation();
const gl::AttribArray<VkBuffer> &bufferHandles = mVertexArray->getCurrentArrayBufferHandles();
@@ -417,12 +417,12 @@
}
angle::Result ContextVk::handleDirtyIndexBuffer(const gl::Context *context,
- vk::CommandBuffer *commandBuffer)
+ CommandBufferT *commandBuffer)
{
vk::BufferHelper *elementArrayBuffer = mVertexArray->getCurrentElementArrayBuffer();
ASSERT(elementArrayBuffer != nullptr);
- commandBuffer->bindIndexBuffer(elementArrayBuffer->getBuffer().getHandle(),
+ commandBuffer->bindIndexBuffer(elementArrayBuffer->getBuffer(),
mVertexArray->getCurrentElementArrayBufferOffset(),
gl_vk::kIndexTypeMap[mCurrentDrawElementsType]);
@@ -433,7 +433,7 @@
}
angle::Result ContextVk::handleDirtyDescriptorSets(const gl::Context *context,
- vk::CommandBuffer *commandBuffer)
+ CommandBufferT *commandBuffer)
{
ANGLE_TRY(mProgram->updateDescriptorSets(this, commandBuffer));
@@ -449,7 +449,7 @@
GLint first,
GLsizei count)
{
- vk::CommandBuffer *commandBuffer = nullptr;
+ CommandBufferT *commandBuffer = nullptr;
uint32_t clampedVertexCount = gl::GetClampedVertexCount<uint32_t>(count);
if (mode == gl::PrimitiveMode::LineLoop)
@@ -481,7 +481,7 @@
return angle::Result::Stop;
}
- vk::CommandBuffer *commandBuffer = nullptr;
+ CommandBufferT *commandBuffer = nullptr;
ANGLE_TRY(setupDraw(context, mode, first, count, instances, gl::DrawElementsType::InvalidEnum,
nullptr, mNonIndexedDirtyBitsMask, &commandBuffer));
commandBuffer->draw(gl::GetClampedVertexCount<uint32_t>(count), instances, first, 0);
@@ -494,7 +494,7 @@
gl::DrawElementsType type,
const void *indices)
{
- vk::CommandBuffer *commandBuffer = nullptr;
+ CommandBufferT *commandBuffer = nullptr;
if (mode == gl::PrimitiveMode::LineLoop)
{
ANGLE_TRY(setupLineLoopDraw(context, mode, 0, count, type, indices, &commandBuffer));
@@ -523,7 +523,7 @@
return angle::Result::Stop;
}
- vk::CommandBuffer *commandBuffer = nullptr;
+ CommandBufferT *commandBuffer = nullptr;
ANGLE_TRY(setupIndexedDraw(context, mode, count, instances, type, indices, &commandBuffer));
commandBuffer->drawIndexed(count, instances, 0, 0, 0);
return angle::Result::Continue;
@@ -1157,7 +1157,7 @@
}
angle::Result ContextVk::handleDirtyDriverUniforms(const gl::Context *context,
- vk::CommandBuffer *commandBuffer)
+ CommandBufferT *commandBuffer)
{
// Release any previously retained buffers.
mDriverUniformsBuffer.releaseRetainedBuffers(mRenderer);