Remove legacy ElementOffset/ElementWidth from D3D11 pipeline state

renderdoc/api/replay/d3d11_pipestate.h

@@ -82,8 +82,6 @@ struct View
         Structured(false),
         BufferStructCount(0),
         ElementSize(0),
-        ElementOffset(0),
-        ElementWidth(0),
         FirstElement(0),
         NumElements(1),
         Flags(D3DBufferViewFlags::NoFlags),
@@ -103,10 +101,6 @@ struct View
   uint32_t BufferStructCount;
   uint32_t ElementSize;
 
-  // Buffer (SRV)
-  uint32_t ElementOffset;
-  uint32_t ElementWidth;
-
   // Buffer (UAV)
   uint32_t FirstElement;
   uint32_t NumElements;

renderdoc/core/replay_proxy.cpp

@@ -336,8 +336,6 @@ void Serialiser::Serialise(const char *name, D3D11Pipe::View &el)
 
   Serialise("", el.Structured);
   Serialise("", el.BufferStructCount);
-  Serialise("", el.ElementOffset);
-  Serialise("", el.ElementWidth);
   Serialise("", el.FirstElement);
   Serialise("", el.NumElements);
 
@@ -347,7 +345,7 @@ void Serialiser::Serialise(const char *name, D3D11Pipe::View &el)
   Serialise("", el.ArraySize);
   Serialise("", el.FirstArraySlice);
 
-  SIZE_CHECK(128);
+  SIZE_CHECK(112);
 }
 
 template <>

renderdoc/driver/d3d11/d3d11_debug.cpp

@@ -994,10 +994,8 @@ bool D3D11DebugManager::InitDebugRendering()
     D3D11_SHADER_RESOURCE_VIEW_DESC srvDesc;
     srvDesc.ViewDimension = D3D11_SRV_DIMENSION_BUFFER;
     srvDesc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT;
-    srvDesc.Buffer.ElementOffset = 0;
     srvDesc.Buffer.FirstElement = 0;
-    srvDesc.Buffer.ElementWidth = 4 * sizeof(float);
-    srvDesc.Buffer.NumElements = bDesc.ByteWidth / srvDesc.Buffer.ElementWidth;
+    srvDesc.Buffer.NumElements = bDesc.ByteWidth / sizeof(Vec4f);
 
     hr = m_pDevice->CreateShaderResourceView(m_DebugRender.tileResultBuff, &srvDesc,
                                              &m_DebugRender.tileResultSRV[0]);

renderdoc/driver/d3d11/d3d11_replay.cpp

@@ -685,8 +685,6 @@ D3D11Pipe::State D3D11Replay::MakePipelineState()
           {
             view.FirstElement = desc.Buffer.FirstElement;
             view.NumElements = desc.Buffer.NumElements;
-            view.ElementOffset = desc.Buffer.ElementOffset;
-            view.ElementWidth = desc.Buffer.ElementWidth;
 
             D3D11_BUFFER_DESC bufdesc;
             ((ID3D11Buffer *)res)->GetDesc(&bufdesc);

renderdocui/Interop/D3D11PipelineState.cs

@@ -128,11 +128,7 @@ namespace renderdoc
                 public UInt32 BufferStructCount;
                 public UInt32 ElementSize;
 
-                // Buffer (SRV)
-                public UInt32 ElementOffset;
-                public UInt32 ElementWidth;
-
-                // Buffer (UAV)
+                // Buffer
                 public UInt32 FirstElement;
                 public UInt32 NumElements;