Merge pull request #696 from mmicko/master

fix pnacl compile
This commit is contained in:
Branimir Karadžić 2016-02-25 09:28:08 -08:00
commit 009a40efe0

View file

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