Skip to content

A
angle
Commit 08b56293 by James Dong Committed by Commit Bot
Options

Vulkan: add LINE_LOOP with primitive restart

Adds support for GL_LINE_LOOP with primitive restart. Bug: angleproject:3215 Change-Id: Ief1bdf15ef9b108dba025eaf4ce580bba54af623 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1649351Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 2c49d0b0
Showing with 206 additions and 73 deletions
src/common/utilities.h
...@@ -75,6 +75,20 @@ IndexRange ComputeIndexRange(DrawElementsType indexType, ...@@ -75,6 +75,20 @@ IndexRange ComputeIndexRange(DrawElementsType indexType,
// Get the primitive restart index value for the given index type. // Get the primitive restart index value for the given index type.
GLuint GetPrimitiveRestartIndex(DrawElementsType indexType); GLuint GetPrimitiveRestartIndex(DrawElementsType indexType);
// Get the primitive restart index value with the given C++ type.
template <typename T>
constexpr T GetPrimitiveRestartIndexFromType()
{
return std::numeric_limits<T>::max();
}
static_assert(GetPrimitiveRestartIndexFromType<uint8_t>() == 0xFF,
"verify restart index for uint8_t values");
static_assert(GetPrimitiveRestartIndexFromType<uint16_t>() == 0xFFFF,
"verify restart index for uint8_t values");
static_assert(GetPrimitiveRestartIndexFromType<uint32_t>() == 0xFFFFFFFF,
"verify restart index for uint8_t values");
bool IsTriangleMode(PrimitiveMode drawMode); bool IsTriangleMode(PrimitiveMode drawMode);
namespace priv namespace priv
......
src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
...@@ -145,48 +145,6 @@ void SetTriangleFanIndices(GLuint *destPtr, size_t numTris) ...@@ -145,48 +145,6 @@ void SetTriangleFanIndices(GLuint *destPtr, size_t numTris)
} }
} }
template <typename T>
void CopyLineLoopIndicesWithRestart(const void *indices,
size_t count,
gl::DrawElementsType indexType,
std::vector<GLuint> *bufferOut)
{
GLuint restartIndex = gl::GetPrimitiveRestartIndex(indexType);
GLuint d3dRestartIndex = static_cast<GLuint>(d3d11::GetPrimitiveRestartIndex());
const T *srcPtr = static_cast<const T *>(indices);
Optional<GLuint> currentLoopStart;
bufferOut->clear();
for (size_t indexIdx = 0; indexIdx < count; ++indexIdx)
{
GLuint value = static_cast<GLuint>(srcPtr[indexIdx]);
if (value == restartIndex)
{
if (currentLoopStart.valid())
{
bufferOut->push_back(currentLoopStart.value());
bufferOut->push_back(d3dRestartIndex);
currentLoopStart.reset();
}
}
else
{
bufferOut->push_back(value);
if (!currentLoopStart.valid())
{
currentLoopStart = value;
}
}
}
if (currentLoopStart.valid())
{
bufferOut->push_back(currentLoopStart.value());
}
}
void GetLineLoopIndices(const void *indices, void GetLineLoopIndices(const void *indices,
gl::DrawElementsType indexType, gl::DrawElementsType indexType,
GLuint count, GLuint count,
...@@ -195,16 +153,25 @@ void GetLineLoopIndices(const void *indices, ...@@ -195,16 +153,25 @@ void GetLineLoopIndices(const void *indices,
{ {
if (indexType != gl::DrawElementsType::InvalidEnum && usePrimitiveRestartFixedIndex) if (indexType != gl::DrawElementsType::InvalidEnum && usePrimitiveRestartFixedIndex)
{ {
size_t indexCount = GetLineLoopWithRestartIndexCount(indexType, count,
static_cast<const uint8_t *>(indices));
bufferOut->resize(indexCount);
switch (indexType) switch (indexType)
{ {
case gl::DrawElementsType::UnsignedByte: case gl::DrawElementsType::UnsignedByte:
CopyLineLoopIndicesWithRestart<GLubyte>(indices, count, indexType, bufferOut); CopyLineLoopIndicesWithRestart<GLubyte, GLuint>(
count, static_cast<const uint8_t *>(indices),
reinterpret_cast<uint8_t *>(bufferOut->data()));
break; break;
case gl::DrawElementsType::UnsignedShort: case gl::DrawElementsType::UnsignedShort:
CopyLineLoopIndicesWithRestart<GLushort>(indices, count, indexType, bufferOut); CopyLineLoopIndicesWithRestart<GLushort, GLuint>(
count, static_cast<const uint8_t *>(indices),
reinterpret_cast<uint8_t *>(bufferOut->data()));
break; break;
case gl::DrawElementsType::UnsignedInt: case gl::DrawElementsType::UnsignedInt:
CopyLineLoopIndicesWithRestart<GLuint>(indices, count, indexType, bufferOut); CopyLineLoopIndicesWithRestart<GLuint, GLuint>(
count, static_cast<const uint8_t *>(indices),
reinterpret_cast<uint8_t *>(bufferOut->data()));
break; break;
default: default:
UNREACHABLE(); UNREACHABLE();
......
src/libANGLE/renderer/renderer_utils.h
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <map> #include <map>
#include "common/angleutils.h" #include "common/angleutils.h"
#include "common/utilities.h"
#include "libANGLE/angletypes.h" #include "libANGLE/angletypes.h"
namespace angle namespace angle
...@@ -307,6 +308,92 @@ gl::Rectangle ClipRectToScissor(const gl::State &glState, const gl::Rectangle &r ...@@ -307,6 +308,92 @@ gl::Rectangle ClipRectToScissor(const gl::State &glState, const gl::Rectangle &r
// Helper method to intialize a FeatureSet with overrides from the DisplayState // Helper method to intialize a FeatureSet with overrides from the DisplayState
void OverrideFeaturesWithDisplayState(angle::FeatureSetBase *features, void OverrideFeaturesWithDisplayState(angle::FeatureSetBase *features,
const egl::DisplayState &state); const egl::DisplayState &state);
template <typename In>
size_t LineLoopRestartIndexCountHelper(GLsizei indexCount, const uint8_t *srcPtr)
{
constexpr In restartIndex = gl::GetPrimitiveRestartIndexFromType<In>();
const In *inIndices = reinterpret_cast<const In *>(srcPtr);
size_t numIndices = 0;
// See CopyLineLoopIndicesWithRestart() below for more info on how
// numIndices is calculated.
GLsizei loopStartIndex = 0;
for (GLsizei curIndex = 0; curIndex < indexCount; curIndex++)
{
In vertex = inIndices[curIndex];
if (vertex != restartIndex)
{
numIndices++;
}
else
{
if (curIndex > loopStartIndex)
{
numIndices += 2;
}
loopStartIndex = curIndex + 1;
}
}
if (indexCount > loopStartIndex)
{
numIndices++;
}
return numIndices;
}
inline size_t GetLineLoopWithRestartIndexCount(gl::DrawElementsType glIndexType,
GLsizei indexCount,
const uint8_t *srcPtr)
{
switch (glIndexType)
{
case gl::DrawElementsType::UnsignedByte:
return LineLoopRestartIndexCountHelper<uint8_t>(indexCount, srcPtr);
case gl::DrawElementsType::UnsignedShort:
return LineLoopRestartIndexCountHelper<uint16_t>(indexCount, srcPtr);
case gl::DrawElementsType::UnsignedInt:
return LineLoopRestartIndexCountHelper<uint32_t>(indexCount, srcPtr);
default:
UNREACHABLE();
return 0;
}
}
// Writes the line-strip vertices for a line loop to outPtr,
// where outLimit is calculated as in GetPrimitiveRestartIndexCount.
template <typename In, typename Out>
void CopyLineLoopIndicesWithRestart(GLsizei indexCount, const uint8_t *srcPtr, uint8_t *outPtr)
{
constexpr In restartIndex = gl::GetPrimitiveRestartIndexFromType<In>();
constexpr Out outRestartIndex = gl::GetPrimitiveRestartIndexFromType<Out>();
const In *inIndices = reinterpret_cast<const In *>(srcPtr);
Out *outIndices = reinterpret_cast<Out *>(outPtr);
GLsizei loopStartIndex = 0;
for (GLsizei curIndex = 0; curIndex < indexCount; curIndex++)
{
In vertex = inIndices[curIndex];
if (vertex != restartIndex)
{
*(outIndices++) = static_cast<Out>(vertex);
}
else
{
if (curIndex > loopStartIndex)
{
// Emit an extra vertex only if the loop is not empty.
*(outIndices++) = inIndices[loopStartIndex];
// Then restart the strip.
*(outIndices++) = outRestartIndex;
}
loopStartIndex = curIndex + 1;
}
}
if (indexCount > loopStartIndex)
{
// Close the last loop if not empty.
*(outIndices++) = inIndices[loopStartIndex];
}
}
} // namespace rx } // namespace rx
#endif // LIBANGLE_RENDERER_RENDERER_UTILS_H_ #endif // LIBANGLE_RENDERER_RENDERER_UTILS_H_
src/libANGLE/renderer/vulkan/ContextVk.cpp
...@@ -509,10 +509,11 @@ angle::Result ContextVk::setupLineLoopDraw(const gl::Context *context, ...@@ -509,10 +509,11 @@ angle::Result ContextVk::setupLineLoopDraw(const gl::Context *context,
GLsizei vertexOrIndexCount, GLsizei vertexOrIndexCount,
gl::DrawElementsType indexTypeOrInvalid, gl::DrawElementsType indexTypeOrInvalid,
const void *indices, const void *indices,
vk::CommandBuffer **commandBufferOut) vk::CommandBuffer **commandBufferOut,
size_t *numIndicesOut)
{ {
ANGLE_TRY(mVertexArray->handleLineLoop(this, firstVertex, vertexOrIndexCount, ANGLE_TRY(mVertexArray->handleLineLoop(this, firstVertex, vertexOrIndexCount,
indexTypeOrInvalid, indices)); indexTypeOrInvalid, indices, numIndicesOut));
mDirtyBits.set(DIRTY_BIT_INDEX_BUFFER); mDirtyBits.set(DIRTY_BIT_INDEX_BUFFER);
mCurrentDrawElementsType = indexTypeOrInvalid != gl::DrawElementsType::InvalidEnum mCurrentDrawElementsType = indexTypeOrInvalid != gl::DrawElementsType::InvalidEnum
? indexTypeOrInvalid ? indexTypeOrInvalid
...@@ -1114,9 +1115,10 @@ angle::Result ContextVk::drawArrays(const gl::Context *context, ...@@ -1114,9 +1115,10 @@ angle::Result ContextVk::drawArrays(const gl::Context *context,
if (mode == gl::PrimitiveMode::LineLoop) if (mode == gl::PrimitiveMode::LineLoop)
{ {
size_t numIndices;
ANGLE_TRY(setupLineLoopDraw(context, mode, first, count, gl::DrawElementsType::InvalidEnum, ANGLE_TRY(setupLineLoopDraw(context, mode, first, count, gl::DrawElementsType::InvalidEnum,
nullptr, &commandBuffer)); nullptr, &commandBuffer, &numIndices));
vk::LineLoopHelper::Draw(clampedVertexCount, commandBuffer); vk::LineLoopHelper::Draw(numIndices, commandBuffer);
} }
else else
{ {
...@@ -1157,8 +1159,10 @@ angle::Result ContextVk::drawElements(const gl::Context *context, ...@@ -1157,8 +1159,10 @@ angle::Result ContextVk::drawElements(const gl::Context *context,
vk::CommandBuffer *commandBuffer = nullptr; vk::CommandBuffer *commandBuffer = nullptr;
if (mode == gl::PrimitiveMode::LineLoop) if (mode == gl::PrimitiveMode::LineLoop)
{ {
ANGLE_TRY(setupLineLoopDraw(context, mode, 0, count, type, indices, &commandBuffer)); size_t indexCount;
vk::LineLoopHelper::Draw(count, commandBuffer); ANGLE_TRY(
setupLineLoopDraw(context, mode, 0, count, type, indices, &commandBuffer, &indexCount));
vk::LineLoopHelper::Draw(indexCount, commandBuffer);
} }
else else
{ {
......
src/libANGLE/renderer/vulkan/ContextVk.h
...@@ -352,7 +352,8 @@ class ContextVk : public ContextImpl, public vk::Context, public vk::CommandBuff ...@@ -352,7 +352,8 @@ class ContextVk : public ContextImpl, public vk::Context, public vk::CommandBuff
GLsizei vertexOrIndexCount, GLsizei vertexOrIndexCount,
gl::DrawElementsType indexTypeOrInvalid, gl::DrawElementsType indexTypeOrInvalid,
const void *indices, const void *indices,
vk::CommandBuffer **commandBufferOut); vk::CommandBuffer **commandBufferOut,
size_t *numIndicesOut);
void updateViewport(FramebufferVk *framebufferVk, void updateViewport(FramebufferVk *framebufferVk,
const gl::Rectangle &viewport, const gl::Rectangle &viewport,
......
src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
...@@ -601,7 +601,8 @@ angle::Result VertexArrayVk::handleLineLoop(ContextVk *contextVk, ...@@ -601,7 +601,8 @@ angle::Result VertexArrayVk::handleLineLoop(ContextVk *contextVk,
GLint firstVertex, GLint firstVertex,
GLsizei vertexOrIndexCount, GLsizei vertexOrIndexCount,
gl::DrawElementsType indexTypeOrInvalid, gl::DrawElementsType indexTypeOrInvalid,
const void *indices) const void *indices,
size_t *indexCountOut)
{ {
if (indexTypeOrInvalid != gl::DrawElementsType::InvalidEnum) if (indexTypeOrInvalid != gl::DrawElementsType::InvalidEnum)
{ {
...@@ -615,7 +616,7 @@ angle::Result VertexArrayVk::handleLineLoop(ContextVk *contextVk, ...@@ -615,7 +616,7 @@ angle::Result VertexArrayVk::handleLineLoop(ContextVk *contextVk,
ANGLE_TRY(mLineLoopHelper.streamIndices( ANGLE_TRY(mLineLoopHelper.streamIndices(
contextVk, indexTypeOrInvalid, vertexOrIndexCount, contextVk, indexTypeOrInvalid, vertexOrIndexCount,
reinterpret_cast<const uint8_t *>(indices), &mCurrentElementArrayBuffer, reinterpret_cast<const uint8_t *>(indices), &mCurrentElementArrayBuffer,
&mCurrentElementArrayBufferOffset)); &mCurrentElementArrayBufferOffset, indexCountOut));
} }
else else
{ {
...@@ -624,7 +625,7 @@ angle::Result VertexArrayVk::handleLineLoop(ContextVk *contextVk, ...@@ -624,7 +625,7 @@ angle::Result VertexArrayVk::handleLineLoop(ContextVk *contextVk,
BufferVk *elementArrayBufferVk = vk::GetImpl(elementArrayBuffer); BufferVk *elementArrayBufferVk = vk::GetImpl(elementArrayBuffer);
ANGLE_TRY(mLineLoopHelper.getIndexBufferForElementArrayBuffer( ANGLE_TRY(mLineLoopHelper.getIndexBufferForElementArrayBuffer(
contextVk, elementArrayBufferVk, indexTypeOrInvalid, vertexOrIndexCount, offset, contextVk, elementArrayBufferVk, indexTypeOrInvalid, vertexOrIndexCount, offset,
&mCurrentElementArrayBuffer, &mCurrentElementArrayBufferOffset)); &mCurrentElementArrayBuffer, &mCurrentElementArrayBufferOffset, indexCountOut));
} }
} }
...@@ -651,6 +652,7 @@ angle::Result VertexArrayVk::handleLineLoop(ContextVk *contextVk, ...@@ -651,6 +652,7 @@ angle::Result VertexArrayVk::handleLineLoop(ContextVk *contextVk,
mLineLoopBufferFirstIndex = firstVertex; mLineLoopBufferFirstIndex = firstVertex;
mLineLoopBufferLastIndex = lastVertex; mLineLoopBufferLastIndex = lastVertex;
} }
*indexCountOut = vertexOrIndexCount + 1;
return angle::Result::Continue; return angle::Result::Continue;
} }
......
src/libANGLE/renderer/vulkan/VertexArrayVk.h
...@@ -48,7 +48,8 @@ class VertexArrayVk : public VertexArrayImpl ...@@ -48,7 +48,8 @@ class VertexArrayVk : public VertexArrayImpl
GLint firstVertex, GLint firstVertex,
GLsizei vertexOrIndexCount, GLsizei vertexOrIndexCount,
gl::DrawElementsType indexTypeOrInvalid, gl::DrawElementsType indexTypeOrInvalid,
const void *indices); const void *indices,
size_t *indexCountOut);
const gl::AttribArray<VkBuffer> &getCurrentArrayBufferHandles() const const gl::AttribArray<VkBuffer> &getCurrentArrayBufferHandles() const
{ {
......
src/libANGLE/renderer/vulkan/vk_helpers.cpp
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "common/utilities.h" #include "common/utilities.h"
#include "libANGLE/Context.h" #include "libANGLE/Context.h"
#include "libANGLE/renderer/renderer_utils.h"
#include "libANGLE/renderer/vulkan/BufferVk.h" #include "libANGLE/renderer/vulkan/BufferVk.h"
#include "libANGLE/renderer/vulkan/ContextVk.h" #include "libANGLE/renderer/vulkan/ContextVk.h"
#include "libANGLE/renderer/vulkan/DisplayVk.h" #include "libANGLE/renderer/vulkan/DisplayVk.h"
...@@ -212,6 +213,27 @@ VkImageCreateFlags GetImageCreateFlags(gl::TextureType textureType) ...@@ -212,6 +213,27 @@ VkImageCreateFlags GetImageCreateFlags(gl::TextureType textureType)
return 0; return 0;
} }
} }
void HandlePrimitiveRestart(gl::DrawElementsType glIndexType,
GLsizei indexCount,
const uint8_t *srcPtr,
uint8_t *outPtr)
{
switch (glIndexType)
{
case gl::DrawElementsType::UnsignedByte:
CopyLineLoopIndicesWithRestart<uint8_t, uint16_t>(indexCount, srcPtr, outPtr);
break;
case gl::DrawElementsType::UnsignedShort:
CopyLineLoopIndicesWithRestart<uint16_t, uint16_t>(indexCount, srcPtr, outPtr);
break;
case gl::DrawElementsType::UnsignedInt:
CopyLineLoopIndicesWithRestart<uint32_t, uint32_t>(indexCount, srcPtr, outPtr);
break;
default:
UNREACHABLE();
}
}
} // anonymous namespace } // anonymous namespace
// DynamicBuffer implementation. // DynamicBuffer implementation.
...@@ -1017,9 +1039,11 @@ angle::Result LineLoopHelper::getIndexBufferForElementArrayBuffer(ContextVk *con ...@@ -1017,9 +1039,11 @@ angle::Result LineLoopHelper::getIndexBufferForElementArrayBuffer(ContextVk *con
int indexCount, int indexCount,
intptr_t elementArrayOffset, intptr_t elementArrayOffset,
vk::BufferHelper **bufferOut, vk::BufferHelper **bufferOut,
VkDeviceSize *bufferOffsetOut) VkDeviceSize *bufferOffsetOut,
size_t *indexCountOut)
{ {
if (glIndexType == gl::DrawElementsType::UnsignedByte) if (glIndexType == gl::DrawElementsType::UnsignedByte ||
contextVk->getState().isPrimitiveRestartEnabled())
{ {
TRACE_EVENT0("gpu.angle", "LineLoopHelper::getIndexBufferForElementArrayBuffer"); TRACE_EVENT0("gpu.angle", "LineLoopHelper::getIndexBufferForElementArrayBuffer");
// Needed before reading buffer or we could get stale data. // Needed before reading buffer or we could get stale data.
...@@ -1029,11 +1053,13 @@ angle::Result LineLoopHelper::getIndexBufferForElementArrayBuffer(ContextVk *con ...@@ -1029,11 +1053,13 @@ angle::Result LineLoopHelper::getIndexBufferForElementArrayBuffer(ContextVk *con
ANGLE_TRY(elementArrayBufferVk->mapImpl(contextVk, &srcDataMapping)); ANGLE_TRY(elementArrayBufferVk->mapImpl(contextVk, &srcDataMapping));
ANGLE_TRY(streamIndices(contextVk, glIndexType, indexCount, ANGLE_TRY(streamIndices(contextVk, glIndexType, indexCount,
static_cast<const uint8_t *>(srcDataMapping) + elementArrayOffset, static_cast<const uint8_t *>(srcDataMapping) + elementArrayOffset,
bufferOut, bufferOffsetOut)); bufferOut, bufferOffsetOut, indexCountOut));
ANGLE_TRY(elementArrayBufferVk->unmapImpl(contextVk)); ANGLE_TRY(elementArrayBufferVk->unmapImpl(contextVk));
return angle::Result::Continue; return angle::Result::Continue;
} }
*indexCountOut = indexCount + 1;
VkIndexType indexType = gl_vk::kIndexTypeMap[glIndexType]; VkIndexType indexType = gl_vk::kIndexTypeMap[glIndexType];
ASSERT(indexType == VK_INDEX_TYPE_UINT16 || indexType == VK_INDEX_TYPE_UINT32); ASSERT(indexType == VK_INDEX_TYPE_UINT16 || indexType == VK_INDEX_TYPE_UINT32);
uint32_t *indices = nullptr; uint32_t *indices = nullptr;
...@@ -1067,19 +1093,32 @@ angle::Result LineLoopHelper::streamIndices(ContextVk *contextVk, ...@@ -1067,19 +1093,32 @@ angle::Result LineLoopHelper::streamIndices(ContextVk *contextVk,
GLsizei indexCount, GLsizei indexCount,
const uint8_t *srcPtr, const uint8_t *srcPtr,
vk::BufferHelper **bufferOut, vk::BufferHelper **bufferOut,
VkDeviceSize *bufferOffsetOut) VkDeviceSize *bufferOffsetOut,
size_t *indexCountOut)
{ {
VkIndexType indexType = gl_vk::kIndexTypeMap[glIndexType]; VkIndexType indexType = gl_vk::kIndexTypeMap[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 * (indexCount + 1); size_t numOutIndices = static_cast<size_t>(indexCount) + 1;
if (contextVk->getState().isPrimitiveRestartEnabled())
{
numOutIndices = GetLineLoopWithRestartIndexCount(glIndexType, indexCount, srcPtr);
}
*indexCountOut = numOutIndices;
size_t allocateBytes = unitSize * numOutIndices;
ANGLE_TRY(mDynamicIndexBuffer.allocate(contextVk, allocateBytes, ANGLE_TRY(mDynamicIndexBuffer.allocate(contextVk, allocateBytes,
reinterpret_cast<uint8_t **>(&indices), nullptr, reinterpret_cast<uint8_t **>(&indices), nullptr,
bufferOffsetOut, nullptr)); bufferOffsetOut, nullptr));
*bufferOut = mDynamicIndexBuffer.getCurrentBuffer(); *bufferOut = mDynamicIndexBuffer.getCurrentBuffer();
if (contextVk->getState().isPrimitiveRestartEnabled())
{
HandlePrimitiveRestart(glIndexType, indexCount, srcPtr, indices);
}
else
{
if (glIndexType == gl::DrawElementsType::UnsignedByte) if (glIndexType == gl::DrawElementsType::UnsignedByte)
{ {
// 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.
...@@ -1097,6 +1136,7 @@ angle::Result LineLoopHelper::streamIndices(ContextVk *contextVk, ...@@ -1097,6 +1136,7 @@ angle::Result LineLoopHelper::streamIndices(ContextVk *contextVk,
memcpy(indices, srcPtr, unitSize * indexCount); memcpy(indices, srcPtr, unitSize * indexCount);
memcpy(indices + unitSize * indexCount, srcPtr, unitSize); memcpy(indices + unitSize * indexCount, srcPtr, unitSize);
} }
}
ANGLE_TRY(mDynamicIndexBuffer.flush(contextVk)); ANGLE_TRY(mDynamicIndexBuffer.flush(contextVk));
return angle::Result::Continue; return angle::Result::Continue;
...@@ -1116,8 +1156,7 @@ void LineLoopHelper::destroy(VkDevice device) ...@@ -1116,8 +1156,7 @@ void LineLoopHelper::destroy(VkDevice device)
void LineLoopHelper::Draw(uint32_t count, vk::CommandBuffer *commandBuffer) void LineLoopHelper::Draw(uint32_t count, vk::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*.
// Note: this could theoretically overflow and wrap to zero. commandBuffer->drawIndexed(count);
commandBuffer->drawIndexed(count + 1);
} }
// BufferHelper implementation. // BufferHelper implementation.
......
src/libANGLE/renderer/vulkan/vk_helpers.h
...@@ -392,14 +392,16 @@ class LineLoopHelper final : angle::NonCopyable ...@@ -392,14 +392,16 @@ class LineLoopHelper final : angle::NonCopyable
int indexCount, int indexCount,
intptr_t elementArrayOffset, intptr_t elementArrayOffset,
vk::BufferHelper **bufferOut, vk::BufferHelper **bufferOut,
VkDeviceSize *bufferOffsetOut); VkDeviceSize *bufferOffsetOut,
size_t *indexCountOut);
angle::Result streamIndices(ContextVk *contextVk, angle::Result streamIndices(ContextVk *contextVk,
gl::DrawElementsType glIndexType, gl::DrawElementsType glIndexType,
GLsizei indexCount, GLsizei indexCount,
const uint8_t *srcPtr, const uint8_t *srcPtr,
vk::BufferHelper **bufferOut, vk::BufferHelper **bufferOut,
VkDeviceSize *bufferOffsetOut); VkDeviceSize *bufferOffsetOut,
size_t *indexCountOut);
void release(ContextVk *contextVk); void release(ContextVk *contextVk);
void destroy(VkDevice device); void destroy(VkDevice device);
......
src/tests/deqp_support/deqp_gles3_test_expectations.txt
...@@ -662,14 +662,30 @@ ...@@ -662,14 +662,30 @@
2950 VULKAN : dEQP-GLES3.functional.fbo.invalidate.* = SKIP 2950 VULKAN : dEQP-GLES3.functional.fbo.invalidate.* = SKIP
// - Primitive restart with line loops: // - Primitive restart with line loops:
3215 VULKAN : dEQP-GLES3.functional.primitive_restart.basic.line_loop.* = SKIP 2672 VULKAN : dEQP-GLES3.functional.primitive_restart.basic.line_loop.unsigned_byte.draw_elements_instanced = SKIP
3215 VULKAN : dEQP-GLES3.functional.primitive_restart.duplicate_restarts.line_loop.* = SKIP 2672 VULKAN : dEQP-GLES3.functional.primitive_restart.basic.line_loop.unsigned_short.draw_elements_instanced = SKIP
3215 VULKAN : dEQP-GLES3.functional.primitive_restart.end_restart.line_loop.* = SKIP 2672 VULKAN : dEQP-GLES3.functional.primitive_restart.basic.line_loop.unsigned_int.draw_elements_instanced = SKIP
3215 VULKAN : dEQP-GLES3.functional.primitive_restart.end_restart_duplicate_restarts.line_loop.* = SKIP 2672 VULKAN : dEQP-GLES3.functional.primitive_restart.duplicate_restarts.line_loop.unsigned_byte.draw_elements_instanced = SKIP
3215 VULKAN : dEQP-GLES3.functional.primitive_restart.begin_restart.line_loop.* = SKIP 2672 VULKAN : dEQP-GLES3.functional.primitive_restart.duplicate_restarts.line_loop.unsigned_short.draw_elements_instanced = SKIP
3215 VULKAN : dEQP-GLES3.functional.primitive_restart.begin_restart_duplicate_restarts.line_loop.* = SKIP 2672 VULKAN : dEQP-GLES3.functional.primitive_restart.duplicate_restarts.line_loop.unsigned_int.draw_elements_instanced = SKIP
3215 VULKAN : dEQP-GLES3.functional.primitive_restart.begin_restart_end_restart.line_loop.* = SKIP 2672 VULKAN : dEQP-GLES3.functional.primitive_restart.end_restart.line_loop.unsigned_byte.draw_elements_instanced = SKIP
3215 VULKAN : dEQP-GLES3.functional.primitive_restart.begin_restart_end_restart_duplicate_restarts.line_loop.* = SKIP 2672 VULKAN : dEQP-GLES3.functional.primitive_restart.end_restart.line_loop.unsigned_short.draw_elements_instanced = SKIP
2672 VULKAN : dEQP-GLES3.functional.primitive_restart.end_restart.line_loop.unsigned_int.draw_elements_instanced = SKIP
2672 VULKAN : dEQP-GLES3.functional.primitive_restart.end_restart_duplicate_restarts.line_loop.unsigned_byte.draw_elements_instanced = SKIP
2672 VULKAN : dEQP-GLES3.functional.primitive_restart.end_restart_duplicate_restarts.line_loop.unsigned_short.draw_elements_instanced = SKIP
2672 VULKAN : dEQP-GLES3.functional.primitive_restart.end_restart_duplicate_restarts.line_loop.unsigned_int.draw_elements_instanced = SKIP
2672 VULKAN : dEQP-GLES3.functional.primitive_restart.begin_restart.line_loop.unsigned_byte.draw_elements_instanced = SKIP
2672 VULKAN : dEQP-GLES3.functional.primitive_restart.begin_restart.line_loop.unsigned_short.draw_elements_instanced = SKIP
2672 VULKAN : dEQP-GLES3.functional.primitive_restart.begin_restart.line_loop.unsigned_int.draw_elements_instanced = SKIP
2672 VULKAN : dEQP-GLES3.functional.primitive_restart.begin_restart_duplicate_restarts.line_loop.unsigned_byte.draw_elements_instanced = SKIP
2672 VULKAN : dEQP-GLES3.functional.primitive_restart.begin_restart_duplicate_restarts.line_loop.unsigned_short.draw_elements_instanced = SKIP
2672 VULKAN : dEQP-GLES3.functional.primitive_restart.begin_restart_duplicate_restarts.line_loop.unsigned_int.draw_elements_instanced = SKIP
2672 VULKAN : dEQP-GLES3.functional.primitive_restart.begin_restart_end_restart.line_loop.unsigned_byte.draw_elements_instanced = SKIP
2672 VULKAN : dEQP-GLES3.functional.primitive_restart.begin_restart_end_restart.line_loop.unsigned_short.draw_elements_instanced = SKIP
2672 VULKAN : dEQP-GLES3.functional.primitive_restart.begin_restart_end_restart.line_loop.unsigned_int.draw_elements_instanced = SKIP
2672 VULKAN : dEQP-GLES3.functional.primitive_restart.begin_restart_end_restart_duplicate_restarts.line_loop.unsigned_byte.draw_elements_instanced = SKIP
2672 VULKAN : dEQP-GLES3.functional.primitive_restart.begin_restart_end_restart_duplicate_restarts.line_loop.unsigned_short.draw_elements_instanced = SKIP
2672 VULKAN : dEQP-GLES3.functional.primitive_restart.begin_restart_end_restart_duplicate_restarts.line_loop.unsigned_int.draw_elements_instanced = SKIP
// - BufferVk::copySubData: // - BufferVk::copySubData:
2950 VULKAN : dEQP-GLES3.functional.negative_api.buffer.copy_buffer_sub_data = SKIP 2950 VULKAN : dEQP-GLES3.functional.negative_api.buffer.copy_buffer_sub_data = SKIP
......
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