From 91b5105db54d15033c17525a20c57a5d0f953f9c Mon Sep 17 00:00:00 2001
From: Joshua Ashton <joshua@froggi.es>
Date: Mon, 16 Dec 2019 21:52:43 +0000
Subject: [PATCH] [d3d9] Move capture struct and enum to stateblock header

Makes more sense for it to be here.
---
 src/d3d9/d3d9_state.h      | 55 --------------------------------------
 src/d3d9/d3d9_stateblock.h | 55 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/src/d3d9/d3d9_state.h b/src/d3d9/d3d9_state.h
index df2516eb6..383ac19ce 100644
--- a/src/d3d9/d3d9_state.h
+++ b/src/d3d9/d3d9_state.h
@@ -280,61 +280,6 @@ namespace dxvk {
       : UpdateHelper(pState->psConsts);
   }
 
-  enum class D3D9CapturedStateFlag : uint32_t {
-    VertexDecl,
-    Indices,
-    RenderStates,
-    SamplerStates,
-    VertexBuffers,
-    Textures,
-    VertexShader,
-    PixelShader,
-    Viewport,
-    ScissorRect,
-    ClipPlanes,
-    VsConstants,
-    PsConstants,
-    StreamFreq,
-    Transforms,
-    TextureStages,
-    Material
-  };
-
-  using D3D9CapturedStateFlags = Flags<D3D9CapturedStateFlag>;
-
-  struct D3D9StateCaptures {
-    D3D9CapturedStateFlags flags;
-
-    std::bitset<RenderStateCount>                       renderStates;
-
-    std::bitset<SamplerCount>                           samplers;
-    std::array<
-      std::bitset<SamplerStateCount>,
-      SamplerCount>                                     samplerStates;
-
-    std::bitset<caps::MaxStreams>                       vertexBuffers;
-    std::bitset<SamplerCount>                           textures;
-    std::bitset<caps::MaxClipPlanes>                    clipPlanes;
-    std::bitset<caps::MaxStreams>                       streamFreq;
-    std::bitset<caps::MaxTransforms>                    transforms;
-    std::bitset<caps::TextureStageCount>                textureStages;
-    std::array<
-      std::bitset<D3DTSS_CONSTANT>,
-      caps::TextureStageCount>                          textureStageStates;
-
-    struct {
-      std::bitset<caps::MaxFloatConstantsSoftware>      fConsts;
-      std::bitset<caps::MaxOtherConstantsSoftware>      iConsts;
-      std::bitset<caps::MaxOtherConstantsSoftware>      bConsts;
-    } vsConsts;
-
-    struct {
-      std::bitset<caps::MaxFloatConstantsPS>            fConsts;
-      std::bitset<caps::MaxOtherConstants>              iConsts;
-      std::bitset<caps::MaxOtherConstants>              bConsts;
-    } psConsts;
-  };
-
   struct Direct3DState9 : public D3D9CapturableState {
 
     std::array<Com<D3D9Surface, false>, caps::MaxSimultaneousRenderTargets> renderTargets;
diff --git a/src/d3d9/d3d9_stateblock.h b/src/d3d9/d3d9_stateblock.h
index 897cc47e5..887638605 100644
--- a/src/d3d9/d3d9_stateblock.h
+++ b/src/d3d9/d3d9_stateblock.h
@@ -6,6 +6,61 @@
 
 namespace dxvk {
 
+  enum class D3D9CapturedStateFlag : uint32_t {
+    VertexDecl,
+    Indices,
+    RenderStates,
+    SamplerStates,
+    VertexBuffers,
+    Textures,
+    VertexShader,
+    PixelShader,
+    Viewport,
+    ScissorRect,
+    ClipPlanes,
+    VsConstants,
+    PsConstants,
+    StreamFreq,
+    Transforms,
+    TextureStages,
+    Material
+  };
+
+  using D3D9CapturedStateFlags = Flags<D3D9CapturedStateFlag>;
+
+  struct D3D9StateCaptures {
+    D3D9CapturedStateFlags flags;
+
+    std::bitset<RenderStateCount>                       renderStates;
+
+    std::bitset<SamplerCount>                           samplers;
+    std::array<
+      std::bitset<SamplerStateCount>,
+      SamplerCount>                                     samplerStates;
+
+    std::bitset<caps::MaxStreams>                       vertexBuffers;
+    std::bitset<SamplerCount>                           textures;
+    std::bitset<caps::MaxClipPlanes>                    clipPlanes;
+    std::bitset<caps::MaxStreams>                       streamFreq;
+    std::bitset<caps::MaxTransforms>                    transforms;
+    std::bitset<caps::TextureStageCount>                textureStages;
+    std::array<
+      std::bitset<D3DTSS_CONSTANT>,
+      caps::TextureStageCount>                          textureStageStates;
+
+    struct {
+      std::bitset<caps::MaxFloatConstantsSoftware>      fConsts;
+      std::bitset<caps::MaxOtherConstantsSoftware>      iConsts;
+      std::bitset<caps::MaxOtherConstantsSoftware>      bConsts;
+    } vsConsts;
+
+    struct {
+      std::bitset<caps::MaxFloatConstantsPS>            fConsts;
+      std::bitset<caps::MaxOtherConstants>              iConsts;
+      std::bitset<caps::MaxOtherConstants>              bConsts;
+    } psConsts;
+  };
+
   enum class D3D9StateBlockType :uint32_t {
     None,
     VertexState,