GL refactoring

include/anki/gr/CommandBufferHandle.h

@@ -41,10 +41,7 @@ public:
 	void finish();
 
 	/// Compute initialization hints
-	CommandBufferInitHints computeInitHints() const
-	{
-		return get().computeInitHints();
-	}
+	CommandBufferInitHints computeInitHints() const;
 
 	/// @name State manipulation
 	/// @{

include/anki/gr/gl/CommandBufferImpl.h

@@ -33,7 +33,7 @@ public:
 class CommandBufferImpl: public GrObject, public NonCopyable
 {
 public:
-	using InitHints = CommandBufferImplInitHints;
+	using InitHints = CommandBufferInitHints;
 
 	/// Default constructor
 	CommandBufferImpl(GrManager* manager)

include/anki/gr/gl/GrManagerImpl.h

@@ -7,7 +7,6 @@
 #define ANKI_GR_GL_GR_MANAGER_IMPL_H
 
 #include "anki/gr/Common.h"
-#include "anki/util/List.h"
 
 namespace anki {
 
@@ -41,7 +40,6 @@ public:
 private:
 	GrManager* m_manager;
 	RenderingThread* m_thread = nullptr;
-	List<GrObject*> m_objectsForDeletion;
 };
 /// @}
 

include/anki/gr/gl/RenderingThread.h

@@ -70,8 +70,8 @@ public:
 	/// Start the working thread
 	/// @note Don't free the context before calling #stop
 	ANKI_USE_RESULT Error start(
-		GlMakeCurrentCallback makeCurrentCb, void* makeCurrentCbData, void* ctx,
-		GlCallback swapBuffersCallback, void* swapBuffersCbData,
+		MakeCurrentCallback makeCurrentCb, void* makeCurrentCbData, void* ctx,
+		SwapBuffersCallback swapBuffersCallback, void* swapBuffersCbData,
 		Bool registerMessages);
 
 	/// Stop the working thread
@@ -110,10 +110,10 @@ private:
 
 	void* m_makeCurrentCbData = nullptr; ///< Pointer first param of makecurrent
 	void* m_ctx = nullptr; ///< Pointer to the system GL context
-	GlMakeCurrentCallback m_makeCurrentCb; ///< Making a context current
+	MakeCurrentCallback m_makeCurrentCb; ///< Making a context current
 
 	CommandBufferHandle m_swapBuffersCommands;
-	GlCallback m_swapBuffersCallback;
+	SwapBuffersCallback m_swapBuffersCallback;
 	void* m_swapBuffersCbData;
 	ConditionVariable m_frameCondVar;
 	Mutex m_frameMtx;

src/gr/gl/CommandBufferHandle.cpp

@@ -153,6 +153,12 @@ Error CommandBufferHandle::create(GlDevice* gl,
 	return err;
 }
 
+//==============================================================================
+CommandBufferInitHints CommandBufferHandle::computeInitHints() const
+{
+	return get().computeInitHints();
+}
+
 //==============================================================================
 void CommandBufferHandle::pushBackUserCommand(
 	UserCallback callback, void* data)

src/gr/gl/CommandBufferImpl.cpp

@@ -13,7 +13,7 @@
 namespace anki {
 
 //==============================================================================
-Error CommandBufferImpl::create(const CommandBufferImplInitHints& hints)
+Error CommandBufferImpl::create(const InitHints& hints)
 {
 	auto& pool = getManager().getAllocator().getMemoryPool();
 
@@ -78,9 +78,9 @@ Error CommandBufferImpl::executeAllCommands()
 }
 
 //==============================================================================
-CommandBufferImplInitHints CommandBufferImpl::computeInitHints() const
+CommandBufferImpl::InitHints CommandBufferImpl::computeInitHints() const
 {
-	CommandBufferImplInitHints out;
+	InitHints out;
 	out.m_chunkSize = m_alloc.getMemoryPool().getAllocatedSize() + 16;
 
 	ANKI_COUNTER_INC(GL_QUEUES_SIZE, 

src/gr/gl/GlObject.cpp

@@ -19,7 +19,8 @@ Error GlObject::serializeOnGetter() const
 	
 	if(state == State::TO_BE_CREATED)
 	{
-		auto& thread = getManager().getImplementation().getRenderingThread();
+		RenderingThread& thread = const_cast<RenderingThread&>(
+			getManager().getImplementation().getRenderingThread());
 		thread.syncClientServer();
 
 		state = State(m_state.load());