Skip to content

A
angle
Commit 22f12fed by Jamie Madill Committed by Commit Bot
Options

Vulkan: Rename vk::LineLoopHelper.

This more closely follows the general pattern laid out by the naming in vk_helpers.h. It also changes the dynamic buffer that the helper wraps to be stored by-value since the header include order problem is fixed. Bug: angleproject:2318 Change-Id: I1de9e1edee2125d3afd490b4f9c99cf70c61215c Reviewed-on: https://chromium-review.googlesource.com/1001654Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Reviewed-by: 's avatarLuc Ferron <lucferron@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent d8c632c8
Showing with 29 additions and 30 deletions
src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
...@@ -61,7 +61,7 @@ void VertexArrayVk::destroy(const gl::Context *context) ...@@ -61,7 +61,7 @@ void VertexArrayVk::destroy(const gl::Context *context)
mDynamicVertexData.destroy(device); mDynamicVertexData.destroy(device);
mDynamicIndexData.destroy(device); mDynamicIndexData.destroy(device);
mLineLoopHandler.destroy(device); mLineLoopHelper.destroy(device);
} }
gl::Error VertexArrayVk::streamVertexData(RendererVk *renderer, gl::Error VertexArrayVk::streamVertexData(RendererVk *renderer,
...@@ -356,7 +356,7 @@ gl::Error VertexArrayVk::drawArrays(const gl::Context *context, ...@@ -356,7 +356,7 @@ gl::Error VertexArrayVk::drawArrays(const gl::Context *context,
mLineLoopBufferFirstIndex != drawCallParams.firstVertex() || mLineLoopBufferFirstIndex != drawCallParams.firstVertex() ||
mLineLoopBufferLastIndex != lastVertex) mLineLoopBufferLastIndex != lastVertex)
{ {
ANGLE_TRY(mLineLoopHandler.createIndexBuffer(renderer, drawCallParams, ANGLE_TRY(mLineLoopHelper.getIndexBufferForDrawArrays(renderer, drawCallParams,
&mCurrentElementArrayBufferHandle, &mCurrentElementArrayBufferHandle,
&mCurrentElementArrayBufferOffset)); &mCurrentElementArrayBufferOffset));
...@@ -367,7 +367,7 @@ gl::Error VertexArrayVk::drawArrays(const gl::Context *context, ...@@ -367,7 +367,7 @@ gl::Error VertexArrayVk::drawArrays(const gl::Context *context,
commandBuffer->bindIndexBuffer(mCurrentElementArrayBufferHandle, commandBuffer->bindIndexBuffer(mCurrentElementArrayBufferHandle,
mCurrentElementArrayBufferOffset, VK_INDEX_TYPE_UINT32); mCurrentElementArrayBufferOffset, VK_INDEX_TYPE_UINT32);
vk::LineLoopHandler::Draw(drawCallParams.vertexCount(), commandBuffer); vk::LineLoopHelper::Draw(drawCallParams.vertexCount(), commandBuffer);
return gl::NoError(); return gl::NoError();
} }
...@@ -403,13 +403,13 @@ gl::Error VertexArrayVk::drawElements(const gl::Context *context, ...@@ -403,13 +403,13 @@ gl::Error VertexArrayVk::drawElements(const gl::Context *context,
// This also doesn't check if the element type changed, which should trigger translation. // This also doesn't check if the element type changed, which should trigger translation.
if (mDirtyLineLoopTranslation) if (mDirtyLineLoopTranslation)
{ {
ANGLE_TRY(mLineLoopHandler.createIndexBufferFromElementArrayBuffer( ANGLE_TRY(mLineLoopHelper.getIndexBufferForElementArrayBuffer(
renderer, elementArrayBufferVk, indexType, drawCallParams.indexCount(), renderer, elementArrayBufferVk, indexType, drawCallParams.indexCount(),
&mCurrentElementArrayBufferHandle, &mCurrentElementArrayBufferOffset)); &mCurrentElementArrayBufferHandle, &mCurrentElementArrayBufferOffset));
} }
ANGLE_TRY(onIndexedDraw(context, renderer, drawCallParams, drawNode, newCommandBuffer)); ANGLE_TRY(onIndexedDraw(context, renderer, drawCallParams, drawNode, newCommandBuffer));
vk::LineLoopHandler::Draw(drawCallParams.indexCount(), commandBuffer); vk::LineLoopHelper::Draw(drawCallParams.indexCount(), commandBuffer);
return gl::NoError(); return gl::NoError();
} }
......
src/libANGLE/renderer/vulkan/VertexArrayVk.h
...@@ -119,7 +119,7 @@ class VertexArrayVk : public VertexArrayImpl ...@@ -119,7 +119,7 @@ class VertexArrayVk : public VertexArrayImpl
vk::DynamicBuffer mDynamicVertexData; vk::DynamicBuffer mDynamicVertexData;
vk::DynamicBuffer mDynamicIndexData; vk::DynamicBuffer mDynamicIndexData;
vk::LineLoopHandler mLineLoopHandler; vk::LineLoopHelper mLineLoopHelper;
Optional<int> mLineLoopBufferFirstIndex; Optional<int> mLineLoopBufferFirstIndex;
Optional<int> mLineLoopBufferLastIndex; Optional<int> mLineLoopBufferLastIndex;
bool mDirtyLineLoopTranslation; bool mDirtyLineLoopTranslation;
......
src/libANGLE/renderer/vulkan/vk_helpers.cpp
...@@ -300,16 +300,15 @@ Error DynamicDescriptorPool::allocateNewPool(const VkDevice &device) ...@@ -300,16 +300,15 @@ Error DynamicDescriptorPool::allocateNewPool(const VkDevice &device)
return NoError(); return NoError();
} }
LineLoopHandler::LineLoopHandler() LineLoopHelper::LineLoopHelper()
: mDynamicLineLoopIndicesData( : mDynamicIndexBuffer(kLineLoopDynamicBufferUsage, kLineLoopDynamicBufferMinSize)
new DynamicBuffer(kLineLoopDynamicBufferUsage, kLineLoopDynamicBufferMinSize))
{ {
mDynamicLineLoopIndicesData->init(1); mDynamicIndexBuffer.init(1);
} }
LineLoopHandler::~LineLoopHandler() = default; LineLoopHelper::~LineLoopHelper() = default;
gl::Error LineLoopHandler::createIndexBuffer(RendererVk *renderer, gl::Error LineLoopHelper::getIndexBufferForDrawArrays(RendererVk *renderer,
const gl::DrawCallParams &drawCallParams, const gl::DrawCallParams &drawCallParams,
VkBuffer *bufferHandleOut, VkBuffer *bufferHandleOut,
VkDeviceSize *offsetOut) VkDeviceSize *offsetOut)
...@@ -317,9 +316,9 @@ gl::Error LineLoopHandler::createIndexBuffer(RendererVk *renderer, ...@@ -317,9 +316,9 @@ gl::Error LineLoopHandler::createIndexBuffer(RendererVk *renderer,
uint32_t *indices = nullptr; uint32_t *indices = nullptr;
size_t allocateBytes = sizeof(uint32_t) * (drawCallParams.vertexCount() + 1); size_t allocateBytes = sizeof(uint32_t) * (drawCallParams.vertexCount() + 1);
uint32_t offset = 0; uint32_t offset = 0;
ANGLE_TRY(mDynamicLineLoopIndicesData->allocate(renderer, allocateBytes, ANGLE_TRY(mDynamicIndexBuffer.allocate(renderer, allocateBytes,
reinterpret_cast<uint8_t **>(&indices), reinterpret_cast<uint8_t **>(&indices), bufferHandleOut,
bufferHandleOut, &offset, nullptr)); &offset, nullptr));
*offsetOut = static_cast<VkDeviceSize>(offset); *offsetOut = static_cast<VkDeviceSize>(offset);
uint32_t unsignedFirstVertex = static_cast<uint32_t>(drawCallParams.firstVertex()); uint32_t unsignedFirstVertex = static_cast<uint32_t>(drawCallParams.firstVertex());
...@@ -333,12 +332,12 @@ gl::Error LineLoopHandler::createIndexBuffer(RendererVk *renderer, ...@@ -333,12 +332,12 @@ gl::Error LineLoopHandler::createIndexBuffer(RendererVk *renderer,
// Since we are not using the VK_MEMORY_PROPERTY_HOST_COHERENT_BIT flag when creating the // Since we are not using the VK_MEMORY_PROPERTY_HOST_COHERENT_BIT flag when creating the
// device memory in the StreamingBuffer, we always need to make sure we flush it after // device memory in the StreamingBuffer, we always need to make sure we flush it after
// writing. // writing.
ANGLE_TRY(mDynamicLineLoopIndicesData->flush(renderer->getDevice())); ANGLE_TRY(mDynamicIndexBuffer.flush(renderer->getDevice()));
return gl::NoError(); return gl::NoError();
} }
gl::Error LineLoopHandler::createIndexBufferFromElementArrayBuffer(RendererVk *renderer, gl::Error LineLoopHelper::getIndexBufferForElementArrayBuffer(RendererVk *renderer,
BufferVk *elementArrayBufferVk, BufferVk *elementArrayBufferVk,
VkIndexType indexType, VkIndexType indexType,
int indexCount, int indexCount,
...@@ -352,9 +351,9 @@ gl::Error LineLoopHandler::createIndexBufferFromElementArrayBuffer(RendererVk *r ...@@ -352,9 +351,9 @@ gl::Error LineLoopHandler::createIndexBufferFromElementArrayBuffer(RendererVk *r
auto unitSize = (indexType == VK_INDEX_TYPE_UINT16 ? sizeof(uint16_t) : sizeof(uint32_t)); auto unitSize = (indexType == VK_INDEX_TYPE_UINT16 ? sizeof(uint16_t) : sizeof(uint32_t));
size_t allocateBytes = unitSize * (indexCount + 1); size_t allocateBytes = unitSize * (indexCount + 1);
ANGLE_TRY(mDynamicLineLoopIndicesData->allocate(renderer, allocateBytes, ANGLE_TRY(mDynamicIndexBuffer.allocate(renderer, allocateBytes,
reinterpret_cast<uint8_t **>(&indices), reinterpret_cast<uint8_t **>(&indices), bufferHandleOut,
bufferHandleOut, &offset, nullptr)); &offset, nullptr));
*bufferOffsetOut = static_cast<VkDeviceSize>(offset); *bufferOffsetOut = static_cast<VkDeviceSize>(offset);
VkBufferCopy copy1 = {0, offset, static_cast<VkDeviceSize>(indexCount) * unitSize}; VkBufferCopy copy1 = {0, offset, static_cast<VkDeviceSize>(indexCount) * unitSize};
...@@ -369,17 +368,17 @@ gl::Error LineLoopHandler::createIndexBufferFromElementArrayBuffer(RendererVk *r ...@@ -369,17 +368,17 @@ gl::Error LineLoopHandler::createIndexBufferFromElementArrayBuffer(RendererVk *r
commandBuffer->copyBuffer(elementArrayBufferVk->getVkBuffer().getHandle(), *bufferHandleOut, 2, commandBuffer->copyBuffer(elementArrayBufferVk->getVkBuffer().getHandle(), *bufferHandleOut, 2,
copies.data()); copies.data());
ANGLE_TRY(mDynamicLineLoopIndicesData->flush(renderer->getDevice())); ANGLE_TRY(mDynamicIndexBuffer.flush(renderer->getDevice()));
return gl::NoError(); return gl::NoError();
} }
void LineLoopHandler::destroy(VkDevice device) void LineLoopHelper::destroy(VkDevice device)
{ {
mDynamicLineLoopIndicesData->destroy(device); mDynamicIndexBuffer.destroy(device);
} }
// static // static
void LineLoopHandler::Draw(int count, CommandBuffer *commandBuffer) void LineLoopHelper::Draw(int count, CommandBuffer *commandBuffer)
{ {
// Our first index is always 0 because that's how we set it up in createIndexBuffer*. // Our first index is always 0 because that's how we set it up in createIndexBuffer*.
commandBuffer->drawIndexed(count + 1, 1, 0, 0, 0); commandBuffer->drawIndexed(count + 1, 1, 0, 0, 0);
......
src/libANGLE/renderer/vulkan/vk_helpers.h
...@@ -112,17 +112,17 @@ class DynamicDescriptorPool final : angle::NonCopyable ...@@ -112,17 +112,17 @@ class DynamicDescriptorPool final : angle::NonCopyable
// //
// If the user wants to draw a loop between [v1, v2, v3], we will create an indexed buffer with // If the user wants to draw a loop between [v1, v2, v3], we will create an indexed buffer with
// these indexes: [0, 1, 2, 3, 0] to emulate the loop. // these indexes: [0, 1, 2, 3, 0] to emulate the loop.
class LineLoopHandler final : public vk::CommandGraphResource class LineLoopHelper final : public vk::CommandGraphResource
{ {
public: public:
LineLoopHandler(); LineLoopHelper();
~LineLoopHandler(); ~LineLoopHelper();
gl::Error createIndexBuffer(RendererVk *renderer, gl::Error getIndexBufferForDrawArrays(RendererVk *renderer,
const gl::DrawCallParams &drawCallParams, const gl::DrawCallParams &drawCallParams,
VkBuffer *bufferHandleOut, VkBuffer *bufferHandleOut,
VkDeviceSize *offsetOut); VkDeviceSize *offsetOut);
gl::Error createIndexBufferFromElementArrayBuffer(RendererVk *renderer, gl::Error getIndexBufferForElementArrayBuffer(RendererVk *renderer,
BufferVk *elementArrayBufferVk, BufferVk *elementArrayBufferVk,
VkIndexType indexType, VkIndexType indexType,
int indexCount, int indexCount,
...@@ -133,7 +133,7 @@ class LineLoopHandler final : public vk::CommandGraphResource ...@@ -133,7 +133,7 @@ class LineLoopHandler final : public vk::CommandGraphResource
static void Draw(int count, CommandBuffer *commandBuffer); static void Draw(int count, CommandBuffer *commandBuffer);
private: private:
std::unique_ptr<DynamicBuffer> mDynamicLineLoopIndicesData; DynamicBuffer mDynamicIndexBuffer;
}; };
class ImageHelper final : angle::NonCopyable class ImageHelper final : angle::NonCopyable
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment