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 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462
//
// 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.
//
// rewrite_indices.metal:
// Contains utility methods for rewriting indices for provoking vertex usecases.
//
#include "common.h"
#include "rewrite_indices_shared.h"
using namespace metal;
constant uint fixIndexBufferKey [[ function_constant(2000) ]];
constant bool indexBufferIsUint16 = (((fixIndexBufferKey >> MtlFixIndexBufferKeyInShift) & MtlFixIndexBufferKeyTypeMask) == MtlFixIndexBufferKeyUint16);
constant bool indexBufferIsUint32 = (((fixIndexBufferKey >> MtlFixIndexBufferKeyInShift) & MtlFixIndexBufferKeyTypeMask) == MtlFixIndexBufferKeyUint32);
constant bool outIndexBufferIsUint16 = (((fixIndexBufferKey >> MtlFixIndexBufferKeyOutShift) & MtlFixIndexBufferKeyTypeMask) == MtlFixIndexBufferKeyUint16);
constant bool outIndexBufferIsUint32 = (((fixIndexBufferKey >> MtlFixIndexBufferKeyOutShift) & MtlFixIndexBufferKeyTypeMask) == MtlFixIndexBufferKeyUint32);
constant bool doPrimRestart = (fixIndexBufferKey & MtlFixIndexBufferKeyPrimRestart);
constant uint fixIndexBufferMode = (fixIndexBufferKey >> MtlFixIndexBufferKeyModeShift) & MtlFixIndexBufferKeyModeMask;
static inline uint readIdx(
const device ushort *indexBufferUint16,
const device uint *indexBufferUint32,
const uint restartIndex,
const uint indexCount,
uint idx,
thread bool &foundRestart,
thread uint &indexThatRestartedFirst
)
{
uint inIndex = idx;
if(inIndex < indexCount)
{
if(indexBufferIsUint16)
{
inIndex = indexBufferUint16[inIndex];
}
else if(indexBufferIsUint32)
{
inIndex = indexBufferUint32[inIndex];
}
}
else
{
foundRestart = true;
indexThatRestartedFirst = idx;
}
if(doPrimRestart && !foundRestart && inIndex == restartIndex)
{
foundRestart = true;
indexThatRestartedFirst = idx;
}
return inIndex;
}
static inline void outputPrimitive(
const device ushort *indexBufferUint16,
const device uint *indexBufferUint32,
device ushort *outIndexBufferUint16,
device uint *outIndexBufferUint32,
const uint restartIndex,
const uint indexCount,
thread uint &baseIndex,
uint onIndex,
thread uint &onOutIndex
)
{
if(baseIndex > onIndex) return; // skipped indices while processing
bool foundRestart = false;
uint indexThatRestartedFirst = 0;
#define READ_IDX(_idx) readIdx(indexBufferUint16, indexBufferUint32, restartIndex, indexCount, _idx, foundRestart, indexThatRestartedFirst)
#define WRITE_IDX(_idx, _val) \
({ \
if(outIndexBufferIsUint16) \
{ \
outIndexBufferUint16[(_idx)] = _val; \
} \
if(outIndexBufferIsUint32) \
{ \
outIndexBufferUint32[(_idx)] = _val; \
} \
_idx++; \
})
switch(fixIndexBufferMode)
{
case MtlFixIndexBufferKeyPoints:
{
auto tmpIndex = READ_IDX(onIndex);
if(foundRestart)
{
baseIndex = indexThatRestartedFirst + 1;
return;
}
WRITE_IDX(onOutIndex, tmpIndex);
}
break;
case MtlFixIndexBufferKeyLines:
{
auto tmpIndex0 = READ_IDX(onIndex + 0);
auto tmpIndex1 = READ_IDX(onIndex + 1);
if(foundRestart)
{
baseIndex = indexThatRestartedFirst + 1;
return;
}
if((onIndex - baseIndex) & 1) return; // skip this index...
if(fixIndexBufferKey & MtlFixIndexBufferKeyProvokingVertexLast)
{
WRITE_IDX(onOutIndex, tmpIndex1);
WRITE_IDX(onOutIndex, tmpIndex0);
}
else
{
WRITE_IDX(onOutIndex, tmpIndex0);
WRITE_IDX(onOutIndex, tmpIndex1);
}
}
break;
case MtlFixIndexBufferKeyLineStrip:
{
auto tmpIndex0 = READ_IDX(onIndex + 0);
auto tmpIndex1 = READ_IDX(onIndex + 1);
if(foundRestart)
{
baseIndex = indexThatRestartedFirst + 1;
return;
}
if(fixIndexBufferKey & MtlFixIndexBufferKeyProvokingVertexLast)
{
WRITE_IDX(onOutIndex, tmpIndex1);
WRITE_IDX(onOutIndex, tmpIndex0);
}
else
{
WRITE_IDX(onOutIndex, tmpIndex0);
WRITE_IDX(onOutIndex, tmpIndex1);
}
}
break;
case MtlFixIndexBufferKeyTriangles:
{
auto tmpIndex0 = READ_IDX(onIndex + 0);
auto tmpIndex1 = READ_IDX(onIndex + 1);
auto tmpIndex2 = READ_IDX(onIndex + 2);
if(foundRestart)
{
baseIndex = indexThatRestartedFirst + 1;
return;
}
if(((onIndex - baseIndex) % 3) != 0) return; // skip this index...
if(fixIndexBufferKey & MtlFixIndexBufferKeyProvokingVertexLast)
{
WRITE_IDX(onOutIndex, tmpIndex2);
WRITE_IDX(onOutIndex, tmpIndex0);
WRITE_IDX(onOutIndex, tmpIndex1);
}
else
{
WRITE_IDX(onOutIndex, tmpIndex0);
WRITE_IDX(onOutIndex, tmpIndex1);
WRITE_IDX(onOutIndex, tmpIndex2);
}
}
break;
case MtlFixIndexBufferKeyTriangleStrip:
{
uint isOdd = ((onIndex - baseIndex) & 1); // fixes winding (but not provoking...)
auto tmpIndex0 = READ_IDX(onIndex + 0 + isOdd);
auto tmpIndex1 = READ_IDX(onIndex + 1 - isOdd);
auto tmpIndex2 = READ_IDX(onIndex + 2);
if(foundRestart)
{
baseIndex = indexThatRestartedFirst + 1;
return;
}
if(fixIndexBufferKey & MtlFixIndexBufferKeyProvokingVertexLast)
{
WRITE_IDX(onOutIndex, tmpIndex2); // 2 is always the provoking vertex .: do not need to do anything special with isOdd
WRITE_IDX(onOutIndex, tmpIndex0);
WRITE_IDX(onOutIndex, tmpIndex1);
}
else
{
// NOTE: this case is trivially supported in Metal
if(isOdd)
{
WRITE_IDX(onOutIndex, tmpIndex1); // in the case of odd this is REALLY (onIndex + 0) // provoking vertex
WRITE_IDX(onOutIndex, tmpIndex2);
WRITE_IDX(onOutIndex, tmpIndex0);
}
else
{
WRITE_IDX(onOutIndex, tmpIndex0); // in the case of even this is (onIndex + 0) // provoking vertex
WRITE_IDX(onOutIndex, tmpIndex1);
WRITE_IDX(onOutIndex, tmpIndex2);
}
}
// assert never worse that worst-case expansion
assert(onOutIndex <= (onIndex + 1) * 3);
assert(onOutIndex <= (indexCount - 2) * 3);
}
break;
}
#undef READ_IDX
#undef WRITE_IDX
}
kernel void fixIndexBuffer(
const device ushort *indexBufferUint16 [[ buffer(0), function_constant(indexBufferIsUint16) ]],
const device uint *indexBufferUint32 [[ buffer(0), function_constant(indexBufferIsUint32) ]],
device ushort *outIndexBufferUint16 [[ buffer(1), function_constant(outIndexBufferIsUint16) ]],
device uint *outIndexBufferUint32 [[ buffer(1), function_constant(outIndexBufferIsUint32) ]],
constant uint &indexCount [[ buffer(2) ]],
constant uint &primCount [[ buffer(3) ]],
uint prim [[thread_position_in_grid]])
{
constexpr uint restartIndex = 0xFFFFFFFF; // unused
uint baseIndex = 0;
uint onIndex = onIndex;
uint onOutIndex = onOutIndex;
if(prim < primCount)
{
switch(fixIndexBufferMode)
{
case MtlFixIndexBufferKeyPoints:
onIndex = prim;
onOutIndex = prim;
break;
case MtlFixIndexBufferKeyLines:
onIndex = prim * 2;
onOutIndex = prim * 2;
break;
case MtlFixIndexBufferKeyLineStrip:
onIndex = prim;
onOutIndex = prim * 2;
break;
case MtlFixIndexBufferKeyTriangles:
onIndex = prim * 3;
onOutIndex = prim * 3;
break;
case MtlFixIndexBufferKeyTriangleStrip:
onIndex = prim;
onOutIndex = prim * 3;
break;
}
outputPrimitive(indexBufferUint16, indexBufferUint32, outIndexBufferUint16, outIndexBufferUint32, restartIndex, indexCount, baseIndex, onIndex, onOutIndex);
}
}
static inline void generatePrimitive(
device ushort *outIndexBufferUint16,
device uint *outIndexBufferUint32,
const uint firstVertex,
const uint indexCount,
thread uint &baseIndex,
uint onIndex,
uint primCount,
thread uint &onOutIndex
)
{
if(baseIndex > onIndex) return; // skipped indices while processing
#define WRITE_IDX(_idx, _val) \
({ \
if(outIndexBufferIsUint16) \
{ \
outIndexBufferUint16[(_idx)] = _val + firstVertex; \
} \
if(outIndexBufferIsUint32) \
{ \
outIndexBufferUint32[(_idx)] = _val + firstVertex; \
} \
_idx++; \
})
switch(fixIndexBufferMode)
{
case MtlFixIndexBufferKeyPoints:
{
WRITE_IDX(onOutIndex, onIndex);
}
break;
case MtlFixIndexBufferKeyLines:
{
auto tmpIndex0 = onIndex + 0;
auto tmpIndex1 = onIndex + 1;
if(fixIndexBufferKey & MtlFixIndexBufferKeyProvokingVertexLast)
{
WRITE_IDX(onOutIndex, tmpIndex1);
WRITE_IDX(onOutIndex, tmpIndex0);
}
else
{
WRITE_IDX(onOutIndex, tmpIndex0);
WRITE_IDX(onOutIndex, tmpIndex1);
}
}
break;
case MtlFixIndexBufferKeyLineLoop:
{
auto tmpIndex0 = onIndex + 0;
auto tmpIndex1 = (onIndex + 1) % primCount;
if(fixIndexBufferKey & MtlFixIndexBufferKeyProvokingVertexLast)
{
WRITE_IDX(onOutIndex, tmpIndex1);
WRITE_IDX(onOutIndex, tmpIndex0);
}
else
{
WRITE_IDX(onOutIndex, tmpIndex0);
WRITE_IDX(onOutIndex, tmpIndex1);
}
}
break;
case MtlFixIndexBufferKeyLineStrip:
{
auto tmpIndex0 = onIndex + 0;
auto tmpIndex1 = onIndex + 1;
if(fixIndexBufferKey & MtlFixIndexBufferKeyProvokingVertexLast)
{
WRITE_IDX(onOutIndex, tmpIndex1);
WRITE_IDX(onOutIndex, tmpIndex0);
}
else
{
WRITE_IDX(onOutIndex, tmpIndex0);
WRITE_IDX(onOutIndex, tmpIndex1);
}
}
break;
case MtlFixIndexBufferKeyTriangles:
{
auto tmpIndex0 = onIndex + 0;
auto tmpIndex1 = onIndex + 1;
auto tmpIndex2 = onIndex + 2;
if(fixIndexBufferKey & MtlFixIndexBufferKeyProvokingVertexLast)
{
WRITE_IDX(onOutIndex, tmpIndex2);
WRITE_IDX(onOutIndex, tmpIndex0);
WRITE_IDX(onOutIndex, tmpIndex1);
}
else
{
WRITE_IDX(onOutIndex, tmpIndex0);
WRITE_IDX(onOutIndex, tmpIndex1);
WRITE_IDX(onOutIndex, tmpIndex2);
}
}
break;
case MtlFixIndexBufferKeyTriangleStrip:
{
uint isOdd = ((onIndex - baseIndex) & 1); // fixes winding. provoking fixed later.
auto tmpIndex0 = onIndex + 0 + isOdd;
auto tmpIndex1 = onIndex + 1 - isOdd;
auto tmpIndex2 = onIndex + 2;
if(fixIndexBufferKey & MtlFixIndexBufferKeyProvokingVertexLast)
{
WRITE_IDX(onOutIndex, tmpIndex2); // 2 is always the provoking vertex .: do not need to do anything special with isOdd
WRITE_IDX(onOutIndex, tmpIndex0);
WRITE_IDX(onOutIndex, tmpIndex1);
}
else
{
if(isOdd)
{
WRITE_IDX(onOutIndex, tmpIndex1); // in the case of odd this is REALLY (onIndex + 0) // provoking vertex
WRITE_IDX(onOutIndex, tmpIndex2);
WRITE_IDX(onOutIndex, tmpIndex0);
}
else
{
WRITE_IDX(onOutIndex, tmpIndex0); // in the case of even this is (onIndex + 0) // provoking vertex
WRITE_IDX(onOutIndex, tmpIndex1);
WRITE_IDX(onOutIndex, tmpIndex2);
}
}
// assert never worse that worst-case expansion
assert(onOutIndex <= (onIndex + 1) * 3);
assert(onOutIndex <= (indexCount - 2) * 3);
break;
}
case MtlFixIndexBufferKeyTriangleFan:
{
auto tmpIndex0 = 0;
auto tmpIndex1 = onIndex + 1;
auto tmpIndex2 = onIndex + 2;
// Provoking Vertex for triangle fans does not use the pivot index for flat shading data.
if(fixIndexBufferKey & MtlFixIndexBufferKeyProvokingVertexLast)
{
WRITE_IDX(onOutIndex, tmpIndex2);
WRITE_IDX(onOutIndex, tmpIndex0);
WRITE_IDX(onOutIndex, tmpIndex1);
}
else
{
WRITE_IDX(onOutIndex, tmpIndex1);
WRITE_IDX(onOutIndex, tmpIndex2);
WRITE_IDX(onOutIndex, tmpIndex0);
}
}
break;
}
#undef WRITE_IDX
}
kernel void genIndexBuffer(
device ushort *outIndexBufferUint16 [[ buffer(1), function_constant(outIndexBufferIsUint16) ]],
device uint *outIndexBufferUint32 [[ buffer(1), function_constant(outIndexBufferIsUint32) ]],
constant uint &indexCount [[ buffer(2) ]],
constant uint &primCount [[ buffer(3) ]],
constant uint &firstVertex [[ buffer(4) ]],
uint prim [[thread_position_in_grid]])
{
uint baseIndex = 0;
uint onIndex = onIndex;
uint onOutIndex = onOutIndex;
if(prim < primCount)
{
switch(fixIndexBufferMode)
{
case MtlFixIndexBufferKeyPoints:
onIndex = prim;
onOutIndex = prim;
break;
case MtlFixIndexBufferKeyLines:
onIndex = prim * 2;
onOutIndex = prim * 2;
break;
case MtlFixIndexBufferKeyLineStrip:
onIndex = prim;
onOutIndex = prim * 2;
break;
case MtlFixIndexBufferKeyLineLoop:
onIndex = prim;
onOutIndex = prim * 2;
break;
case MtlFixIndexBufferKeyTriangles:
onIndex = prim * 3;
onOutIndex = prim * 3;
break;
case MtlFixIndexBufferKeyTriangleStrip:
onIndex = prim;
onOutIndex = prim * 3;
break;
case MtlFixIndexBufferKeyTriangleFan:
onIndex = prim;
onOutIndex = prim * 3;
break;
}
generatePrimitive(outIndexBufferUint16, outIndexBufferUint32, firstVertex, indexCount, baseIndex, onIndex, primCount, onOutIndex);
}
}