Minor code review (microsoft#245)

sysfce2 · Aug 28, 2024 · d43b5d3 · d43b5d3
1 parent 2087943
commit d43b5d3
Show file tree

Hide file tree

Showing 14 changed files with 90 additions and 0 deletions.
diff --git a/Src/AlphaTestEffect.cpp b/Src/AlphaTestEffect.cpp
@@ -46,6 +46,12 @@ class AlphaTestEffect::Impl : public EffectBase<AlphaTestEffectTraits>
     Impl(_In_ ID3D12Device* device, uint32_t effectFlags, const EffectPipelineStateDescription& pipelineDescription,
         D3D12_COMPARISON_FUNC alphaFunction);
 
+    Impl(const Impl&) = delete;
+    Impl& operator=(const Impl&) = delete;
+
+    Impl(Impl&&) = default;
+    Impl& operator=(Impl&&) = default;
+
     enum RootParameterIndex
     {
         ConstantBuffer,

diff --git a/Src/BasicEffect.cpp b/Src/BasicEffect.cpp
@@ -56,6 +56,12 @@ class BasicEffect::Impl : public EffectBase<BasicEffectTraits>
 public:
     Impl(_In_ ID3D12Device* device, uint32_t effectFlags, const EffectPipelineStateDescription& pipelineDescription);
 
+    Impl(const Impl&) = delete;
+    Impl& operator=(const Impl&) = delete;
+
+    Impl(Impl&&) = default;
+    Impl& operator=(Impl&&) = default;
+
     enum RootParameterIndex
     {
         ConstantBuffer,

diff --git a/Src/CommonStates.cpp b/Src/CommonStates.cpp
@@ -464,6 +464,12 @@ class CommonStates::Impl
         }
     }
 
+    Impl(const Impl&) = delete;
+    Impl& operator=(const Impl&) = delete;
+
+    Impl(Impl&&) = default;
+    Impl& operator=(Impl&&) = default;
+
     D3D12_GPU_DESCRIPTOR_HANDLE Get(SamplerIndex i) const
     {
         return mDescriptors.GetGpuHandle(static_cast<size_t>(i));

diff --git a/Src/DebugEffect.cpp b/Src/DebugEffect.cpp
@@ -47,6 +47,12 @@ class DebugEffect::Impl : public EffectBase<DebugEffectTraits>
     Impl(_In_ ID3D12Device* device, uint32_t effectFlags, const EffectPipelineStateDescription& pipelineDescription,
         DebugEffect::Mode debugMode);
 
+    Impl(const Impl&) = delete;
+    Impl& operator=(const Impl&) = delete;
+
+    Impl(Impl&&) = default;
+    Impl& operator=(Impl&&) = default;
+
     enum RootParameterIndex
     {
         ConstantBuffer,

diff --git a/Src/DualTextureEffect.cpp b/Src/DualTextureEffect.cpp
@@ -45,6 +45,12 @@ class DualTextureEffect::Impl : public EffectBase<DualTextureEffectTraits>
 public:
     Impl(_In_ ID3D12Device* device, uint32_t effectFlags, const EffectPipelineStateDescription& pipelineDescription);
 
+    Impl(const Impl&) = delete;
+    Impl& operator=(const Impl&) = delete;
+
+    Impl(Impl&&) = default;
+    Impl& operator=(Impl&&) = default;
+
     enum RootParameterIndex
     {
         Texture1SRV,

diff --git a/Src/EnvironmentMapEffect.cpp b/Src/EnvironmentMapEffect.cpp
@@ -63,6 +63,12 @@ class EnvironmentMapEffect::Impl : public EffectBase<EnvironmentMapEffectTraits>
         const EffectPipelineStateDescription& pipelineDescription,
         EnvironmentMapEffect::Mapping mapping);
 
+    Impl(const Impl&) = delete;
+    Impl& operator=(const Impl&) = delete;
+
+    Impl(Impl&&) = default;
+    Impl& operator=(Impl&&) = default;
+
     enum RootParameterIndex
     {
         TextureSRV,

diff --git a/Src/GeometricPrimitive.cpp b/Src/GeometricPrimitive.cpp
@@ -27,6 +27,12 @@ class GeometricPrimitive::Impl
 public:
     Impl() noexcept : mIndexCount(0), mVertexBufferView{}, mIndexBufferView{} {}
 
+    Impl(const Impl&) = delete;
+    Impl& operator=(const Impl&) = delete;
+
+    Impl(Impl&&) = default;
+    Impl& operator=(Impl&&) = default;
+
     void Initialize(const VertexCollection& vertices, const IndexCollection& indices, _In_opt_ ID3D12Device* device);
 
     void LoadStaticBuffers(

diff --git a/Src/NormalMapEffect.cpp b/Src/NormalMapEffect.cpp
@@ -71,6 +71,12 @@ class NormalMapEffect::Impl : public EffectBase<NormalMapEffectTraits>
 public:
     explicit Impl(_In_ ID3D12Device* device);
 
+    Impl(const Impl&) = delete;
+    Impl& operator=(const Impl&) = delete;
+
+    Impl(Impl&&) = default;
+    Impl& operator=(Impl&&) = default;
+
     void Initialize(
         _In_ ID3D12Device* device,
         uint32_t effectFlags,

diff --git a/Src/PBREffect.cpp b/Src/PBREffect.cpp
@@ -73,6 +73,12 @@ class PBREffect::Impl : public EffectBase<PBREffectTraits>
 public:
     explicit Impl(_In_ ID3D12Device* device);
 
+    Impl(const Impl&) = delete;
+    Impl& operator=(const Impl&) = delete;
+
+    Impl(Impl&&) = default;
+    Impl& operator=(Impl&&) = default;
+
     void Initialize(
         _In_ ID3D12Device* device,
         uint32_t effectFlags,

diff --git a/Src/PrimitiveBatch.cpp b/Src/PrimitiveBatch.cpp
@@ -24,6 +24,12 @@ class PrimitiveBatchBase::Impl
 public:
     Impl(_In_ ID3D12Device* device, size_t maxIndices, size_t maxVertices, size_t vertexSize);
 
+    Impl(const Impl&) = delete;
+    Impl& operator=(const Impl&) = delete;
+
+    Impl(Impl&&) = default;
+    Impl& operator=(Impl&&) = default;
+
     void Begin(_In_ ID3D12GraphicsCommandList* cmdList);
     void End();
 

diff --git a/Src/ResourceUploadBatch.cpp b/Src/ResourceUploadBatch.cpp
@@ -230,6 +230,12 @@ namespace
             generateMipsPSO = CreateGenMipsPipelineState(device, rootSignature.Get(), GenerateMips_main, sizeof(GenerateMips_main));
         }
 
+        GenerateMipsResources(const GenerateMipsResources&) = delete;
+        GenerateMipsResources& operator=(const GenerateMipsResources&) = delete;
+
+        GenerateMipsResources(GenerateMipsResources&&) = default;
+        GenerateMipsResources& operator=(GenerateMipsResources&&) = default;
+
     private:
         static ComPtr<ID3D12RootSignature> CreateGenMipsRootSignature(
             _In_ ID3D12Device* device)
@@ -315,6 +321,12 @@ class ResourceUploadBatch::Impl
         }
     }
 
+    Impl(const Impl&) = delete;
+    Impl& operator=(const Impl&) = delete;
+
+    Impl(Impl&&) = default;
+    Impl& operator=(Impl&&) = default;
+
     // Call this before your multiple calls to Upload.
     void Begin(D3D12_COMMAND_LIST_TYPE commandType)
     {

diff --git a/Src/SkinnedEffect.cpp b/Src/SkinnedEffect.cpp
@@ -58,6 +58,12 @@ class SkinnedEffect::Impl : public EffectBase<SkinnedEffectTraits>
 public:
     Impl(_In_ ID3D12Device* device, uint32_t effectFlags, const EffectPipelineStateDescription& pipelineDescription);
 
+    Impl(const Impl&) = delete;
+    Impl& operator=(const Impl&) = delete;
+
+    Impl(Impl&&) = default;
+    Impl& operator=(Impl&&) = default;
+
     enum RootParameterIndex
     {
         ConstantBuffer,

diff --git a/Src/SpriteBatch.cpp b/Src/SpriteBatch.cpp
@@ -79,6 +79,12 @@ XM_ALIGNED_STRUCT(16) SpriteBatch::Impl : public AlignedNew<SpriteBatch::Impl>
          const SpriteBatchPipelineStateDescription& psoDesc,
          const D3D12_VIEWPORT* viewport);
 
+    Impl(const Impl&) = delete;
+    Impl& operator=(const Impl&) = delete;
+
+    Impl(Impl&&) = default;
+    Impl& operator=(Impl&&) = default;
+
     void XM_CALLCONV Begin(
         _In_ ID3D12GraphicsCommandList* commandList,
         SpriteSortMode sortMode = SpriteSortMode_Deferred,

diff --git a/Src/SpriteFont.cpp b/Src/SpriteFont.cpp
@@ -39,6 +39,12 @@ class SpriteFont::Impl
         size_t glyphCount,
         float lineSpacing) noexcept(false);
 
+    Impl(const Impl&) = delete;
+    Impl& operator=(const Impl&) = delete;
+
+    Impl(Impl&&) = default;
+    Impl& operator=(Impl&&) = default;
+
     Glyph const* FindGlyph(wchar_t character) const;
 
     void SetDefaultCharacter(wchar_t character);