Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-19 21:42:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed amalgamated build with multiple renderers.

Browse Source
This commit is contained in:
Branimir Karadžić
2015-03-21 22:11:59 -07:00
parent f5afbffe64
commit 6ba3a60c1a
24 changed files with 201 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/glcontext_ppapi.cpp
View File

@@ -9,14 +9,14 @@
# include <bgfxplatform.h>
# include "renderer_gl.h"
namespace bgfx
namespace bgfx { namespace gl
{
# define GL_IMPORT(_optional, _proto, _func, _import) _proto _func
# include "glimports.h"
void naclSwapCompleteCb(void* /*_data*/, int32_t /*_result*/);
PP_CompletionCallback naclSwapComplete =
PP_CompletionCallback naclSwapComplete =
{
naclSwapCompleteCb,
NULL,
@@ -62,7 +62,7 @@ namespace bgfx
PostSwapBuffersFn m_postSwapBuffers;
bool m_forceSwap;
};
static Ppapi s_ppapi;
void naclSwapCompleteCb(void* /*_data*/, int32_t /*_result*/)
@@ -192,6 +192,6 @@ namespace bgfx
return s_ppapi.isValid();
}
} // namespace bgfx
} /* namespace gl */ } // namespace bgfx
#endif // BX_PLATFORM_NACL && (BGFX_CONFIG_RENDERER_OPENGLES || BGFX_CONFIG_RENDERER_OPENGL)