Skip to content

A
angle
Commit 85c4b43e by Frank Henigman Committed by Commit Bot
Options

Vulkan: Translate line loop indices from buffer.

When a line loop is drawn with byte indices from a buffer, translate to short. Enable test. BUG=angleproject:2802 Change-Id: Ie178ec866387be85b91291c28e1978db0a09c20a Reviewed-on: https://chromium-review.googlesource.com/1237293Reviewed-by: 's avatarFrank Henigman <fjhenigman@chromium.org> Commit-Queue: Frank Henigman <fjhenigman@chromium.org>
parent f5aad063
Showing with 49 additions and 34 deletions
src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
...@@ -479,13 +479,13 @@ angle::Result VertexArrayVk::handleLineLoop(ContextVk *contextVk, ...@@ -479,13 +479,13 @@ angle::Result VertexArrayVk::handleLineLoop(ContextVk *contextVk,
if (mDirtyLineLoopTranslation) if (mDirtyLineLoopTranslation)
{ {
gl::Buffer *elementArrayBuffer = mState.getElementArrayBuffer().get(); gl::Buffer *elementArrayBuffer = mState.getElementArrayBuffer().get();
VkIndexType indexType = gl_vk::GetIndexType(drawCallParams.type());
if (!elementArrayBuffer) if (!elementArrayBuffer)
{ {
ANGLE_TRY(mLineLoopHelper.getIndexBufferForClientElementArray( ANGLE_TRY(mLineLoopHelper.streamIndices(
contextVk, drawCallParams, &mCurrentElementArrayBufferHandle, contextVk, drawCallParams.type(), drawCallParams.indexCount(),
&mCurrentElementArrayBufferOffset)); reinterpret_cast<const uint8_t *>(drawCallParams.indices()),
&mCurrentElementArrayBufferHandle, &mCurrentElementArrayBufferOffset));
} }
else else
{ {
...@@ -493,8 +493,9 @@ angle::Result VertexArrayVk::handleLineLoop(ContextVk *contextVk, ...@@ -493,8 +493,9 @@ angle::Result VertexArrayVk::handleLineLoop(ContextVk *contextVk,
intptr_t offset = reinterpret_cast<intptr_t>(drawCallParams.indices()); intptr_t offset = reinterpret_cast<intptr_t>(drawCallParams.indices());
BufferVk *elementArrayBufferVk = vk::GetImpl(elementArrayBuffer); BufferVk *elementArrayBufferVk = vk::GetImpl(elementArrayBuffer);
ANGLE_TRY(mLineLoopHelper.getIndexBufferForElementArrayBuffer( ANGLE_TRY(mLineLoopHelper.getIndexBufferForElementArrayBuffer(
contextVk, elementArrayBufferVk, indexType, drawCallParams.indexCount(), offset, contextVk, elementArrayBufferVk, drawCallParams.type(),
&mCurrentElementArrayBufferHandle, &mCurrentElementArrayBufferOffset)); drawCallParams.indexCount(), offset, &mCurrentElementArrayBufferHandle,
&mCurrentElementArrayBufferOffset));
} }
} }
......
src/libANGLE/renderer/vulkan/vk_helpers.cpp
...@@ -370,7 +370,7 @@ LineLoopHelper::LineLoopHelper(RendererVk *renderer) ...@@ -370,7 +370,7 @@ LineLoopHelper::LineLoopHelper(RendererVk *renderer)
LineLoopHelper::~LineLoopHelper() = default; LineLoopHelper::~LineLoopHelper() = default;
angle::Result LineLoopHelper::getIndexBufferForDrawArrays(Context *context, angle::Result LineLoopHelper::getIndexBufferForDrawArrays(ContextVk *context,
const gl::DrawCallParams &drawCallParams, const gl::DrawCallParams &drawCallParams,
VkBuffer *bufferHandleOut, VkBuffer *bufferHandleOut,
VkDeviceSize *offsetOut) VkDeviceSize *offsetOut)
...@@ -402,16 +402,30 @@ angle::Result LineLoopHelper::getIndexBufferForDrawArrays(Context *context, ...@@ -402,16 +402,30 @@ angle::Result LineLoopHelper::getIndexBufferForDrawArrays(Context *context,
return angle::Result::Continue(); return angle::Result::Continue();
} }
angle::Result LineLoopHelper::getIndexBufferForElementArrayBuffer(Context *context, angle::Result LineLoopHelper::getIndexBufferForElementArrayBuffer(ContextVk *context,
BufferVk *elementArrayBufferVk, BufferVk *elementArrayBufferVk,
VkIndexType indexType, GLenum glIndexType,
int indexCount, int indexCount,
intptr_t elementArrayOffset, intptr_t elementArrayOffset,
VkBuffer *bufferHandleOut, VkBuffer *bufferHandleOut,
VkDeviceSize *bufferOffsetOut) VkDeviceSize *bufferOffsetOut)
{ {
ASSERT(indexType == VK_INDEX_TYPE_UINT16 || indexType == VK_INDEX_TYPE_UINT32); if (glIndexType == GL_UNSIGNED_BYTE)
{
// Needed before reading buffer or we could get stale data.
ANGLE_TRY(context->getRenderer()->finish(context));
void *srcDataMapping = nullptr;
ANGLE_TRY(elementArrayBufferVk->mapImpl(context, &srcDataMapping));
ANGLE_TRY(streamIndices(context, glIndexType, indexCount,
static_cast<const uint8_t *>(srcDataMapping) + elementArrayOffset,
bufferHandleOut, bufferOffsetOut));
ANGLE_TRY(elementArrayBufferVk->unmapImpl(context));
return angle::Result::Continue();
}
VkIndexType indexType = gl_vk::GetIndexType(glIndexType);
ASSERT(indexType == VK_INDEX_TYPE_UINT16 || indexType == VK_INDEX_TYPE_UINT32);
uint32_t *indices = nullptr; uint32_t *indices = nullptr;
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));
...@@ -439,40 +453,39 @@ angle::Result LineLoopHelper::getIndexBufferForElementArrayBuffer(Context *conte ...@@ -439,40 +453,39 @@ angle::Result LineLoopHelper::getIndexBufferForElementArrayBuffer(Context *conte
return angle::Result::Continue(); return angle::Result::Continue();
} }
angle::Result LineLoopHelper::getIndexBufferForClientElementArray( angle::Result LineLoopHelper::streamIndices(ContextVk *context,
Context *context, GLenum glIndexType,
const gl::DrawCallParams &drawCallParams, GLsizei indexCount,
VkBuffer *bufferHandleOut, const uint8_t *srcPtr,
VkDeviceSize *bufferOffsetOut) VkBuffer *bufferHandleOut,
VkDeviceSize *bufferOffsetOut)
{ {
VkIndexType indexType = gl_vk::GetIndexType(drawCallParams.type()); VkIndexType indexType = gl_vk::GetIndexType(glIndexType);
uint8_t *indices = nullptr; uint8_t *indices = nullptr;
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 * (drawCallParams.indexCount() + 1); size_t allocateBytes = unitSize * (indexCount + 1);
ANGLE_TRY(mDynamicIndexBuffer.allocate(context, allocateBytes, ANGLE_TRY(mDynamicIndexBuffer.allocate(context, allocateBytes,
reinterpret_cast<uint8_t **>(&indices), bufferHandleOut, reinterpret_cast<uint8_t **>(&indices), bufferHandleOut,
bufferOffsetOut, nullptr)); bufferOffsetOut, nullptr));
if (drawCallParams.type() == GL_UNSIGNED_BYTE) if (glIndexType == GL_UNSIGNED_BYTE)
{ {
// Vulkan doesn't support uint8 index types, so we need to emulate it. // Vulkan doesn't support uint8 index types, so we need to emulate it.
ASSERT(indexType == VK_INDEX_TYPE_UINT16); ASSERT(indexType == VK_INDEX_TYPE_UINT16);
uint16_t *indicesDst = reinterpret_cast<uint16_t *>(indices); uint16_t *indicesDst = reinterpret_cast<uint16_t *>(indices);
const uint8_t *srcPtr = reinterpret_cast<const uint8_t *>(drawCallParams.indices()); for (int i = 0; i < indexCount; i++)
for (int i = 0; i < drawCallParams.indexCount(); i++)
{ {
indicesDst[i] = srcPtr[i]; indicesDst[i] = srcPtr[i];
} }
indicesDst[drawCallParams.indexCount()] = srcPtr[0]; indicesDst[indexCount] = srcPtr[0];
} }
else else
{ {
memcpy(indices, drawCallParams.indices(), unitSize * drawCallParams.indexCount()); memcpy(indices, srcPtr, unitSize * indexCount);
memcpy(indices + unitSize * drawCallParams.indexCount(), drawCallParams.indices(), memcpy(indices + unitSize * indexCount, srcPtr, unitSize);
unitSize);
} }
ANGLE_TRY(mDynamicIndexBuffer.flush(context)); ANGLE_TRY(mDynamicIndexBuffer.flush(context));
......
src/libANGLE/renderer/vulkan/vk_helpers.h
...@@ -138,21 +138,25 @@ class LineLoopHelper final : public vk::CommandGraphResource ...@@ -138,21 +138,25 @@ class LineLoopHelper final : public vk::CommandGraphResource
LineLoopHelper(RendererVk *renderer); LineLoopHelper(RendererVk *renderer);
~LineLoopHelper(); ~LineLoopHelper();
angle::Result getIndexBufferForDrawArrays(Context *context, angle::Result getIndexBufferForDrawArrays(ContextVk *context,
const gl::DrawCallParams &drawCallParams, const gl::DrawCallParams &drawCallParams,
VkBuffer *bufferHandleOut, VkBuffer *bufferHandleOut,
VkDeviceSize *offsetOut); VkDeviceSize *offsetOut);
angle::Result getIndexBufferForElementArrayBuffer(Context *context,
angle::Result getIndexBufferForElementArrayBuffer(ContextVk *context,
BufferVk *elementArrayBufferVk, BufferVk *elementArrayBufferVk,
VkIndexType indexType, GLenum glIndexType,
int indexCount, int indexCount,
intptr_t elementArrayOffset, intptr_t elementArrayOffset,
VkBuffer *bufferHandleOut, VkBuffer *bufferHandleOut,
VkDeviceSize *bufferOffsetOut); VkDeviceSize *bufferOffsetOut);
angle::Result getIndexBufferForClientElementArray(Context *context,
const gl::DrawCallParams &drawCallParams, angle::Result streamIndices(ContextVk *context,
VkBuffer *bufferHandleOut, GLenum glIndexType,
VkDeviceSize *bufferOffsetOut); GLsizei indexCount,
const uint8_t *srcPtr,
VkBuffer *bufferHandleOut,
VkDeviceSize *bufferOffsetOut);
void destroy(VkDevice device); void destroy(VkDevice device);
......
src/tests/gl_tests/LineLoopTest.cpp
...@@ -132,9 +132,6 @@ TEST_P(LineLoopTest, LineLoopUIntIndices) ...@@ -132,9 +132,6 @@ TEST_P(LineLoopTest, LineLoopUIntIndices)
TEST_P(LineLoopTest, LineLoopUByteIndexBuffer) TEST_P(LineLoopTest, LineLoopUByteIndexBuffer)
{ {
// TODO(jmadill): Diagnose and fix. http://anglebug.com/2802
ANGLE_SKIP_TEST_IF(IsVulkan());
// Disable D3D11 SDK Layers warnings checks, see ANGLE issue 667 for details // Disable D3D11 SDK Layers warnings checks, see ANGLE issue 667 for details
ignoreD3D11SDKLayersWarnings(); ignoreD3D11SDKLayersWarnings();
......
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