Skip to content

A
angle
Commit d2816b4e by Peter Kasting Committed by Angle LUCI CQ
Options

Fix a -Wdeprecated-copy warning.

Bug: chromium:1221591 Change-Id: Idbbb4aa16e58a9f4e7e25590667cf15706233de4 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2989632 Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 04f775a8
Showing with 9 additions and 10 deletions
src/libANGLE/angletypes.cpp
...@@ -355,11 +355,9 @@ BlendStateExt::BlendStateExt(const size_t drawBuffers) ...@@ -355,11 +355,9 @@ BlendStateExt::BlendStateExt(const size_t drawBuffers)
mMaxDrawBuffers(drawBuffers) mMaxDrawBuffers(drawBuffers)
{} {}
BlendStateExt &BlendStateExt::operator=(const BlendStateExt &other) BlendStateExt::BlendStateExt(const BlendStateExt &other) = default;
{
memcpy(this, &other, sizeof(BlendStateExt)); BlendStateExt &BlendStateExt::operator=(const BlendStateExt &other) = default;
return *this;
}
void BlendStateExt::setEnabled(const bool enabled) void BlendStateExt::setEnabled(const bool enabled)
{ {
......
src/libANGLE/angletypes.h
...@@ -579,6 +579,7 @@ class BlendStateExt final ...@@ -579,6 +579,7 @@ class BlendStateExt final
BlendStateExt(const size_t drawBuffers = 1); BlendStateExt(const size_t drawBuffers = 1);
BlendStateExt(const BlendStateExt &other);
BlendStateExt &operator=(const BlendStateExt &other); BlendStateExt &operator=(const BlendStateExt &other);
///////// Blending Toggle ///////// ///////// Blending Toggle /////////
...@@ -671,23 +672,23 @@ class BlendStateExt final ...@@ -671,23 +672,23 @@ class BlendStateExt final
///////// Data Members ///////// ///////// Data Members /////////
const FactorStorage::Type mMaxFactorMask; FactorStorage::Type mMaxFactorMask;
FactorStorage::Type mSrcColor; FactorStorage::Type mSrcColor;
FactorStorage::Type mDstColor; FactorStorage::Type mDstColor;
FactorStorage::Type mSrcAlpha; FactorStorage::Type mSrcAlpha;
FactorStorage::Type mDstAlpha; FactorStorage::Type mDstAlpha;
const EquationStorage::Type mMaxEquationMask; EquationStorage::Type mMaxEquationMask;
EquationStorage::Type mEquationColor; EquationStorage::Type mEquationColor;
EquationStorage::Type mEquationAlpha; EquationStorage::Type mEquationAlpha;
const ColorMaskStorage::Type mMaxColorMask; ColorMaskStorage::Type mMaxColorMask;
ColorMaskStorage::Type mColorMask; ColorMaskStorage::Type mColorMask;
const DrawBufferMask mMaxEnabledMask; DrawBufferMask mMaxEnabledMask;
DrawBufferMask mEnabledMask; DrawBufferMask mEnabledMask;
const size_t mMaxDrawBuffers; size_t mMaxDrawBuffers;
}; };
// Used in StateCache // Used in StateCache
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment