summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/src/renderer_gl.cpp
diff options
context:
space:
mode:
author Branimir Karadžić <branimirkaradzic@gmail.com>2016-02-09 14:27:17 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-02-09 14:27:17 +0100
commita8c8ec182f5af929f5085b2cda1ca41be0f7c2be (patch)
tree7b52d9a6ec2c06464c3b89e3374a5af5db8fe71b /3rdparty/bgfx/src/renderer_gl.cpp
parent0439abe3c7c3636dad33a93b77e7fb0e6d7f7fdf (diff)
Update BGFX with latest code (nw)
Diffstat (limited to '3rdparty/bgfx/src/renderer_gl.cpp')
-rw-r--r--3rdparty/bgfx/src/renderer_gl.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/3rdparty/bgfx/src/renderer_gl.cpp b/3rdparty/bgfx/src/renderer_gl.cpp
index be4ab0a09d7..ff6184ccc98 100644
--- a/3rdparty/bgfx/src/renderer_gl.cpp
+++ b/3rdparty/bgfx/src/renderer_gl.cpp
@@ -2389,7 +2389,10 @@ namespace bgfx { namespace gl
if (BX_ENABLED(BGFX_CONFIG_RENDERER_OPENGL)
|| BX_ENABLED(BGFX_CONFIG_RENDERER_OPENGLES >= 30) )
{
- GL_CHECK(glBindSampler(0, 0) );
+ if (m_samplerObjectSupport)
+ {
+ GL_CHECK(glBindSampler(0, 0) );
+ }
}
}
}