From 6fd77b36c29e1f0e84a3af478be07e425846ec5a Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 25 Feb 2016 14:57:21 +0100 Subject: Fix sent upstream (nw) --- 3rdparty/bgfx/src/glcontext_ppapi.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to '3rdparty/bgfx/src/glcontext_ppapi.cpp') diff --git a/3rdparty/bgfx/src/glcontext_ppapi.cpp b/3rdparty/bgfx/src/glcontext_ppapi.cpp index a4290cc3005..a4887103e63 100644 --- a/3rdparty/bgfx/src/glcontext_ppapi.cpp +++ b/3rdparty/bgfx/src/glcontext_ppapi.cpp @@ -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, ¶ms); *_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() -- cgit v1.2.3-70-g09d2