Fixed NaCl initialization.

2026-02-18 04:53:06 +01:00 · 2013-09-30 20:09:09 -07:00
parent df1dfdc872
commit 2cf5c45224
5 changed files with 135 additions and 80 deletions
--- a/src/glcontext_ppapi.cpp
+++ b/src/glcontext_ppapi.cpp
@@ -6,6 +6,7 @@
 #include "bgfx_p.h"

 #if BX_PLATFORM_NACL & (BGFX_CONFIG_RENDERER_OPENGLES2|BGFX_CONFIG_RENDERER_OPENGLES3|BGFX_CONFIG_RENDERER_OPENGL)
+#	include <bgfxplatform.h>
 #	include "renderer_gl.h"

 namespace bgfx
@@ -14,7 +15,9 @@ namespace bgfx
 #		include "glimports.h"
 #	undef GL_IMPORT

-	void naclSwapCompleteCb(void* _data, int32_t _result);
+	extern bool hasContext();
+
+	void naclSwapCompleteCb(void* /*_data*/, int32_t /*_result*/);

 	PP_CompletionCallback naclSwapComplete = 
 	{
@@ -23,8 +26,95 @@ namespace bgfx
 		PP_COMPLETIONCALLBACK_FLAG_NONE
 	};

-	void GlContext::create(uint32_t _width, uint32_t _height)
+	struct Ppapi
 	{
+		Ppapi()
+			: m_context(0)
+			, m_instance(0)
+			, m_instInterface(NULL)
+			, m_graphicsInterface(NULL)
+			, m_instancedArrays(NULL)
+			, m_postSwapBuffers(NULL)
+			, m_forceSwap(true)
+		{
+		}
+
+		void setIntefraces(PP_Instance _instance, const PPB_Instance* _instInterface, const PPB_Graphics3D* _graphicsInterface, PostSwapBuffersFn _postSwapBuffers);
+
+		void resize(uint32_t _width, uint32_t _height, bool /*_vsync*/)
+		{
+			m_graphicsInterface->ResizeBuffers(m_context, _width, _height);
+		}
+
+		void swap()
+		{
+			glSetCurrentContextPPAPI(m_context);
+			m_graphicsInterface->SwapBuffers(m_context, naclSwapComplete);
+		}
+
+		bool isValid() const
+		{
+			return 0 != m_context;
+		}
+
+		PP_Resource m_context;
+		PP_Instance m_instance;
+		const PPB_Instance* m_instInterface;
+		const PPB_Graphics3D* m_graphicsInterface;
+		const PPB_OpenGLES2InstancedArrays* m_instancedArrays;
+		PostSwapBuffersFn m_postSwapBuffers;
+		bool m_forceSwap;
+	};
+	
+	static Ppapi s_ppapi;
+
+	void naclSwapCompleteCb(void* /*_data*/, int32_t /*_result*/)
+	{
+		// For NaCl bgfx doesn't create render thread, but rendering is always
+		// multithreaded. Frame rendering is done on main thread, and context
+		// is initialized when PPAPI interfaces are set. Force swap is there to
+		// keep calling swap complete callback, so that initialization doesn't
+		// deadlock on semaphores.
+		if (s_ppapi.m_forceSwap)
+		{
+			s_ppapi.swap();
+		}
+
+		if (hasContext() )
+		{
+			renderFrame();
+		}
+	}
+
+	static void GL_APIENTRY naclVertexAttribDivisor(GLuint _index, GLuint _divisor)
+	{
+		s_ppapi.m_instancedArrays->VertexAttribDivisorANGLE(s_ppapi.m_context, _index, _divisor);
+	}
+
+	static void GL_APIENTRY naclDrawArraysInstanced(GLenum _mode, GLint _first, GLsizei _count, GLsizei _primcount)
+	{
+		s_ppapi.m_instancedArrays->DrawArraysInstancedANGLE(s_ppapi.m_context, _mode, _first, _count, _primcount);
+	}
+
+	static void GL_APIENTRY naclDrawElementsInstanced(GLenum _mode, GLsizei _count, GLenum _type, const GLvoid* _indices, GLsizei _primcount)
+	{
+		s_ppapi.m_instancedArrays->DrawElementsInstancedANGLE(s_ppapi.m_context, _mode, _count, _type, _indices, _primcount);
+	}
+
+	void naclSetIntefraces(PP_Instance _instance, const PPB_Instance* _instInterface, const PPB_Graphics3D* _graphicsInterface, PostSwapBuffersFn _postSwapBuffers)
+	{
+		s_ppapi.setIntefraces( _instance, _instInterface, _graphicsInterface, _postSwapBuffers);
+	}
+
+	void Ppapi::setIntefraces(PP_Instance _instance, const PPB_Instance* _instInterface, const PPB_Graphics3D* _graphicsInterface, PostSwapBuffersFn _postSwapBuffers)
+	{
+		BX_TRACE("PPAPI Interfaces");
+		m_instance = _instance;
+		m_instInterface = _instInterface;
+		m_graphicsInterface = _graphicsInterface;
+		m_instancedArrays = glGetInstancedArraysInterfacePPAPI();
+		m_postSwapBuffers = _postSwapBuffers;
+
 		int32_t attribs[] =
 		{
 			PP_GRAPHICS3DATTRIB_ALPHA_SIZE, 8,
@@ -32,8 +122,8 @@ namespace bgfx
 			PP_GRAPHICS3DATTRIB_STENCIL_SIZE, 8,
 			PP_GRAPHICS3DATTRIB_SAMPLES, 0,
 			PP_GRAPHICS3DATTRIB_SAMPLE_BUFFERS, 0,
-			PP_GRAPHICS3DATTRIB_WIDTH, int32_t(_width),
-			PP_GRAPHICS3DATTRIB_HEIGHT, int32_t(_height),
+			PP_GRAPHICS3DATTRIB_WIDTH, BGFX_DEFAULT_WIDTH,
+			PP_GRAPHICS3DATTRIB_HEIGHT, BGFX_DEFAULT_HEIGHT,
 			PP_GRAPHICS3DATTRIB_NONE
 		};

@@ -41,26 +131,41 @@ namespace bgfx
 		m_instInterface->BindGraphics(m_instance, m_context);
 		glSetCurrentContextPPAPI(m_context);
 		m_graphicsInterface->SwapBuffers(m_context, naclSwapComplete);
+
+		glVertexAttribDivisor   = naclVertexAttribDivisor;
+		glDrawArraysInstanced   = naclDrawArraysInstanced;
+		glDrawElementsInstanced = naclDrawElementsInstanced;
+	}
+
+	void GlContext::create(uint32_t _width, uint32_t _height)
+	{
+		BX_TRACE("GlContext::create");
 	}

 	void GlContext::destroy()
 	{
 	}

-	void GlContext::resize(uint32_t _width, uint32_t _height, bool /*_vsync*/)
+	void GlContext::resize(uint32_t _width, uint32_t _height, bool _vsync)
 	{
-		m_graphicsInterface->ResizeBuffers(m_context, _width, _height);
+		s_ppapi.m_forceSwap = false;
+		s_ppapi.resize(_width, _height, _vsync);
 	}

 	void GlContext::swap()
 	{
-		glSetCurrentContextPPAPI(m_context);
-		m_graphicsInterface->SwapBuffers(m_context, naclSwapComplete);
+		s_ppapi.swap();
 	}

 	void GlContext::import()
 	{
 	}
+
+	bool GlContext::isValid() const
+	{
+		return s_ppapi.isValid();
+	}
+
 } // namespace bgfx

 #endif // BX_PLATFORM_NACL & (BGFX_CONFIG_RENDERER_OPENGLES2|BGFX_CONFIG_RENDERER_OPENGLES3|BGFX_CONFIG_RENDERER_OPENGL)