R_DStreams: Merge OpenGL implementation.

Author: CrossVR

src/Layers/xrRender/R_DStreams.cpp

@@ -14,7 +14,13 @@ void _VertexStream::Create	()
     RImplementation.Resources->Evict();
 
 	mSize					= rsDVB_Size*1024;
-#if defined(USE_DX10) || defined(USE_DX11)
+#if defined (USE_OGL)
+	glGenBuffers(1, &pVB);
+	R_ASSERT(pVB);
+
+	glBindBuffer(GL_ARRAY_BUFFER, pVB);
+	CHK_GL(glBufferData(GL_ARRAY_BUFFER, mSize, nullptr, GL_DYNAMIC_DRAW));
+#elif defined(USE_DX10) || defined(USE_DX11)
 	D3D_BUFFER_DESC bufferDesc;
 	bufferDesc.ByteWidth        = mSize;
 	bufferDesc.Usage            = D3D_USAGE_DYNAMIC;	
@@ -39,8 +45,12 @@ void _VertexStream::Create	()
 
 void _VertexStream::Destroy	()
 {
-	HW.stats_manager.decrement_stats_vb	(pVB);
-	_RELEASE							(pVB);
+#ifdef USE_OGL
+	glDeleteBuffers(1, &pVB);
+#else
+	HW.stats_manager.decrement_stats_vb(pVB);
+	_RELEASE(pVB);
+#endif // USE_OGL
 	_clear								();
 }
 
@@ -66,14 +76,19 @@ void* _VertexStream::Lock	( u32 vl_Count, u32 Stride, u32& vOffset )
 
 	// Check if there is need to flush and perform lock
 	BYTE* pData			= 0;
+#ifdef USE_OGL
+	glBindBuffer(GL_ARRAY_BUFFER, pVB);
+#endif // USE_OGL
 	if ((vl_Count+vl_mPosition) >= vl_mSize)
 	{
 		// FLUSH-LOCK
 		mPosition			= 0;
 		vOffset				= 0;
 		mDiscardID			++;
 
-#if defined(USE_DX11)
+#if defined (USE_OGL)
+		CHK_GL(pData = glMapBufferRange(GL_ARRAY_BUFFER, mPosition, bytes_need, LOCKFLAGS_FLUSH));
+#elif defined(USE_DX11)
 		HW.pContext->Map(pVB, 0, D3D_MAP_WRITE_DISCARD, 0, &MappedSubRes);
 		pData=(BYTE*)MappedSubRes.pData;
 		pData += vOffset;
@@ -92,7 +107,9 @@ void* _VertexStream::Lock	( u32 vl_Count, u32 Stride, u32& vOffset )
 		mPosition			= vl_mPosition*Stride;
 		vOffset				= vl_mPosition;
 
-#if defined(USE_DX11)
+#if defined(USE_OGL)
+		CHK_GL(pData = glMapBufferRange(GL_ARRAY_BUFFER, mPosition, bytes_need, LOCKFLAGS_APPEND));
+#elif defined(USE_DX11)
 		HW.pContext->Map(pVB, 0, D3D_MAP_WRITE_NO_OVERWRITE, 0, &MappedSubRes);
 		pData=(BYTE*)MappedSubRes.pData;
 		pData += vOffset*Stride;
@@ -123,7 +140,9 @@ void	_VertexStream::Unlock		( u32 Count, u32 Stride)
 
 	VERIFY				(pVB);
 
-#if defined(USE_DX11)
+#if defined(USE_OGL)
+	CHK_GL(glUnmapBuffer(GL_ARRAY_BUFFER));
+#elif defined(USE_DX11)
 	HW.pContext->Unmap(pVB, 0);
 #elif defined(USE_DX10)
 	pVB->Unmap();
@@ -167,7 +186,13 @@ void	_IndexStream::Create	()
 
 	mSize					= rsDIB_Size*1024;
 
-#if defined(USE_DX10) || defined(USE_DX11)
+#if defined(USE_OGL)
+	glGenBuffers(1, &pIB);
+	R_ASSERT(pIB);
+
+	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, pIB);
+	CHK_GL(glBufferData(GL_ELEMENT_ARRAY_BUFFER, mSize, nullptr, GL_DYNAMIC_DRAW));
+#elif defined(USE_DX10) || defined(USE_DX11)
 	D3D_BUFFER_DESC bufferDesc;
 	bufferDesc.ByteWidth        = mSize;
 	bufferDesc.Usage            = D3D_USAGE_DYNAMIC;	
@@ -191,8 +216,12 @@ void	_IndexStream::Create	()
 
 void	_IndexStream::Destroy()
 {
-	HW.stats_manager.decrement_stats_ib	(pIB);
-	_RELEASE							(pIB);
+#ifdef USE_OGL
+	glDeleteBuffers(1, &pIB);
+#else
+	HW.stats_manager.decrement_stats_ib(pIB);
+	_RELEASE(pIB);
+#endif // USE_OGL
 	_clear								();
 }
 
@@ -218,7 +247,10 @@ u16*	_IndexStream::Lock	( u32 Count, u32& vOffset )
 		dwFlags		= LOCKFLAGS_FLUSH;			// discard it's contens
 		mDiscardID	++;
 	}
-#if defined(USE_DX11)
+#if defined(USE_OGL)
+	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, pIB);
+	CHK_GL(pLockedData = glMapBufferRange(GL_ELEMENT_ARRAY_BUFFER, mPosition * 2, Count * 2, flags));
+#elif defined(USE_DX11)
 	D3D_MAP MapMode = (dwFlags==LOCKFLAGS_APPEND) ? 
 		D3D_MAP_WRITE_NO_OVERWRITE : D3D_MAP_WRITE_DISCARD;
 	HW.pContext->Map(pIB, 0, MapMode, 0, &MappedSubRes);
@@ -245,7 +277,9 @@ void	_IndexStream::Unlock(u32 RealCount)
 	PGO						(Msg("PGO:IB_UNLOCK:%d",RealCount));
 	mPosition				+=	RealCount;
 	VERIFY					(pIB);
-#if defined(USE_DX11)
+#if defined(USE_OGL)
+	CHK_GL(glUnmapBuffer(GL_ELEMENT_ARRAY_BUFFER));
+#elif defined(USE_DX11)
 	HW.pContext->Unmap(pIB, 0);
 #elif defined(USE_DX10)
 	pIB->Unmap();

src/Layers/xrRenderPC_GL/GL_DStreams.cpp

@@ -249,6 +249,7 @@
     <ClCompile Include="..\xrRender\Light_Render_Direct.cpp" />
     <ClCompile Include="..\xrRender\Light_Render_Direct_ComputeXFS.cpp" />
     <ClCompile Include="..\xrRender\ModelPool.cpp" />
+    <ClCompile Include="..\xrRender\R_DStreams.cpp" />
     <ClCompile Include="..\xrRender\Shader.cpp" />
     <ClCompile Include="blender_bloom_build.cpp" />
     <ClCompile Include="blender_combine.cpp" />
@@ -357,7 +358,6 @@
     <ClCompile Include="glResourceManager_Scripting.cpp" />
     <ClCompile Include="glr_constants.cpp" />
     <ClCompile Include="glTexture.cpp" />
-    <ClCompile Include="GL_DStreams.cpp" />
     <ClCompile Include="gl_R_render.cpp" />
     <ClCompile Include="r2_R_calculate.cpp" />
     <ClCompile Include="gl_rendertarget.cpp" />

src/Layers/xrRenderPC_GL/xrRender_GL.vcxproj

@@ -201,9 +201,6 @@
     <ClCompile Include="..\xrRender\ParticleGroup.cpp">
       <Filter>Models\Visuals</Filter>
     </ClCompile>
-    <ClCompile Include="GL_DStreams.cpp">
-      <Filter>Refactored\Backend</Filter>
-    </ClCompile>
     <ClCompile Include="..\xrRender\ResourceManager.cpp">
       <Filter>Refactored\Execution &amp; 3D\Shaders\ShaderManager</Filter>
     </ClCompile>
@@ -639,6 +636,9 @@
     <ClCompile Include="..\xrRender\D3DUtils.cpp">
       <Filter>Refactored\Execution &amp; 3D\DebugDraw</Filter>
     </ClCompile>
+    <ClCompile Include="..\xrRender\R_DStreams.cpp">
+      <Filter>Refactored\Backend</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h">