summaryrefslogtreecommitdiff
path: root/src/mbgl/gl/texture.hpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2019-03-15 23:32:45 +0100
committerAlf Watt <alf.watt@mapbox.com>2019-03-21 12:25:10 -0700
commit3b4291e38c95cf7e3b0900df23d709d4d9ce3b06 (patch)
treede366117c47694857eb363fb353107e5d934931c /src/mbgl/gl/texture.hpp
parent25818d5e6f8852b1163a25a98b22271c856d426d (diff)
downloadqtlocation-mapboxgl-3b4291e38c95cf7e3b0900df23d709d4d9ce3b06.tar.gz
[core] remove a_/u_ prefix from attribute/uniform types
Diffstat (limited to 'src/mbgl/gl/texture.hpp')
-rw-r--r--src/mbgl/gl/texture.hpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/gl/texture.hpp b/src/mbgl/gl/texture.hpp
index 0569adc3b0..2058ecd495 100644
--- a/src/mbgl/gl/texture.hpp
+++ b/src/mbgl/gl/texture.hpp
@@ -27,16 +27,16 @@ private:
public:
void queryLocations(const ProgramID& id) {
- state = State{ gl::uniformLocation(id, Ts::name())... };
+ state = State{ gl::uniformLocation(id, Ts::uniformName())... };
}
template <class BinaryProgram>
void loadNamedLocations(const BinaryProgram& program) {
- state = State{ program.textureLocation(Ts::name())... };
+ state = State{ program.textureLocation(Ts::uniformName())... };
}
NamedUniformLocations getNamedLocations() const {
- return NamedUniformLocations{ { Ts::name(), state.template get<Ts>().location }... };
+ return NamedUniformLocations{ { Ts::uniformName(), state.template get<Ts>().location }... };
}
void bind(gl::Context& context, const gfx::TextureBindings<TypeList<Ts...>>& bindings) {