scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-28 02:25:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #696 from mmicko/master

Browse source 
fix pnacl compile
This commit is contained in:
Branimir Karadžić 2016-02-25 09:28:08 -08:00
commit 009a40efe0
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/glcontext_ppapi.cpp
View file

@ -121,11 +121,15 @@ namespace bgfx { namespace gl
static void GL_APIENTRY naclGetQueryObjectiv(GLuint _id, GLenum _pname, GLint* _params) static void GL_APIENTRY naclGetQueryObjectiv(GLuint _id, GLenum _pname, GLint* _params)
{ {
BX_UNUSED(_id);
BX_UNUSED(_pname);
s_ppapi.m_query->GetQueryivEXT(s_ppapi.m_context, GL_ANY_SAMPLES_PASSED_EXT, GL_CURRENT_QUERY_EXT, _params); s_ppapi.m_query->GetQueryivEXT(s_ppapi.m_context, GL_ANY_SAMPLES_PASSED_EXT, GL_CURRENT_QUERY_EXT, _params);
} }
static void GL_APIENTRY naclGetQueryObjectui64v(GLuint _id, GLenum _pname, GLuint64* _params) static void GL_APIENTRY naclGetQueryObjectui64v(GLuint _id, GLenum _pname, GLuint64* _params)
{ {
BX_UNUSED(_id);
BX_UNUSED(_pname);
GLint params; GLint params;
s_ppapi.m_query->GetQueryivEXT(s_ppapi.m_context, GL_ANY_SAMPLES_PASSED_EXT, GL_CURRENT_QUERY_EXT, &params); s_ppapi.m_query->GetQueryivEXT(s_ppapi.m_context, GL_ANY_SAMPLES_PASSED_EXT, GL_CURRENT_QUERY_EXT, &params);
*_params = params; *_params = params;
@ -192,7 +196,7 @@ namespace bgfx { namespace gl
BX_UNUSED(_width, _height); BX_UNUSED(_width, _height);
BX_TRACE("GlContext::create"); BX_TRACE("GlContext::create");
g_internalData.context = m_context; g_internalData.context = &s_ppapi.m_context;
} }
void GlContext::destroy() void GlContext::destroy()