Hash :
cfc4db34
Author :
Date :
2021-11-04T16:54:15
Metal: Provoking vertex support for Metal DrawArrays Add in provoking vertex rewrite support for drawArrays command, enabling 6 dEQP tests. GLES3/functional_rasterization_flatshading_line_loop GLES3/functional_rasterization_flatshading_line_strip GLES3/functional_rasterization_flatshading_lines GLES3/functional_rasterization_flatshading_triangle_fan GLES3/functional_rasterization_flatshading_triangle_strip GLES3/functional_rasterization_flatshading_triangles This patch adds a new shader to the Provoking Vertex helper that generates draw commands for all simple data types. Fix bug in provoking vertex helper that caused reused index buffers to suffer from allocation issues. Also fix Provoking vertex for triangle fan generation Bug: angleproject:5325 Change-Id: I7a1211dfcd99329868269ea0666eef1915d487b5 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3261635 Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Kenneth Russell <kbr@chromium.org> Commit-Queue: Kyle Piddington <kpiddington@apple.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318
//
// Copyright 2021 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// ProvokingVertexHelper.mm:
// Implements the class methods for ProvokingVertexHelper.
//
#include "libANGLE/renderer/metal/ProvokingVertexHelper.h"
#import <Foundation/Foundation.h>
#include "libANGLE/Display.h"
#include "libANGLE/renderer/metal/ContextMtl.h"
#include "libANGLE/renderer/metal/DisplayMtl.h"
#include "libANGLE/renderer/metal/mtl_common.h"
#include "libANGLE/renderer/metal/shaders/rewrite_indices_shared.h"
namespace rx
{
namespace
{
constexpr size_t kInitialIndexBufferSize = 0xFFFF; // Initial 64k pool.
}
static inline uint primCountForIndexCount(const uint fixIndexBufferKey, const uint indexCount)
{
const uint fixIndexBufferMode =
(fixIndexBufferKey >> MtlFixIndexBufferKeyModeShift) & MtlFixIndexBufferKeyModeMask;
switch (fixIndexBufferMode)
{
case MtlFixIndexBufferKeyPoints:
return indexCount;
case MtlFixIndexBufferKeyLines:
return indexCount / 2;
case MtlFixIndexBufferKeyLineStrip:
return (uint)MAX(0, (int)indexCount - 1);
case MtlFixIndexBufferKeyLineLoop:
return (uint)MAX(0, (int)indexCount);
case MtlFixIndexBufferKeyTriangles:
return indexCount / 3;
case MtlFixIndexBufferKeyTriangleStrip:
return (uint)MAX(0, (int)indexCount - 2);
case MtlFixIndexBufferKeyTriangleFan:
return (uint)MAX(0, (int)indexCount - 2);
default:
ASSERT(false);
return 0;
}
}
static inline uint indexCountForPrimCount(const uint fixIndexBufferKey, const uint primCount)
{
const uint fixIndexBufferMode =
(fixIndexBufferKey >> MtlFixIndexBufferKeyModeShift) & MtlFixIndexBufferKeyModeMask;
switch (fixIndexBufferMode)
{
case MtlFixIndexBufferKeyPoints:
return primCount;
case MtlFixIndexBufferKeyLines:
return primCount * 2;
case MtlFixIndexBufferKeyLineStrip:
return primCount * 2;
case MtlFixIndexBufferKeyLineLoop:
return primCount * 2;
case MtlFixIndexBufferKeyTriangles:
return primCount * 3;
case MtlFixIndexBufferKeyTriangleStrip:
return primCount * 3;
case MtlFixIndexBufferKeyTriangleFan:
return primCount * 3;
default:
ASSERT(false);
return 0;
}
}
static inline gl::PrimitiveMode getNewPrimitiveMode(const uint fixIndexBufferKey)
{
const uint fixIndexBufferMode =
(fixIndexBufferKey >> MtlFixIndexBufferKeyModeShift) & MtlFixIndexBufferKeyModeMask;
switch (fixIndexBufferMode)
{
case MtlFixIndexBufferKeyPoints:
return gl::PrimitiveMode::Points;
case MtlFixIndexBufferKeyLines:
return gl::PrimitiveMode::Lines;
case MtlFixIndexBufferKeyLineStrip:
return gl::PrimitiveMode::Lines;
case MtlFixIndexBufferKeyLineLoop:
return gl::PrimitiveMode::Lines;
case MtlFixIndexBufferKeyTriangles:
return gl::PrimitiveMode::Triangles;
case MtlFixIndexBufferKeyTriangleStrip:
return gl::PrimitiveMode::Triangles;
case MtlFixIndexBufferKeyTriangleFan:
return gl::PrimitiveMode::Triangles;
default:
ASSERT(false);
return gl::PrimitiveMode::InvalidEnum;
}
}
ProvokingVertexHelper::ProvokingVertexHelper(ContextMtl *context,
mtl::CommandQueue *commandQueue,
DisplayMtl *display)
: mCommandBuffer(commandQueue),
mIndexBuffers(false),
mPipelineCache(this),
mCurrentEncoder(&mCommandBuffer)
{
id<MTLLibrary> mtlLib = display->getDefaultShadersLib();
mProvokingVertexLibrary = mtlLib;
mIndexBuffers.initialize(context, kInitialIndexBufferSize, mtl::kIndexBufferOffsetAlignment, 0);
}
void ProvokingVertexHelper::onDestroy(ContextMtl *context)
{
mIndexBuffers.destroy(context);
mPipelineCache.clear();
}
void ProvokingVertexHelper::commitPreconditionCommandBuffer(ContextMtl *contextMtl)
{
if (mCurrentEncoder.valid())
{
mCurrentEncoder.endEncoding();
}
mCommandBuffer.commit(mtl::NoWait);
mIndexBuffers.releaseInFlightBuffers(contextMtl);
}
mtl::ComputeCommandEncoder *ProvokingVertexHelper::getComputeCommandEncoder()
{
if (mCurrentEncoder.valid())
{
return &mCurrentEncoder;
}
ensureCommandBufferReady();
return &mCurrentEncoder.restart();
}
void ProvokingVertexHelper::ensureCommandBufferReady()
{
if (!mCommandBuffer.ready())
{
mCommandBuffer.restart();
}
ASSERT(mCommandBuffer.ready());
}
static uint buildIndexBufferKey(const mtl::ProvokingVertexComputePipelineDesc &pipelineDesc)
{
uint indexBufferKey = 0;
gl::DrawElementsType elementType = (gl::DrawElementsType)pipelineDesc.elementType;
bool doPrimPrestart = pipelineDesc.primitiveRestartEnabled;
gl::PrimitiveMode primMode = pipelineDesc.primitiveMode;
switch (elementType)
{
case gl::DrawElementsType::UnsignedShort:
indexBufferKey |= MtlFixIndexBufferKeyUint16 << MtlFixIndexBufferKeyInShift;
indexBufferKey |= MtlFixIndexBufferKeyUint16 << MtlFixIndexBufferKeyOutShift;
break;
case gl::DrawElementsType::UnsignedInt:
indexBufferKey |= MtlFixIndexBufferKeyUint32 << MtlFixIndexBufferKeyInShift;
indexBufferKey |= MtlFixIndexBufferKeyUint32 << MtlFixIndexBufferKeyOutShift;
break;
default:
ASSERT(false); // Index type should only be short or int.
break;
}
indexBufferKey |= (uint)primMode << MtlFixIndexBufferKeyModeShift;
indexBufferKey |= doPrimPrestart ? MtlFixIndexBufferKeyPrimRestart : 0;
// We only rewrite indices if we're switching the provoking vertex mode.
indexBufferKey |= MtlFixIndexBufferKeyProvokingVertexLast;
return indexBufferKey;
}
bool ProvokingVertexHelper::hasSpecializedShader(
gl::ShaderType shaderType,
const mtl::ProvokingVertexComputePipelineDesc &renderPipelineDesc)
{
return true;
}
angle::Result ProvokingVertexHelper::getSpecializedShader(
rx::mtl::Context *context,
gl::ShaderType shaderType,
const mtl::ProvokingVertexComputePipelineDesc &pipelineDesc,
id<MTLFunction> *shaderOut)
{
uint indexBufferKey = buildIndexBufferKey(pipelineDesc);
auto fcValues = mtl::adoptObjCObj([[MTLFunctionConstantValues alloc] init]);
[fcValues setConstantValue:&indexBufferKey type:MTLDataTypeUInt withName:@"fixIndexBufferKey"];
if (pipelineDesc.generateIndices)
{
return CreateMslShader(context, mProvokingVertexLibrary, @"genIndexBuffer", fcValues.get(),
shaderOut);
}
else
{
return CreateMslShader(context, mProvokingVertexLibrary, @"fixIndexBuffer", fcValues.get(),
shaderOut);
}
}
void ProvokingVertexHelper::prepareCommandEncoderForDescriptor(
ContextMtl *context,
mtl::ComputeCommandEncoder *encoder,
mtl::ProvokingVertexComputePipelineDesc desc)
{
auto pipelineState = mPipelineCache.getComputePipelineState(context, desc);
encoder->setComputePipelineState(pipelineState);
mCachedDesc = desc;
}
mtl::BufferRef ProvokingVertexHelper::preconditionIndexBuffer(ContextMtl *context,
mtl::BufferRef indexBuffer,
size_t indexCount,
size_t indexOffset,
bool primitiveRestartEnabled,
gl::PrimitiveMode primitiveMode,
gl::DrawElementsType elementsType,
size_t &outIndexCount,
size_t &outIndexOffset,
gl::PrimitiveMode &outPrimitiveMode)
{
// Get specialized program
// Upload index buffer
// dispatch per-primitive?
ensureCommandBufferReady();
mtl::ProvokingVertexComputePipelineDesc pipelineDesc;
pipelineDesc.elementType = (uint8_t)elementsType;
pipelineDesc.primitiveMode = primitiveMode;
pipelineDesc.primitiveRestartEnabled = primitiveRestartEnabled;
pipelineDesc.generateIndices = false;
uint indexBufferKey = buildIndexBufferKey(pipelineDesc);
uint primCount = primCountForIndexCount(indexBufferKey, (uint32_t)indexCount);
uint newIndexCount = indexCountForPrimCount(indexBufferKey, primCount);
size_t indexSize = gl::GetDrawElementsTypeSize(elementsType);
size_t newOffset = 0;
mtl::BufferRef newBuffer;
if (mIndexBuffers.allocate(context, newIndexCount * indexSize + indexOffset, nullptr,
&newBuffer, &newOffset) == angle::Result::Stop)
{
return nullptr;
}
uint indexCountEncoded = (uint)indexCount;
auto threadsPerThreadgroup = MTLSizeMake(MIN(primCount, 64u), 1, 1);
mtl::ComputeCommandEncoder *encoder = getComputeCommandEncoder();
prepareCommandEncoderForDescriptor(context, encoder, pipelineDesc);
encoder->setBuffer(indexBuffer, static_cast<uint32_t>(indexOffset), 0);
encoder->setBufferForWrite(
newBuffer, static_cast<uint32_t>(indexOffset) + static_cast<uint32_t>(newOffset), 1);
encoder->setData(&indexCountEncoded, 2);
encoder->setData(&primCount, 3);
encoder->dispatch(
MTLSizeMake((primCount + threadsPerThreadgroup.width - 1) / threadsPerThreadgroup.width, 1,
1),
threadsPerThreadgroup);
outIndexCount = newIndexCount;
outIndexOffset = newOffset;
outPrimitiveMode = getNewPrimitiveMode(indexBufferKey);
return newBuffer;
}
mtl::BufferRef ProvokingVertexHelper::generateIndexBuffer(ContextMtl *context,
size_t first,
size_t indexCount,
gl::PrimitiveMode primitiveMode,
gl::DrawElementsType elementsType,
size_t &outIndexCount,
size_t &outIndexOffset,
gl::PrimitiveMode &outPrimitiveMode)
{
// Get specialized program
// Upload index buffer
// dispatch per-primitive?
ensureCommandBufferReady();
mtl::ProvokingVertexComputePipelineDesc pipelineDesc;
pipelineDesc.elementType = (uint8_t)elementsType;
pipelineDesc.primitiveMode = primitiveMode;
pipelineDesc.primitiveRestartEnabled = false;
pipelineDesc.generateIndices = true;
uint indexBufferKey = buildIndexBufferKey(pipelineDesc);
uint primCount = primCountForIndexCount(indexBufferKey, (uint32_t)indexCount);
uint newIndexCount = indexCountForPrimCount(indexBufferKey, primCount);
size_t indexSize = gl::GetDrawElementsTypeSize(elementsType);
size_t newIndexOffset = 0;
mtl::BufferRef newBuffer;
if (mIndexBuffers.allocate(context, newIndexCount * indexSize, nullptr, &newBuffer,
&newIndexOffset) == angle::Result::Stop)
{
return nullptr;
}
uint indexCountEncoded = static_cast<uint>(indexCount);
uint firstVertexEncoded = static_cast<uint>(first);
uint indexOffsetEncoded = static_cast<uint>(newIndexOffset);
auto threadsPerThreadgroup = MTLSizeMake(MIN(primCount, 64u), 1, 1);
mtl::ComputeCommandEncoder *encoder = getComputeCommandEncoder();
prepareCommandEncoderForDescriptor(context, encoder, pipelineDesc);
encoder->setBufferForWrite(newBuffer, indexOffsetEncoded, 1);
encoder->setData(indexCountEncoded, 2);
encoder->setData(primCount, 3);
encoder->setData(firstVertexEncoded, 4);
encoder->dispatch(
MTLSizeMake((primCount + threadsPerThreadgroup.width - 1) / threadsPerThreadgroup.width, 1,
1),
threadsPerThreadgroup);
outIndexCount = newIndexCount;
outIndexOffset = newIndexOffset;
outPrimitiveMode = getNewPrimitiveMode(indexBufferKey);
return newBuffer;
}
} // namespace rx