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
//
// Copyright 2019 The ANGLE Project. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
#include "common.h"
using namespace rx::mtl_shader;
// function_constant(0) is already used by common.h
constant bool kSourceBufferAligned[[function_constant(100)]];
constant bool kSourceIndexIsU8[[function_constant(200)]];
constant bool kSourceIndexIsU16[[function_constant(300)]];
constant bool kSourceIndexIsU32[[function_constant(400)]];
constant bool kSourceBufferUnaligned = !kSourceBufferAligned;
constant bool kUseSourceBufferU8 = kSourceIndexIsU8 || kSourceBufferUnaligned;
constant bool kUseSourceBufferU16 = kSourceIndexIsU16 && kSourceBufferAligned;
constant bool kUseSourceBufferU32 = kSourceIndexIsU32 && kSourceBufferAligned;
struct IndexConversionParams
{
uint32_t srcOffset; // offset in bytes
uint32_t indexCount;
bool primitiveRestartEnabled;
};
#define ANGLE_IDX_CONVERSION_GUARD(IDX, OPTS) ANGLE_KERNEL_GUARD(IDX, OPTS.indexCount)
inline ushort getIndexAligned(constant ushort *inputAligned, uint offset, uint idx)
{
return inputAligned[offset / 2 + idx];
}
inline uint getIndexAligned(constant uint *inputAligned, uint offset, uint idx)
{
return inputAligned[offset / 4 + idx];
}
inline uchar getIndexAligned(constant uchar *input, uint offset, uint idx)
{
return input[offset + idx];
}
inline ushort getIndexUnalignedU16(constant uchar *input, uint offset, uint idx)
{
ushort inputLo = input[offset + 2 * idx];
ushort inputHi = input[offset + 2 * idx + 1];
// Little endian conversion:
return inputLo | (inputHi << 8);
}
inline uint getIndexUnalignedU32(constant uchar *input, uint offset, uint idx)
{
uint input0 = input[offset + 4 * idx];
uint input1 = input[offset + 4 * idx + 1];
uint input2 = input[offset + 4 * idx + 2];
uint input3 = input[offset + 4 * idx + 3];
// Little endian conversion:
return input0 | (input1 << 8) | (input2 << 16) | (input3 << 24);
}
kernel void convertIndexU8ToU16(uint idx [[thread_position_in_grid]],
constant IndexConversionParams &options [[buffer(0)]],
constant uchar *input [[buffer(1)]],
device ushort *output [[buffer(2)]])
{
ANGLE_IDX_CONVERSION_GUARD(idx, options);
uchar value = getIndexAligned(input, options.srcOffset, idx);
if (options.primitiveRestartEnabled && value == 0xff)
{
output[idx] = 0xffff;
}
else
{
output[idx] = value;
}
}
kernel void convertIndexU16(uint idx [[thread_position_in_grid]],
constant IndexConversionParams &options [[buffer(0)]],
constant uchar *input
[[buffer(1), function_constant(kSourceBufferUnaligned)]],
constant ushort *inputAligned
[[buffer(1), function_constant(kSourceBufferAligned)]],
device ushort *output [[buffer(2)]])
{
ANGLE_IDX_CONVERSION_GUARD(idx, options);
ushort value;
if (kSourceBufferAligned)
{
value = getIndexAligned(inputAligned, options.srcOffset, idx);
}
else
{
value = getIndexUnalignedU16(input, options.srcOffset, idx);
}
output[idx] = value;
}
kernel void convertIndexU32(uint idx [[thread_position_in_grid]],
constant IndexConversionParams &options [[buffer(0)]],
constant uchar *input
[[buffer(1), function_constant(kSourceBufferUnaligned)]],
constant uint *inputAligned
[[buffer(1), function_constant(kSourceBufferAligned)]],
device uint *output [[buffer(2)]])
{
ANGLE_IDX_CONVERSION_GUARD(idx, options);
uint value;
if (kSourceBufferAligned)
{
value = getIndexAligned(inputAligned, options.srcOffset, idx);
}
else
{
value = getIndexUnalignedU32(input, options.srcOffset, idx);
}
output[idx] = value;
}
struct IndexFromArrayParams
{
uint firstVertex;
// For triangle fan: vertex count excluding the 1st & 2nd vertices.
uint vertexCount;
};
// Generate triangle fan indices for glDrawArray()
kernel void genTriFanIndicesFromArray(uint idx [[thread_position_in_grid]],
constant IndexFromArrayParams &options [[buffer(0)]],
device uint *output [[buffer(2)]])
{
ANGLE_KERNEL_GUARD(idx, options.vertexCount);
uint vertexIdx = options.firstVertex + 2 + idx;
// Triangle fan provoking vertex by default is i+1, not pivot
// vertex.
output[3 * idx ] = vertexIdx - 1;
output[3 * idx + 1] = vertexIdx;
output[3 * idx + 2] = options.firstVertex;
}
inline uint getIndexU32(uint offset,
uint idx,
constant uchar *inputU8 [[function_constant(kUseSourceBufferU8)]],
constant ushort *inputU16 [[function_constant(kUseSourceBufferU16)]],
constant uint *inputU32 [[function_constant(kUseSourceBufferU32)]])
{
if (kUseSourceBufferU8)
{
if (kSourceIndexIsU16)
{
return getIndexUnalignedU16(inputU8, offset, idx);
}
else if (kSourceIndexIsU32)
{
return getIndexUnalignedU32(inputU8, offset, idx);
}
return getIndexAligned(inputU8, offset, idx);
}
else if (kUseSourceBufferU16)
{
return getIndexAligned(inputU16, offset, idx);
}
else if (kUseSourceBufferU32)
{
return getIndexAligned(inputU32, offset, idx);
}
return 0;
}
// NOTE(hqle): triangle fan indices generation doesn't support primitive restart.
// Generate triangle fan indices from an indices buffer. indexCount options indicates number
// of indices starting from the 3rd.
kernel void genTriFanIndicesFromElements(uint idx [[thread_position_in_grid]],
constant IndexConversionParams &options [[buffer(0)]],
constant uchar *inputU8
[[buffer(1), function_constant(kUseSourceBufferU8)]],
constant ushort *inputU16
[[buffer(1), function_constant(kUseSourceBufferU16)]],
constant uint *inputU32
[[buffer(1), function_constant(kUseSourceBufferU32)]],
device uint *output [[buffer(2)]])
{
ANGLE_IDX_CONVERSION_GUARD(idx, options);
uint elemIdx = 2 + idx;
output[3 * idx] = getIndexU32(options.srcOffset, 0, inputU8, inputU16, inputU32);
output[3 * idx + 1] = getIndexU32(options.srcOffset, elemIdx - 1, inputU8, inputU16, inputU32);
output[3 * idx + 2] = getIndexU32(options.srcOffset, elemIdx, inputU8, inputU16, inputU32);
}
// Generate line loop indices for glDrawArray()
kernel void genLineLoopIndicesFromArray(uint idx [[thread_position_in_grid]],
constant IndexFromArrayParams &options [[buffer(0)]],
device uint *output [[buffer(2)]])
{
uint totalIndices = options.vertexCount + 1;
ANGLE_KERNEL_GUARD(idx, totalIndices);
output[idx] = options.firstVertex + idx % options.vertexCount;
}
// NOTE(hqle): lineloop indices generation doesn't support primitive restart.
// Generate line loop indices for glDrawElements()
kernel void genLineLoopIndicesFromElements(uint idx [[thread_position_in_grid]],
constant IndexConversionParams &options [[buffer(0)]],
constant uchar *inputU8
[[buffer(1), function_constant(kUseSourceBufferU8)]],
constant ushort *inputU16
[[buffer(1), function_constant(kUseSourceBufferU16)]],
constant uint *inputU32
[[buffer(1), function_constant(kUseSourceBufferU32)]],
device uint *output [[buffer(2)]])
{
uint totalTargetIndices = options.indexCount + 1;
ANGLE_KERNEL_GUARD(idx, totalTargetIndices);
output[idx] =
getIndexU32(options.srcOffset, idx % options.indexCount, inputU8, inputU16, inputU32);
}