diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2017-06-21 15:17:35 -0700 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2017-06-21 15:53:51 -0700 |
commit | 6ec406b6affc423a366e74cfe0437a621bf11b81 (patch) | |
tree | a849d6cec76a332f4f2294277303094b48d8385f | |
parent | 7610d428492fa6769e4ebc944a9bc4451a18cb98 (diff) | |
download | qtlocation-mapboxgl-6ec406b6affc423a366e74cfe0437a621bf11b81.tar.gz |
[core] add MBGL_CHECK_ERROR to some locations where it was missing
-rw-r--r-- | src/mbgl/gl/debugging.cpp | 8 | ||||
-rw-r--r-- | test/util/offscreen_texture.test.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mbgl/gl/debugging.cpp b/src/mbgl/gl/debugging.cpp index 0d69d58be5..366b4d63c7 100644 --- a/src/mbgl/gl/debugging.cpp +++ b/src/mbgl/gl/debugging.cpp @@ -10,9 +10,9 @@ namespace gl { DebugGroup::DebugGroup(const Context& context_, const std::string& name) : context(context_) { if (auto debugging = context.getDebuggingExtension()) { if (debugging->pushDebugGroup) { - debugging->pushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, GLsizei(name.size()), name.c_str()); + MBGL_CHECK_ERROR(debugging->pushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, GLsizei(name.size()), name.c_str())); } else if (debugging->pushGroupMarkerEXT) { - debugging->pushGroupMarkerEXT(GLsizei(name.size() + 1), name.c_str()); + MBGL_CHECK_ERROR(debugging->pushGroupMarkerEXT(GLsizei(name.size() + 1), name.c_str())); } } } @@ -20,9 +20,9 @@ DebugGroup::DebugGroup(const Context& context_, const std::string& name) : conte DebugGroup::~DebugGroup() { if (auto debugging = context.getDebuggingExtension()) { if (debugging->popDebugGroup) { - debugging->popDebugGroup(); + MBGL_CHECK_ERROR(debugging->popDebugGroup()); } else if (debugging->popGroupMarkerEXT) { - debugging->popGroupMarkerEXT(); + MBGL_CHECK_ERROR(debugging->popGroupMarkerEXT()); } } } diff --git a/test/util/offscreen_texture.test.cpp b/test/util/offscreen_texture.test.cpp index 0149b1a8dd..8c0d4f7011 100644 --- a/test/util/offscreen_texture.test.cpp +++ b/test/util/offscreen_texture.test.cpp @@ -40,7 +40,7 @@ struct Shader { MBGL_CHECK_ERROR(glCompileShader(fragmentShader)); MBGL_CHECK_ERROR(glAttachShader(program, fragmentShader)); MBGL_CHECK_ERROR(glLinkProgram(program)); - a_pos = glGetAttribLocation(program, "a_pos"); + a_pos = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_pos")); } ~Shader() { @@ -119,7 +119,7 @@ void main() { } )MBGL_SHADER"); - GLuint u_texture = glGetUniformLocation(compositeShader.program, "u_texture"); + GLuint u_texture = MBGL_CHECK_ERROR(glGetUniformLocation(compositeShader.program, "u_texture")); Buffer triangleBuffer({ 0, 0.5, 0.5, -0.5, -0.5, -0.5 }); Buffer viewportBuffer({ -1, -1, 1, -1, -1, 1, 1, 1 }); |