xrRender: static geometry buffers code unification (#489)

src/Layers/xrRenderDX10/dx10BufferUtils.cpp

@@ -145,3 +145,37 @@ void ConvertVertexDeclaration(const xr_vector<D3DVERTEXELEMENT9>& declIn, xr_vec
  ZeroMemory(&declOut[iDeclSize], sizeof(declOut[iDeclSize]));
 }
 };
+
+void IndexStagingBuffer::Create(size_t size)
+{
+ m_HostData = xr_alloc<u8>(size);
+ m_Size = size;
+}
+
+void* IndexStagingBuffer::GetHostPointer() const
+{
+ return m_HostData;
+}
+
+void IndexStagingBuffer::Flush()
+{
+ // Upload data to device
+ dx10BufferUtils::CreateIndexBuffer(&m_DeviceBuffer, m_HostData, m_Size, false);
+ HW.stats_manager.increment_stats_ib(m_DeviceBuffer);
+ // Free host memory
+ xr_delete(m_HostData);
+ m_HostData = nullptr;
+}
+
+ID3DIndexBuffer* IndexStagingBuffer::GetBufferHandle() const
+{
+ return m_DeviceBuffer;
+}
+
+void IndexStagingBuffer::Destroy()
+{
+ if (m_HostData)
+ xr_delete(m_HostData);
+ HW.stats_manager.decrement_stats_ib(m_DeviceBuffer);
+ _RELEASE(m_DeviceBuffer);
+}

src/Layers/xrRenderDX10/dx10BufferUtils.h

@@ -11,5 +11,36 @@ HRESULT CreateConstantBuffer(ID3DBuffer** ppBuffer, UINT DataSize);
 void ConvertVertexDeclaration(const xr_vector<D3DVERTEXELEMENT9>& declIn, xr_vector<D3D_INPUT_ELEMENT_DESC>& declOut);
 };
 
+
+class IndexStagingBuffer
+{
+public:
+ void Create(size_t size);
+ void Destroy();
+
+ void* GetHostPointer() const;
+ ID3DIndexBuffer* GetBufferHandle() const;
+ void Flush();
+
+ operator ID3DIndexBuffer*() const
+ {
+ return m_DeviceBuffer;
+ }
+
+ bool IndexStagingBuffer::operator==(ID3DIndexBuffer* other) const
+ {
+ return other == m_DeviceBuffer;
+ }
+ bool IndexStagingBuffer::operator==(const IndexStagingBuffer& other) const
+ {
+ return other.m_DeviceBuffer == m_DeviceBuffer;
+ }
+
+private:
+ ID3DIndexBuffer* m_DeviceBuffer{ nullptr };
+ void* m_HostData{ nullptr };
+ size_t m_Size{ 0 };
+};
+
 #endif // USE_DX10
 #endif // dx10BufferUtils_included

src/Layers/xrRenderDX9/BufferUtils.cpp

@@ -0,0 +1,42 @@
+#include "stdafx.h"
+
+void IndexStagingBuffer::Create(size_t size)
+{
+ m_HostData = xr_alloc<u8>(size);
+ m_Size = size;
+
+ u32 dwUsage = D3DUSAGE_WRITEONLY;
+ if (HW.Caps.geometry.bSoftware)
+ dwUsage |= D3DUSAGE_SOFTWAREPROCESSING;
+ R_CHK(HW.pDevice->CreateIndexBuffer(size, dwUsage, D3DFMT_INDEX16, D3DPOOL_DEFAULT, &m_DeviceBuffer, NULL));
+}
+
+void* IndexStagingBuffer::GetHostPointer() const
+{
+ VERIFY(m_DeviceBuffer);
+ R_CHK(m_DeviceBuffer->Lock(0, 0, const_cast<void**>(&m_HostData), 0));
+ return m_HostData;
+}
+
+void IndexStagingBuffer::Flush()
+{
+ // Upload data to device
+ R_CHK(m_DeviceBuffer->Unlock());
+ HW.stats_manager.increment_stats_ib(m_DeviceBuffer);
+ // Free host memory
+ xr_delete(m_HostData);
+ m_HostData = nullptr;
+}
+
+ID3DIndexBuffer* IndexStagingBuffer::GetBufferHandle() const
+{
+ return m_DeviceBuffer;
+}
+
+void IndexStagingBuffer::Destroy()
+{
+ if (m_HostData)
+ xr_delete(m_HostData);
+ HW.stats_manager.decrement_stats_ib(m_DeviceBuffer);
+ _RELEASE(m_DeviceBuffer);
+}

src/Layers/xrRenderDX9/BufferUtils.h

@@ -0,0 +1,31 @@
+#pragma once
+
+class IndexStagingBuffer
+{
+public:
+ void Create(size_t size);
+ void Destroy();
+
+ void* GetHostPointer() const;
+ ID3DIndexBuffer* GetBufferHandle() const;
+ void Flush();
+
+ operator ID3DIndexBuffer*() const
+ {
+ return m_DeviceBuffer;
+ }
+
+ bool IndexStagingBuffer::operator==(ID3DIndexBuffer* other) const
+ {
+ return other == m_DeviceBuffer;
+ }
+ bool IndexStagingBuffer::operator==(const IndexStagingBuffer& other) const
+ {
+ return other.m_DeviceBuffer == m_DeviceBuffer;
+ }
+
+private:
+ ID3DIndexBuffer* m_DeviceBuffer{ nullptr };
+ void* m_HostData{ nullptr };
+ size_t m_Size{ 0 };
+};

src/Layers/xrRenderGL/glBufferUtils.cpp

@@ -279,3 +279,35 @@ u32 GetDeclLength(const D3DVERTEXELEMENT9* decl)
  return element - decl;
 }
 } // namespace glBufferUtils
+
+void IndexStagingBuffer::Create(size_t size)
+{
+ m_HostData = xr_alloc<u8>(size);
+ m_Size = size;
+}
+
+void* IndexStagingBuffer::GetHostPointer() const
+{
+ return m_HostData;
+}
+
+void IndexStagingBuffer::Flush()
+{
+ // Upload data to device
+ glBufferUtils::CreateIndexBuffer(&m_DeviceBuffer, m_HostData, m_Size, true);
+ // Free host memory
+ xr_delete(m_HostData);
+ m_HostData = nullptr;
+}
+
+GLuint IndexStagingBuffer::GetBufferHandle() const
+{
+ return m_DeviceBuffer;
+}
+
+void IndexStagingBuffer::Destroy()
+{
+ if (m_HostData)
+ xr_delete(m_HostData);
+ glDeleteBuffers(1, &m_DeviceBuffer);
+}

src/Layers/xrRenderGL/glBufferUtils.h

@@ -2,6 +2,8 @@
 
 #ifdef USE_OGL
 
+struct SDeclaration;
+
 namespace glBufferUtils
 {
 void CreateVertexBuffer(GLuint* pBuffer, const void* pData, UINT DataSize, bool bImmutable = true);
@@ -13,4 +15,34 @@ void ConvertVertexDeclaration(u32 FVF, SDeclaration* decl);
 void ConvertVertexDeclaration(const D3DVERTEXELEMENT9* dxdecl, SDeclaration* decl);
 };
 
+class IndexStagingBuffer
+{
+public:
+ void Create(size_t size);
+ void Destroy();
+
+ void* GetHostPointer() const;
+ GLuint GetBufferHandle() const;
+ void Flush();
+
+ operator GLuint() const
+ {
+ return m_DeviceBuffer;
+ }
+
+ bool IndexStagingBuffer::operator==(GLuint other) const
+ {
+ return other == m_DeviceBuffer;
+ }
+ bool IndexStagingBuffer::operator==(const IndexStagingBuffer& other) const
+ {
+ return other.m_DeviceBuffer == m_DeviceBuffer;
+ }
+
+private:
+ GLuint m_DeviceBuffer{ 0 };
+ void* m_HostData{ nullptr };
+ size_t m_Size{ 0 };
+};
+
 #endif // USE_OGL

src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj

@@ -187,6 +187,7 @@
  <ClInclude Include="..\..\Include\xrRender\UIShader.h" />
  <ClInclude Include="..\..\Include\xrRender\WallMarkArray.h" />
  <ClInclude Include="..\xrRenderDX9\CommonTypes.h" />
+ <ClInclude Include="..\xrRenderDX9\BufferUtils.h" />
  <ClInclude Include="..\xrRenderDX9\dx9HW.h" />
  <ClInclude Include="..\xrRenderDX9\dx9R_Backend_Runtime.h" />
  <ClInclude Include="..\xrRenderDX9\dx9r_constants_cache.h" />
@@ -306,6 +307,7 @@
  <ClInclude Include="stdafx.h" />
  </ItemGroup>
  <ItemGroup>
+ <ClCompile Include="..\xrRenderDX9\BufferUtils.cpp" />
  <ClCompile Include="..\xrRenderDX9\dx9HW.cpp" />
  <ClCompile Include="..\xrRenderDX9\dx9HWCaps.cpp" />
  <ClCompile Include="..\xrRenderDX9\dx9r_constants_cache.cpp" />
@@ -500,4 +502,4 @@
  <Error Condition="!Exists('..\..\packages\sdl2.redist.2.0.5\build\native\sdl2.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\sdl2.redist.2.0.5\build\native\sdl2.redist.targets'))" />
  <Error Condition="!Exists('..\..\packages\sdl2.2.0.5\build\native\sdl2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\sdl2.2.0.5\build\native\sdl2.targets'))" />
  </Target>
-</Project>
+</Project>

src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj.filters

@@ -576,6 +576,9 @@
  <ClInclude Include="..\xrRenderDX9\CommonTypes.h">
  <Filter>Kernel</Filter>
  </ClInclude>
+ <ClInclude Include="..\xrRenderDX9\BufferUtils.h">
+ <Filter>Refactored\HW</Filter>
+ </ClInclude>
  </ItemGroup>
  <ItemGroup>
  <ClCompile Include="stdafx.cpp">
@@ -962,6 +965,9 @@
  <ClCompile Include="..\xrRenderDX9\dx9SH_RT.cpp">
  <Filter>Refactored\Execution &amp; 3D\Shaders\Resources</Filter>
  </ClCompile>
+ <ClCompile Include="..\xrRenderDX9\BufferUtils.cpp">
+ <Filter>Refactored\HW</Filter>
+ </ClCompile>
  </ItemGroup>
  <ItemGroup>
  <Text Include="Pipeline.txt" />
@@ -972,4 +978,4 @@
  <ItemGroup>
  <Natvis Include="..\..\OpenXRay.natvis" />
  </ItemGroup>
-</Project>
+</Project>

src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj

@@ -188,6 +188,7 @@
  <ClInclude Include="..\..\Include\xrRender\UIShader.h" />
  <ClInclude Include="..\..\Include\xrRender\WallMarkArray.h" />
  <ClInclude Include="..\xrRenderDX9\CommonTypes.h" />
+ <ClInclude Include="..\xrRenderDX9\BufferUtils.h" />
  <ClInclude Include="..\xrRenderDX9\dx9HW.h" />
  <ClInclude Include="..\xrRenderDX9\dx9R_Backend_Runtime.h" />
  <ClInclude Include="..\xrRenderDX9\dx9r_constants_cache.h" />
@@ -319,6 +320,7 @@
  <ClInclude Include="stdafx.h" />
  </ItemGroup>
  <ItemGroup>
+ <ClCompile Include="..\xrRenderDX9\BufferUtils.cpp" />
  <ClCompile Include="..\xrRenderDX9\dx9HW.cpp" />
  <ClCompile Include="..\xrRenderDX9\dx9HWCaps.cpp" />
  <ClCompile Include="..\xrRenderDX9\dx9r_constants_cache.cpp" />
@@ -543,4 +545,4 @@
  <Error Condition="!Exists('..\..\packages\sdl2.redist.2.0.5\build\native\sdl2.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\sdl2.redist.2.0.5\build\native\sdl2.redist.targets'))" />
  <Error Condition="!Exists('..\..\packages\sdl2.2.0.5\build\native\sdl2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\sdl2.2.0.5\build\native\sdl2.targets'))" />
  </Target>
-</Project>
+</Project>

src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj.filters

@@ -615,6 +615,9 @@
  <ClInclude Include="..\xrRenderDX9\dx9HW.h">
  <Filter>Refactored\HW</Filter>
  </ClInclude>
+ <ClInclude Include="..\xrRenderDX9\BufferUtils.h">
+ <Filter>Refactored\HW</Filter>
+ </ClInclude>
  <ClInclude Include="..\xrRenderDX9\CommonTypes.h">
  <Filter>Kernel</Filter>
  </ClInclude>
@@ -1109,6 +1112,9 @@
  <ClCompile Include="..\xrRenderDX9\dx9SH_RT.cpp">
  <Filter>Refactored\Execution &amp; 3D\Shaders\Resources</Filter>
  </ClCompile>
+ <ClCompile Include="..\xrRenderDX9\BufferUtils.cpp">
+ <Filter>Refactored\HW</Filter>
+ </ClCompile>
  </ItemGroup>
  <ItemGroup>
  <Text Include="todo.txt" />
@@ -1119,4 +1125,4 @@
  <ItemGroup>
  <Natvis Include="..\..\OpenXRay.natvis" />
  </ItemGroup>
-</Project>
+</Project>