diff options
| author | Ansis Brammanis <brammanis@gmail.com> | 2015-05-28 20:01:15 -0400 |
|---|---|---|
| committer | Ansis Brammanis <brammanis@gmail.com> | 2015-05-28 20:01:15 -0400 |
| commit | ff6a5ce5bc674e17a24c3f18b305d5dd2f0e21b0 (patch) | |
| tree | 405ec719109186590311262045ff1651b06e9506 /src/mbgl/shader/shader.cpp | |
| parent | fd19eb79056b8e62f037c0ae4532f4f7cc970580 (diff) | |
| parent | 6c166b564ebb3acefb56bb4d39be4813851db4a7 (diff) | |
| download | qtlocation-mapboxgl-ff6a5ce5bc674e17a24c3f18b305d5dd2f0e21b0.tar.gz | |
Merge remote-tracking branch 'origin/master' into new-labelling
Conflicts:
src/mbgl/map/source.cpp
src/mbgl/map/source.hpp
src/mbgl/map/tile_data.cpp
src/mbgl/map/tile_parser.cpp
src/mbgl/map/vector_tile_data.cpp
src/mbgl/renderer/painter.cpp
src/mbgl/renderer/symbol_bucket.cpp
src/mbgl/text/glyph.hpp
src/mbgl/text/glyph_store.cpp
src/mbgl/text/placement.cpp
test/suite
Diffstat (limited to 'src/mbgl/shader/shader.cpp')
| -rw-r--r-- | src/mbgl/shader/shader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/shader/shader.cpp b/src/mbgl/shader/shader.cpp index a079409aa0..6210c1c32e 100644 --- a/src/mbgl/shader/shader.cpp +++ b/src/mbgl/shader/shader.cpp @@ -51,7 +51,7 @@ Shader::Shader(const char *name_, const GLchar *vertSource, const GLchar *fragSo if (status == 0) { GLint logLength; MBGL_CHECK_ERROR(glGetProgramiv(program, GL_INFO_LOG_LENGTH, &logLength)); - std::unique_ptr<GLchar[]> log = mbgl::util::make_unique<GLchar[]>(logLength); + const auto log = std::make_unique<GLchar[]>(logLength); if (logLength > 0) { MBGL_CHECK_ERROR(glGetProgramInfoLog(program, logLength, &logLength, log.get())); Log::Error(Event::Shader, "Program failed to link: %s", log.get()); @@ -76,7 +76,7 @@ Shader::Shader(const char *name_, const GLchar *vertSource, const GLchar *fragSo if (status == 0) { GLint logLength; MBGL_CHECK_ERROR(glGetProgramiv(program, GL_INFO_LOG_LENGTH, &logLength)); - std::unique_ptr<GLchar[]> log = mbgl::util::make_unique<GLchar[]>(logLength); + const auto log = std::make_unique<GLchar[]>(logLength); if (logLength > 0) { MBGL_CHECK_ERROR(glGetProgramInfoLog(program, logLength, &logLength, log.get())); Log::Error(Event::Shader, "Program failed to validate: %s", log.get()); @@ -115,7 +115,7 @@ bool Shader::compileShader(GLuint *shader, GLenum type, const GLchar *source) { GLint logLength; MBGL_CHECK_ERROR(glGetShaderiv(*shader, GL_INFO_LOG_LENGTH, &logLength)); if (logLength > 0) { - std::unique_ptr<GLchar[]> log = mbgl::util::make_unique<GLchar[]>(logLength); + const auto log = std::make_unique<GLchar[]>(logLength); MBGL_CHECK_ERROR(glGetShaderInfoLog(*shader, logLength, &logLength, log.get())); Log::Error(Event::Shader, "Shader failed to compile: %s", log.get()); } |