mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-21 11:51:48 +02:00
09f3f9b41a
The class NonCopyable is, like the name says, supposed to disallow
copying. But should it allow moving?
For a long time, NonCopyable used to not allow moving. (It declared
a deleted copy constructor and assigment operator without declaring
a move constructor and assignment operator, making the compiler
implicitly delete the move constructor and assignment operator.)
That's fine if the classes that inherit from NonCopyable don't need
to be movable or if writing the move constructor and assignment
operator by hand is fine, but that's not the case for all classes,
as I discovered when I was working on the DirectoryBlob PR.
Because of that, I decided to make NonCopyable movable in c7602cc,
allowing me to use NonCopyable in DirectoryBlob.h. That was however
an unfortunate decision, because some of the classes that inherit
from NonCopyable have incorrect behavior when moved by default-
generated move constructors and assignment operators, and do not
explicitly delete the move constructors and assignment operators,
relying on NonCopyable being non-movable.
So what can we do about this? There are four solutions that I can
think of:
1. Make NonCopyable non-movable and tell DirectoryBlob to suck it.
2. Keep allowing moving NonCopyable, and expect that classes that
don't support moving will delete the move constructor and
assignment operator manually. Not only is this inconsistent
(having classes disallow copying one way and disallow moving
another way), but deleting the move constructor and assignment
operator manually is too easy to forget compared to how tricky
the resulting problems are.
3. Have one "MovableNonCopyable" and one "NonMovableNonCopyable".
It works, but it feels rather silly...
4. Don't have a NonCopyable class at all. Considering that deleting
the copy constructor and assignment operator only takes two lines
of code, I don't see much of a reason to keep NonCopyable. I
suppose that there was more of a point in having NonCopyable back
in the pre-C++11 days, when it wasn't possible to use "= delete".
I decided to go with the fourth one (like the commit title says).
The implementation of the commit is fairly straight-forward, though
I would like to point out that I skipped adding "= delete" lines
for classes whose only reason for being uncopyable is that they
contain uncopyable classes like File::IOFile and std::unique_ptr,
because the compiler makes such classes uncopyable automatically.
119 lines
2.9 KiB
C++
119 lines
2.9 KiB
C++
// Copyright 2008 Dolphin Emulator Project
|
|
// Licensed under GPLv2+
|
|
// Refer to the license.txt file included.
|
|
|
|
#pragma once
|
|
|
|
#include <cstring>
|
|
#include <functional> // for hash
|
|
|
|
#include "Common/CommonTypes.h"
|
|
#include "Common/Hash.h"
|
|
|
|
// m_components
|
|
enum
|
|
{
|
|
VB_HAS_POSMTXIDX = (1 << 1),
|
|
VB_HAS_TEXMTXIDX0 = (1 << 2),
|
|
VB_HAS_TEXMTXIDX1 = (1 << 3),
|
|
VB_HAS_TEXMTXIDX2 = (1 << 4),
|
|
VB_HAS_TEXMTXIDX3 = (1 << 5),
|
|
VB_HAS_TEXMTXIDX4 = (1 << 6),
|
|
VB_HAS_TEXMTXIDX5 = (1 << 7),
|
|
VB_HAS_TEXMTXIDX6 = (1 << 8),
|
|
VB_HAS_TEXMTXIDX7 = (1 << 9),
|
|
VB_HAS_TEXMTXIDXALL = (0xff << 2),
|
|
|
|
// VB_HAS_POS=0, // Implied, it always has pos! don't bother testing
|
|
VB_HAS_NRM0 = (1 << 10),
|
|
VB_HAS_NRM1 = (1 << 11),
|
|
VB_HAS_NRM2 = (1 << 12),
|
|
VB_HAS_NRMALL = (7 << 10),
|
|
|
|
VB_COL_SHIFT = 13,
|
|
VB_HAS_COL0 = (1 << 13),
|
|
VB_HAS_COL1 = (1 << 14),
|
|
|
|
VB_HAS_UV0 = (1 << 15),
|
|
VB_HAS_UV1 = (1 << 16),
|
|
VB_HAS_UV2 = (1 << 17),
|
|
VB_HAS_UV3 = (1 << 18),
|
|
VB_HAS_UV4 = (1 << 19),
|
|
VB_HAS_UV5 = (1 << 20),
|
|
VB_HAS_UV6 = (1 << 21),
|
|
VB_HAS_UV7 = (1 << 22),
|
|
VB_HAS_UVALL = (0xff << 15),
|
|
VB_HAS_UVTEXMTXSHIFT = 13,
|
|
};
|
|
|
|
enum VarType
|
|
{
|
|
VAR_UNSIGNED_BYTE, // GX_U8 = 0
|
|
VAR_BYTE, // GX_S8 = 1
|
|
VAR_UNSIGNED_SHORT, // GX_U16 = 2
|
|
VAR_SHORT, // GX_S16 = 3
|
|
VAR_FLOAT, // GX_F32 = 4
|
|
};
|
|
|
|
struct AttributeFormat
|
|
{
|
|
VarType type;
|
|
int components;
|
|
int offset;
|
|
bool enable;
|
|
bool integer;
|
|
};
|
|
|
|
struct PortableVertexDeclaration
|
|
{
|
|
int stride;
|
|
|
|
AttributeFormat position;
|
|
AttributeFormat normals[3];
|
|
AttributeFormat colors[2];
|
|
AttributeFormat texcoords[8];
|
|
AttributeFormat posmtx;
|
|
|
|
inline bool operator<(const PortableVertexDeclaration& b) const
|
|
{
|
|
return memcmp(this, &b, sizeof(PortableVertexDeclaration)) < 0;
|
|
}
|
|
inline bool operator==(const PortableVertexDeclaration& b) const
|
|
{
|
|
return memcmp(this, &b, sizeof(PortableVertexDeclaration)) == 0;
|
|
}
|
|
};
|
|
|
|
namespace std
|
|
{
|
|
template <>
|
|
struct hash<PortableVertexDeclaration>
|
|
{
|
|
size_t operator()(const PortableVertexDeclaration& decl) const
|
|
{
|
|
return HashFletcher((u8*)&decl, sizeof(decl));
|
|
}
|
|
};
|
|
}
|
|
|
|
// The implementation of this class is specific for GL/DX, so NativeVertexFormat.cpp
|
|
// is in the respective backend, not here in VideoCommon.
|
|
|
|
// Note that this class can't just invent arbitrary vertex formats out of its input -
|
|
// all the data loading code must always be made compatible.
|
|
class NativeVertexFormat
|
|
{
|
|
public:
|
|
virtual ~NativeVertexFormat() {}
|
|
NativeVertexFormat(const NativeVertexFormat&) = delete;
|
|
NativeVertexFormat& operator=(const NativeVertexFormat&) = delete;
|
|
NativeVertexFormat(NativeVertexFormat&&) = default;
|
|
NativeVertexFormat& operator=(NativeVertexFormat&&) = default;
|
|
|
|
u32 GetVertexStride() const { return vtx_decl.stride; }
|
|
const PortableVertexDeclaration& GetVertexDeclaration() const { return vtx_decl; }
|
|
protected:
|
|
// Let subclasses construct.
|
|
NativeVertexFormat() {}
|
|
PortableVertexDeclaration vtx_decl;
|
|
};
|