summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2022-02-18 18:39:59 +0100
committerGitHub <noreply@github.com>2022-02-18 18:39:59 +0100
commit067fbe8f864f3d90eddc1935e5054c790d4d10ad (patch)
tree6efbcd29289c2157027a3bb2c8781e39ac51b49f /Source/Core
parent8b0c6af75a9c458cb72cb79d311bc9e2c7b8f5cc (diff)
parent3175e38a2eaa387de29c67d9198a234bc17e55fe (diff)
Merge pull request #10376 from shuffle2/uidctor
GXPipelineUid: remove explicit shallow copy where it's the default
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/VideoCommon/GXPipelineTypes.h35
1 files changed, 0 insertions, 35 deletions
diff --git a/Source/Core/VideoCommon/GXPipelineTypes.h b/Source/Core/VideoCommon/GXPipelineTypes.h
index ca3fb89701..b448dc107f 100644
--- a/Source/Core/VideoCommon/GXPipelineTypes.h
+++ b/Source/Core/VideoCommon/GXPipelineTypes.h
@@ -35,24 +35,6 @@ struct GXPipelineUid
// and this map lookup can happen every draw call. However, as using memcmp() will also compare
// any padding bytes, we have to ensure these are zeroed out.
GXPipelineUid() { std::memset(static_cast<void*>(this), 0, sizeof(*this)); }
-#ifdef _MSC_VER
-#pragma warning(push)
-// Disable warning for uninitialized member variables, as MSVC doesn't recognise that memcpy
-// performs this initialization.
-#pragma warning(disable : 26495)
-#endif
- GXPipelineUid(const GXPipelineUid& rhs)
- {
- std::memcpy(static_cast<void*>(this), &rhs, sizeof(*this));
- }
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
- GXPipelineUid& operator=(const GXPipelineUid& rhs)
- {
- std::memcpy(static_cast<void*>(this), &rhs, sizeof(*this));
- return *this;
- }
bool operator<(const GXPipelineUid& rhs) const
{
return std::memcmp(this, &rhs, sizeof(*this)) < 0;
@@ -74,23 +56,6 @@ struct GXUberPipelineUid
BlendingState blending_state;
GXUberPipelineUid() { std::memset(static_cast<void*>(this), 0, sizeof(*this)); }
-#ifdef _MSC_VER
-#pragma warning(push)
-// Disable warning for uninitialized member variables
-#pragma warning(disable : 26495)
-#endif
- GXUberPipelineUid(const GXUberPipelineUid& rhs)
- {
- std::memcpy(static_cast<void*>(this), &rhs, sizeof(*this));
- }
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
- GXUberPipelineUid& operator=(const GXUberPipelineUid& rhs)
- {
- std::memcpy(static_cast<void*>(this), &rhs, sizeof(*this));
- return *this;
- }
bool operator<(const GXUberPipelineUid& rhs) const
{
return std::memcmp(this, &rhs, sizeof(*this)) < 0;