Some compute support

include/anki/gr/CommandBufferHandle.h

@@ -137,6 +137,8 @@ public:
 	void drawArraysConditional(OcclusionQueryHandle& query,
 		GLenum mode, U32 count, U32 instanceCount = 1,
 		U32 first = 0, U32 baseInstance = 0);
+
+	void dispatchCompute(U32 groupCountX, U32 groupCountY, U32 groupCountZ);
 	/// @}
 
 	/// @name Other operations

include/anki/gr/Common.h

@@ -36,9 +36,10 @@ class ShaderImpl;
 class ShaderHandle;
 class PipelineImpl;
 class PipelineHandle;
-struct PipelineInitializer;
+class PipelineInitializer;
 class FramebufferImpl;
 class FramebufferHandle;
+class FramebufferInitializer;
 class TextureImpl;
 class TextureHandle;
 class SamplerImpl;
@@ -51,10 +52,9 @@ class ResourceGroupImpl;
 class ResourceGroupHandle;
 class GrManager;
 class GrManagerImpl;
-struct FramebufferInitializer;
 class TextureInitializer;
 class SamplerInitializer;
-struct GrManagerInitializer;
+class GrManagerInitializer;
 
 /// @addtogroup graphics_private
 /// @{

include/anki/gr/GrManager.h

@@ -15,17 +15,18 @@ namespace anki {
 /// @{
 
 /// Manager initializer.
-struct GrManagerInitializer
+class GrManagerInitializer
 {
-	AllocAlignedCallback m_allocCallback; 
-	void* m_allocCallbackUserData;
+public:
+	AllocAlignedCallback m_allocCallback = nullptr; 
+	void* m_allocCallbackUserData = nullptr;
 
-	MakeCurrentCallback m_makeCurrentCallback;
-	void* m_makeCurrentCallbackData;
-	void* m_ctx;
+	MakeCurrentCallback m_makeCurrentCallback = nullptr;
+	void* m_makeCurrentCallbackData = nullptr;
+	void* m_ctx = nullptr;
 
-	SwapBuffersCallback m_swapBuffersCallback;
-	void* m_swapBuffersCallbackData;
+	SwapBuffersCallback m_swapBuffersCallback = nullptr;
+	void* m_swapBuffersCallbackData = nullptr;
 
 	CString m_cacheDirectory;
 	Bool m_registerDebugMessages = false;

include/anki/gr/PipelineCommon.h

@@ -98,8 +98,9 @@ enum class SubStateBit: U16
 ANKI_ENUM_ALLOW_NUMERIC_OPERATIONS(SubStateBit, inline)
 
 /// Pipeline initializer.
-struct PipelineInitializer
+class PipelineInitializer
 {
+public:
 	VertexStateInfo m_vertex;
 	InputAssemblerStateInfo m_inputAssembler;
 	TessellationStateInfo m_tessellation;

include/anki/gr/gl/PipelineImpl.h

@@ -39,22 +39,25 @@ public:
 	void bind();
 
 private:
-	struct Attribute
+	class Attribute
 	{
+	public:
+		GLenum m_type = 0;
 		U8 m_compCount = 0;
 		Bool8 m_normalized = false;
-		GLenum m_type = 0;
 	};
 
-	struct Attachment
+	class Attachment
 	{
+	public:
 		GLenum m_srcBlendMethod = GL_ONE;
 		GLenum m_dstBlendMethod = GL_ZERO;
 		GLenum m_blendFunction = GL_ADD;
 		Array<Bool8, 4> m_channelWriteMask;
 	};
 
-	Bool m_complete;
+	Bool8 m_complete;
+	Bool8 m_compute = false; ///< Is compute
 
 	// Cached values
 	Array<Attribute, MAX_VERTEX_ATTRIBUTES> m_attribs;

shaders/PpsHdr.frag.glsl

@@ -45,7 +45,7 @@ void main()
 	color += readTexture(MIPMAP - 1);
 	color += readTexture(MIPMAP - 2);
 	
-	color /= 2.0;
+	color /= 3.0;
 
 #if 1
 	float luminance = dot(vec3(0.30, 0.59, 0.11), color);

src/gr/gl/CommandBufferHandle.cpp

@@ -654,4 +654,28 @@ void CommandBufferHandle::copyTextureToBuffer(
 	get().pushBackNewCommand<CopyBuffTex>(from, to);
 }
 
+//==============================================================================
+class DispatchCommand: public GlCommand
+{
+public:
+	Array<U32, 3> m_size;
+
+	DispatchCommand(U32 x, U32 y, U32 z)
+	:	m_size({x, y, z})
+	{}
+
+	Error operator()(CommandBufferImpl*)
+	{
+		glDispatchCompute(m_size[0], m_size[1], m_size[2]);
+		return ErrorCode::NONE;
+	}
+};
+
+void CommandBufferHandle::dispatchCompute(
+	U32 groupCountX, U32 groupCountY, U32 groupCountZ)
+{
+	get().pushBackNewCommand<DispatchCommand>(
+		groupCountX, groupCountY, groupCountZ);
+}
+
 } // end namespace anki

src/gr/gl/PipelineImpl.cpp

@@ -123,11 +123,14 @@ Error PipelineImpl::create(const Initializer& init)
 	}
 
 	ANKI_CHECK(createGlPipeline());
-	initVertexState();
-	initInputAssemblerState();
-	initRasterizerState();
-	initDepthStencilState();
-	initColorState();
+	if(!m_compute)
+	{
+		initVertexState();
+		initInputAssemblerState();
+		initRasterizerState();
+		initDepthStencilState();
+		initColorState();
+	}
 
 	return ErrorCode::NONE;
 }
@@ -164,11 +167,15 @@ Error PipelineImpl::createGlPipeline()
 	{
 		// Is compute
 
+		m_compute = true;
+
 		ANKI_ASSERT((mask & (1 << 5)) == (1 << 5) 
 			&& "Compute should be alone in the pipeline");
 	}
 	else
 	{
+		m_compute = false;
+
 		const U fragVert = (1 << 0) | (1 << 4);
 		ANKI_ASSERT((mask & fragVert) && "Should contain vert and frag");
 		(void)fragVert;
@@ -234,6 +241,7 @@ void PipelineImpl::bind()
 	ANKI_ASSERT(isCreated());
 	glBindProgramPipeline(m_glName);
 #else
+	// TODO check compute
 	ANKI_ASSERT(m_complete && "Should be complete");
 
 	// Get last pipeline

src/gr/gl/ShaderImpl.cpp

@@ -93,6 +93,7 @@ Error ShaderImpl::create(ShaderType type, const CString& source)
 
 		File file;
 		ANKI_CHECK(file.open(fname.toCString(), File::OpenFlag::WRITE));
+		ANKI_CHECK(file.writeText("%s", &fname[0]));
 	}
 #endif