NUKE unused GLIndirectBuffer

Author: VReaperV

src/engine/renderer/Material.cpp

@@ -636,8 +636,8 @@ void MaterialSystem::GenerateWorldCommandBuffer() {
 
 	culledCommandsBuffer.BufferStorage( surfaceCommandsCount * INDIRECT_COMMAND_SIZE * MAX_VIEWFRAMES, 1, nullptr );
 	culledCommandsBuffer.MapAll();
-	GLIndirectBuffer::GLIndirectCommand* culledCommands = ( GLIndirectBuffer::GLIndirectCommand* ) culledCommandsBuffer.GetData();
-	memset( culledCommands, 0, surfaceCommandsCount * sizeof( GLIndirectBuffer::GLIndirectCommand ) * MAX_VIEWFRAMES );
+	GLIndirectCommand* culledCommands = ( GLIndirectCommand* ) culledCommandsBuffer.GetData();
+	memset( culledCommands, 0, surfaceCommandsCount * sizeof( GLIndirectCommand ) * MAX_VIEWFRAMES );
 	culledCommandsBuffer.FlushAll();
 
 	surfaceBatchesUBO.BufferData( MAX_SURFACE_COMMAND_BATCHES * SURFACE_COMMAND_BATCH_SIZE, nullptr, GL_STATIC_DRAW );
@@ -2100,9 +2100,9 @@ void MaterialSystem::RenderMaterials( const shaderSort_t fromSort, const shaderS
 
 void MaterialSystem::RenderIndirect( const Material& material, const uint32_t viewID, const GLenum mode = GL_TRIANGLES ) {
 	glMultiDrawElementsIndirectCountARB( mode, GL_UNSIGNED_INT,
-		BUFFER_OFFSET( material.surfaceCommandBatchOffset * SURFACE_COMMANDS_PER_BATCH * sizeof( GLIndirectBuffer::GLIndirectCommand )
+		BUFFER_OFFSET( material.surfaceCommandBatchOffset * SURFACE_COMMANDS_PER_BATCH * sizeof( GLIndirectCommand )
 		               + ( surfaceCommandsCount * ( MAX_VIEWS * currentFrame + viewID )
-		               * sizeof( GLIndirectBuffer::GLIndirectCommand ) ) ),
+		               * sizeof( GLIndirectCommand ) ) ),
 		material.globalID * sizeof( uint32_t )
 		+ ( MAX_COMMAND_COUNTERS * ( MAX_VIEWS * currentFrame + viewID ) ) * sizeof( uint32_t ),
 		material.drawCommands.size(), 0 );

src/engine/renderer/Material.h

@@ -43,7 +43,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 static constexpr uint32_t MAX_DRAWCOMMAND_TEXTURES = 64;
 
-/* Similar to GLIndirectBuffer::GLIndirectCommand, but we always set instanceCount to 1 and baseVertex to 0,
+struct GLIndirectCommand {
+	GLuint count;
+	GLuint instanceCount;
+	GLuint firstIndex;
+	GLint baseVertex;
+	GLuint baseInstance;
+};
+
+/* Similar to GLIndirectCommand, but we always set instanceCount to 1 and baseVertex to 0,
  so no need to waste memory on those */
 struct IndirectCompactCommand {
 	GLuint count;

src/engine/renderer/gl_shader.h

@@ -1530,45 +1530,6 @@ class GLAtomicCounterBuffer : public GLBuffer {
 	}
 };
 
-class GLIndirectBuffer {
-	public:
-	struct GLIndirectCommand {
-		GLuint count;
-		GLuint instanceCount;
-		GLuint firstIndex;
-		GLint baseVertex;
-		GLuint baseInstance;
-	};
-
-	GLIndirectBuffer( const char* name ) {
-	}
-
-	void BindBuffer() {
-		glBindBuffer( GL_DRAW_INDIRECT_BUFFER, handle );
-	}
-
-	GLIndirectCommand* MapBufferRange( const GLsizeiptr count ) {
-		return (GLIndirectCommand*) glMapBufferRange( GL_DRAW_INDIRECT_BUFFER,
-			0, count * sizeof( GLIndirectCommand ),
-			GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_BUFFER_BIT );
-	}
-
-	void UnmapBuffer() const {
-		glUnmapBuffer( GL_DRAW_INDIRECT_BUFFER );
-	}
-
-	void GenBuffer() {
-		glGenBuffers( 1, &handle );
-	}
-
-	void DelBuffer() {
-		glDeleteBuffers( 1, &handle );
-	}
-
-	private:
-	GLuint handle;
-};
-
 class GLCompileMacro
 {
 private: