Hash :
da3db87e
Author :
Date :
2021-07-06T14:00:58
Upstream latest changes to Metal backend from Apple to 7/1/2021 This CL merges in the ANGLE changes between these two WebKit commits: https://git.webkit.org/?p=WebKit.git;a=commit;h=8648b353ab1d7730438c2e08319e1a4d64982c31 https://git.webkit.org/?p=WebKit.git;a=commit;h=166e4924a52971d6a32ad48247a439b16c00e062 Include provoking vertex buffer out of bounds fix from https://bugs.webkit.org/show_bug.cgi?id=230107 Fix bad merge of resetting of dirty bits, breaking DepthStencilFormatsTest.DepthTextureRender test and perhaps others. Disable GL_APPLE_clip_distance when the direct-to-Metal compiler is active. It can not yet handle the gl_ClipDistance array. Disable use of rectangular textures for IOSurfaces. Metal can bind IOSurfaces to 2D textures, and this was passing all tests in the SPIR-V Metal backend. Introducing rectangular textures breaks the SPIR-V Metal backend, and the tests currently fail on the direct-to-Metal backend. Fix several bugs with ProvokingVertex, which was causing both the SpirV and Direct backends to incorrectly draw indices. (https://bugs.webkit.org/show_bug.cgi?id=230107) Skip the following tests on the Metal backend which is still failing RobustResourceInitTestES3.BlitDepthStencilAfterClearBuffer GLSLTest_ES3.GLVertexIDIntegerTextureDrawArrays/ES3_Metal With these changes, angle_end2end_tests again runs to completion. Bug: angleproject:6395 Change-Id: I3cc58f531426a95fc8f177a4ad87f56c1855a546 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3167010 Reviewed-by: Jonah Ryan-Davis <jonahr@google.com> 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
//
// Copyright 2019 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.
//
// VertexArrayMtl.h:
// Defines the class interface for VertexArrayMtl, implementing VertexArrayImpl.
//
#ifndef LIBANGLE_RENDERER_METAL_VERTEXARRAYMTL_H_
#define LIBANGLE_RENDERER_METAL_VERTEXARRAYMTL_H_
#include "libANGLE/renderer/VertexArrayImpl.h"
#include "libANGLE/renderer/metal/BufferMtl.h"
#include "libANGLE/renderer/metal/mtl_buffer_pool.h"
#include "libANGLE/renderer/metal/mtl_command_buffer.h"
#include "libANGLE/renderer/metal/mtl_format_utils.h"
#include "libANGLE/renderer/metal/mtl_resources.h"
namespace rx
{
class ContextMtl;
class VertexArrayMtl : public VertexArrayImpl
{
public:
VertexArrayMtl(const gl::VertexArrayState &state, ContextMtl *context);
~VertexArrayMtl() override;
void destroy(const gl::Context *context) override;
angle::Result syncState(const gl::Context *context,
const gl::VertexArray::DirtyBits &dirtyBits,
gl::VertexArray::DirtyAttribBitsArray *attribBits,
gl::VertexArray::DirtyBindingBitsArray *bindingBits) override;
// Feed client side's vertex/index data
angle::Result updateClientAttribs(const gl::Context *context,
GLint firstVertex,
GLsizei vertexOrIndexCount,
GLsizei instanceCount,
gl::DrawElementsType indexTypeOrInvalid,
const void *indices);
// vertexDescChanged is both input and output, the input value if is true, will force new
// mtl::VertexDesc to be returned via vertexDescOut. This typically happens when active shader
// program is changed.
// Otherwise, it is only returned when the vertex array is dirty.
angle::Result setupDraw(const gl::Context *glContext,
mtl::RenderCommandEncoder *cmdEncoder,
bool *vertexDescChanged,
mtl::VertexDesc *vertexDescOut);
angle::Result getIndexBuffer(const gl::Context *glContext,
gl::DrawElementsType indexType,
size_t indexCount,
const void *sourcePointer,
mtl::BufferRef *idxBufferOut,
size_t *idxBufferOffsetOut,
gl::DrawElementsType *indexTypeOut);
std::vector<DrawCommandRange> getDrawIndices(const gl::Context *glContext,
gl::DrawElementsType originalIndexType,
gl::DrawElementsType indexType,
gl::PrimitiveMode primitiveMode,
mtl::BufferRef idxBuffer,
uint32_t indexCount,
size_t offset);
private:
void reset(ContextMtl *context);
void getVertexAttribFormatAndArraySize(const sh::ShaderVariable &var,
MTLVertexFormat *formatOut,
uint32_t *arraySizeOut);
angle::Result syncDirtyAttrib(const gl::Context *glContext,
const gl::VertexAttribute &attrib,
const gl::VertexBinding &binding,
size_t attribIndex);
angle::Result convertIndexBuffer(const gl::Context *glContext,
gl::DrawElementsType indexType,
size_t offset,
mtl::BufferRef *idxBufferOut,
size_t *idxBufferOffsetOut);
angle::Result streamIndexBufferFromClient(const gl::Context *glContext,
gl::DrawElementsType indexType,
size_t indexCount,
const void *sourcePointer,
mtl::BufferRef *idxBufferOut,
size_t *idxBufferOffsetOut);
angle::Result convertIndexBufferGPU(const gl::Context *glContext,
gl::DrawElementsType indexType,
BufferMtl *idxBuffer,
size_t offset,
size_t indexCount,
IndexConversionBufferMtl *conversion);
angle::Result convertVertexBuffer(const gl::Context *glContext,
BufferMtl *srcBuffer,
const gl::VertexBinding &binding,
size_t attribIndex,
const mtl::VertexFormat &vertexFormat);
angle::Result convertVertexBufferCPU(ContextMtl *contextMtl,
BufferMtl *srcBuffer,
const gl::VertexBinding &binding,
size_t attribIndex,
const mtl::VertexFormat &convertedFormat,
GLuint targetStride,
size_t vertexCount,
ConversionBufferMtl *conversion);
angle::Result convertVertexBufferGPU(const gl::Context *glContext,
BufferMtl *srcBuffer,
const gl::VertexBinding &binding,
size_t attribIndex,
const mtl::VertexFormat &convertedFormat,
GLuint targetStride,
size_t vertexCount,
bool isExpandingComponents,
ConversionBufferMtl *conversion);
// These can point to real BufferMtl or converted buffer in mConvertedArrayBufferHolders
gl::AttribArray<BufferHolderMtl *> mCurrentArrayBuffers;
gl::AttribArray<SimpleWeakBufferHolderMtl> mConvertedArrayBufferHolders;
gl::AttribArray<size_t> mCurrentArrayBufferOffsets;
// Size to be uploaded as inline constant data. Used for client vertex attribute's data that
// is small enough that we can send directly as inline constant data instead of streaming
// through a buffer.
gl::AttribArray<size_t> mCurrentArrayInlineDataSizes;
// Array of host buffers storing converted data for client attributes that are small enough.
gl::AttribArray<angle::MemoryBuffer> mConvertedClientSmallArrays;
gl::AttribArray<const uint8_t *> mCurrentArrayInlineDataPointers;
// Max size of inline constant data that can be used for client vertex attribute.
size_t mInlineDataMaxSize;
// Stride per vertex attribute
gl::AttribArray<GLuint> mCurrentArrayBufferStrides;
// Format per vertex attribute
gl::AttribArray<const mtl::VertexFormat *> mCurrentArrayBufferFormats;
const mtl::VertexFormat &mDefaultFloatVertexFormat;
const mtl::VertexFormat &mDefaultIntVertexFormat;
const mtl::VertexFormat &mDefaultUIntVertexFormat;
mtl::BufferPool mDynamicVertexData;
mtl::BufferPool mDynamicIndexData;
std::vector<uint32_t> mEmulatedInstanceAttribs;
bool mVertexArrayDirty = true;
};
} // namespace rx
#endif /* LIBANGLE_RENDERER_METAL_VERTEXARRAYMTL_H_ */