godotengine/godot-angle-static
1
0
Fork 0
mirror of https://github.com/godotengine/godot-angle-static.git synced 2026-01-07 06:09:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Metal: Remove copy constructors in various util classes

Browse Source 
By using a different array initializer in RenderUtils, the copies are
not neccessary.

Bug: chromium:1329376
Change-Id: Iec98a31741457f8d76a84f0340772167d7b9700a
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4607151
Reviewed-by: Quyen Le <lehoangquyen@chromium.org>
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
This commit is contained in:
Geoff Lang
2023-06-12 15:02:58 -04:00
committed by Angle LUCI CQ
parent 6e3808db30
commit 7f9e9fce2f
2 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libANGLE/renderer/metal/mtl_render_utils.h
View File

@@ -196,7 +196,6 @@ class ClearUtils final : angle::NonCopyable
public:
ClearUtils() = delete;
ClearUtils(const std::string &fragmentShaderName);
ClearUtils(const ClearUtils &src);
void onDestroy();
@@ -228,7 +227,6 @@ class ColorBlitUtils final : angle::NonCopyable
public:
ColorBlitUtils() = delete;
ColorBlitUtils(const std::string &fragmentShaderName);
ColorBlitUtils(const ColorBlitUtils &src);
void onDestroy();
@@ -480,7 +478,6 @@ class CopyPixelsUtils final : angle::NonCopyable
public:
CopyPixelsUtils() = default;
CopyPixelsUtils(const std::string &readShaderName, const std::string &writeShaderName);
CopyPixelsUtils(const CopyPixelsUtils &src);
void onDestroy();

23
src/libANGLE/renderer/metal/mtl_render_utils.mm
View File

@@ -901,15 +901,14 @@ StencilBlitViaBufferParams::StencilBlitViaBufferParams(const DepthStencilBlitPar
// RenderUtils implementation
RenderUtils::RenderUtils(DisplayMtl *display)
: Context(display),
mClearUtils(
{ClearUtils("clearIntFS"), ClearUtils("clearUIntFS"), ClearUtils("clearFloatFS")}),
mColorBlitUtils({ColorBlitUtils("blitIntFS"), ColorBlitUtils("blitUIntFS"),
ColorBlitUtils("blitFloatFS")}),
mClearUtils{ClearUtils("clearIntFS"), ClearUtils("clearUIntFS"), ClearUtils("clearFloatFS")},
mColorBlitUtils{ColorBlitUtils("blitIntFS"), ColorBlitUtils("blitUIntFS"),
ColorBlitUtils("blitFloatFS")},
mCopyTextureFloatToUIntUtils("copyTextureFloatToUIntFS"),
mCopyPixelsUtils(
{CopyPixelsUtils("readFromBufferToIntTexture", "writeFromIntTextureToBuffer"),
CopyPixelsUtils("readFromBufferToUIntTexture", "writeFromUIntTextureToBuffer"),
CopyPixelsUtils("readFromBufferToFloatTexture", "writeFromFloatTextureToBuffer")})
mCopyPixelsUtils{
CopyPixelsUtils("readFromBufferToIntTexture", "writeFromIntTextureToBuffer"),
CopyPixelsUtils("readFromBufferToUIntTexture", "writeFromUIntTextureToBuffer"),
CopyPixelsUtils("readFromBufferToFloatTexture", "writeFromFloatTextureToBuffer")}
{}
RenderUtils::~RenderUtils() {}
@@ -1187,8 +1186,6 @@ ClearUtils::ClearUtils(const std::string &fragmentShaderName)
: mFragmentShaderName(fragmentShaderName)
{}
ClearUtils::ClearUtils(const ClearUtils &src) : ClearUtils(src.mFragmentShaderName) {}
void ClearUtils::onDestroy()
{
ClearRenderPipelineCacheArray(&mClearRenderPipelineCache);
@@ -1391,9 +1388,6 @@ ColorBlitUtils::ColorBlitUtils(const std::string &fragmentShaderName)
: mFragmentShaderName(fragmentShaderName)
{}
ColorBlitUtils::ColorBlitUtils(const ColorBlitUtils &src) : ColorBlitUtils(src.mFragmentShaderName)
{}
void ColorBlitUtils::onDestroy()
{
ClearRenderPipelineCache2DArray(&mBlitRenderPipelineCache);
@@ -2676,9 +2670,6 @@ CopyPixelsUtils::CopyPixelsUtils(const std::string &readShaderName,
const std::string &writeShaderName)
: mReadShaderName(readShaderName), mWriteShaderName(writeShaderName)
{}
CopyPixelsUtils::CopyPixelsUtils(const CopyPixelsUtils &src)
: CopyPixelsUtils(src.mReadShaderName, src.mWriteShaderName)
{}
void CopyPixelsUtils::onDestroy()
{