summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-02-25 14:57:21 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-02-25 14:58:39 +0100
commit6fd77b36c29e1f0e84a3af478be07e425846ec5a (patch)
treedfce68beb93cd49988f24e6332ff0a003be27bc8
parent1a8d5a27d98d865845cdf16b294efb6a113db3cc (diff)
Fix sent upstream (nw)
-rw-r--r--3rdparty/bgfx/src/glcontext_ppapi.cpp6
1 files changed, 5 insertions, 1 deletions
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, &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()