diff options
Diffstat (limited to 'src/mbgl/gl/uniform.cpp')
-rw-r--r-- | src/mbgl/gl/uniform.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mbgl/gl/uniform.cpp b/src/mbgl/gl/uniform.cpp index 3d8a8d53d9..e6c77be50b 100644 --- a/src/mbgl/gl/uniform.cpp +++ b/src/mbgl/gl/uniform.cpp @@ -1,5 +1,6 @@ #include <mbgl/gl/uniform.hpp> -#include <mbgl/gl/gl.hpp> +#include <mbgl/gl/defines.hpp> +#include <mbgl/platform/gl_functions.hpp> #include <mbgl/util/color.hpp> #include <mbgl/util/size.hpp> #include <mbgl/util/convert.hpp> @@ -9,6 +10,8 @@ namespace mbgl { namespace gl { +using namespace platform; + UniformLocation uniformLocation(ProgramID id, const char* name) { return MBGL_CHECK_ERROR(glGetUniformLocation(id, name)); } @@ -101,8 +104,7 @@ ActiveUniforms activeUniforms(ProgramID id) { GLint size; GLenum type; for (GLint index = 0; index < count; index++) { - MBGL_CHECK_ERROR( - glGetActiveUniform(id, index, maxLength, &length, &size, &type, name.get())); + MBGL_CHECK_ERROR(glGetActiveUniform(id, index, maxLength, &length, &size, &type, name.get())); active.emplace( std::string{ name.get(), static_cast<size_t>(length) }, ActiveUniform{ static_cast<size_t>(size), static_cast<UniformDataType>(type) }); |