Skip to content

Commit

Permalink
Update ANGLE changes.diff after 266451@main
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=259683
rdar://113200380

Unreviewed, updated via update-angle --regenerate-changes-diff

* Source/ThirdParty/ANGLE/changes.diff:

Canonical link: https://commits.webkit.org/266472@main
  • Loading branch information
kkinnunen-apple committed Aug 1, 2023
1 parent b657099 commit 677b47b
Showing 1 changed file with 90 additions and 0 deletions.
90 changes: 90 additions & 0 deletions Source/ThirdParty/ANGLE/changes.diff
Original file line number Diff line number Diff line change
Expand Up @@ -895,6 +895,96 @@ index 0000000000000000000000000000000000000000..64b587ddff57a8c26d5bd3739889951a
+++ b/src/libANGLE/renderer/metal/mtl_default_shaders_compiled.inc
@@ -0,0 +1 @@
+// placeholder for WebKit
diff --git a/src/libANGLE/renderer/metal/mtl_render_utils.h b/src/libANGLE/renderer/metal/mtl_render_utils.h
index 774887d45e0d45b31e9878b5b397222201fece73..866f5e576841adc92496baac1fad7efcd4b5c2d8 100644
--- a/src/libANGLE/renderer/metal/mtl_render_utils.h
+++ b/src/libANGLE/renderer/metal/mtl_render_utils.h
@@ -219,7 +219,7 @@ class ClearUtils final : angle::NonCopyable
const std::string mFragmentShaderName;

// Render pipeline cache for clear with draw:
- std::array<RenderPipelineCache, kMaxRenderTargets + 1> mClearRenderPipelineCache;
+ std::array<RenderPipelineCache, kMaxRenderTargets + 1> mClearRenderPipelineCache { };
};

class ColorBlitUtils final : angle::NonCopyable
@@ -258,9 +258,9 @@ class ColorBlitUtils final : angle::NonCopyable
using ColorBlitRenderPipelineCacheArray =
std::array<std::array<RenderPipelineCache, mtl_shader::kTextureTypeCount>,
kMaxRenderTargets>;
- ColorBlitRenderPipelineCacheArray mBlitRenderPipelineCache;
- ColorBlitRenderPipelineCacheArray mBlitPremultiplyAlphaRenderPipelineCache;
- ColorBlitRenderPipelineCacheArray mBlitUnmultiplyAlphaRenderPipelineCache;
+ ColorBlitRenderPipelineCacheArray mBlitRenderPipelineCache {{}};
+ ColorBlitRenderPipelineCacheArray mBlitPremultiplyAlphaRenderPipelineCache {{}};
+ ColorBlitRenderPipelineCacheArray mBlitUnmultiplyAlphaRenderPipelineCache {{}};
};

class DepthStencilBlitUtils final : angle::NonCopyable
@@ -300,14 +300,14 @@ class DepthStencilBlitUtils final : angle::NonCopyable
ContextMtl *ctx,
const StencilBlitViaBufferParams &params);

- std::array<RenderPipelineCache, mtl_shader::kTextureTypeCount> mDepthBlitRenderPipelineCache;
- std::array<RenderPipelineCache, mtl_shader::kTextureTypeCount> mStencilBlitRenderPipelineCache;
+ std::array<RenderPipelineCache, mtl_shader::kTextureTypeCount> mDepthBlitRenderPipelineCache {};
+ std::array<RenderPipelineCache, mtl_shader::kTextureTypeCount> mStencilBlitRenderPipelineCache {};
std::array<std::array<RenderPipelineCache, mtl_shader::kTextureTypeCount>,
mtl_shader::kTextureTypeCount>
- mDepthStencilBlitRenderPipelineCache;
+ mDepthStencilBlitRenderPipelineCache {{}};

std::array<AutoObjCPtr<id<MTLComputePipelineState>>, mtl_shader::kTextureTypeCount>
- mStencilBlitToBufferComPipelineCache;
+ mStencilBlitToBufferComPipelineCache {};

// Intermediate buffer for storing copied stencil data. Used when device doesn't support
// writing stencil in shader.
@@ -417,12 +417,12 @@ class IndexGeneratorUtils final : angle::NonCopyable
const IndexGenerationParams &params,
size_t *indicesGenerated);

- IndexConversionPipelineArray mIndexConversionPipelineCaches;
+ IndexConversionPipelineArray mIndexConversionPipelineCaches {{}};

- IndexConversionPipelineArray mTriFanFromElemArrayGeneratorPipelineCaches;
+ IndexConversionPipelineArray mTriFanFromElemArrayGeneratorPipelineCaches {{}};
AutoObjCPtr<id<MTLComputePipelineState>> mTriFanFromArraysGeneratorPipeline;

- IndexConversionPipelineArray mLineLoopFromElemArrayGeneratorPipelineCaches;
+ IndexConversionPipelineArray mLineLoopFromElemArrayGeneratorPipelineCaches {{}};
AutoObjCPtr<id<MTLComputePipelineState>> mLineLoopFromArraysGeneratorPipeline;
};

@@ -444,7 +444,7 @@ class VisibilityResultUtils final : angle::NonCopyable
// Visibility combination compute pipeline:
// - 0: This compute pipeline only combine the new values and discard old value.
// - 1: This compute pipeline keep the old value and combine with new values.
- std::array<AutoObjCPtr<id<MTLComputePipelineState>>, 2> mVisibilityResultCombPipelines;
+ std::array<AutoObjCPtr<id<MTLComputePipelineState>>, 2> mVisibilityResultCombPipelines {};
};

// Util class for handling mipmap generation
@@ -499,7 +499,7 @@ class CopyPixelsUtils final : angle::NonCopyable
using PixelsCopyPipelineArray = std::array<
std::array<AutoObjCPtr<id<MTLComputePipelineState>>, mtl_shader::kTextureTypeCount * 2>,
angle::kNumANGLEFormats>;
- PixelsCopyPipelineArray mPixelsCopyPipelineCaches;
+ PixelsCopyPipelineArray mPixelsCopyPipelineCaches {{}};

const std::string mReadShaderName;
const std::string mWriteShaderName;
@@ -565,8 +565,8 @@ class VertexFormatConversionUtils final : angle::NonCopyable
using ConvertToFloatRenderPipelineArray =
std::array<RenderPipelineCache, angle::kNumANGLEFormats>;

- ConvertToFloatCompPipelineArray mConvertToFloatCompPipelineCaches;
- ConvertToFloatRenderPipelineArray mConvertToFloatRenderPipelineCaches;
+ ConvertToFloatCompPipelineArray mConvertToFloatCompPipelineCaches {};
+ ConvertToFloatRenderPipelineArray mConvertToFloatRenderPipelineCaches {};

AutoObjCPtr<id<MTLComputePipelineState>> mComponentsExpandCompPipeline;
RenderPipelineCache mComponentsExpandRenderPipelineCache;
diff --git a/src/libANGLE/renderer/metal/mtl_render_utils.mm b/src/libANGLE/renderer/metal/mtl_render_utils.mm
index 9147aa67605d151b8b8f8a40e6bad9889e544171..71fa12b25a115ebdc271acc9f82a50f6d1fa89fe 100644
--- a/src/libANGLE/renderer/metal/mtl_render_utils.mm
Expand Down

0 comments on commit 677b47b

Please sign in to comment.