diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-03-15 23:32:45 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-03-20 15:40:47 +0100 |
commit | 0ad2375e1047353fc65fabce3ac9123dc095179e (patch) | |
tree | adfcd395cb9f38a3eff6845bb63e3ab8bcf131a3 /src/mbgl/gl | |
parent | 9ee1de575af4ef332ad8812c11d9d63edc94d76e (diff) | |
download | qtlocation-mapboxgl-0ad2375e1047353fc65fabce3ac9123dc095179e.tar.gz |
[core] remove a_/u_ prefix from attribute/uniform types
Diffstat (limited to 'src/mbgl/gl')
-rw-r--r-- | src/mbgl/gl/attribute.hpp | 6 | ||||
-rw-r--r-- | src/mbgl/gl/texture.hpp | 6 | ||||
-rw-r--r-- | src/mbgl/gl/uniform.hpp | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/mbgl/gl/attribute.hpp b/src/mbgl/gl/attribute.hpp index c4fe8b993f..32493d207a 100644 --- a/src/mbgl/gl/attribute.hpp +++ b/src/mbgl/gl/attribute.hpp @@ -50,13 +50,13 @@ public: } }; - return Locations{ maybeBindLocation(As::name())... }; + return Locations{ maybeBindLocation(As::attributeName())... }; }()) { } template <class BinaryProgram> AttributeLocations(const BinaryProgram& program) - : locations{ program.attributeLocation(As::name())... } { + : locations{ program.attributeLocation(As::attributeName())... } { } NamedAttributeLocations getNamedLocations() const { @@ -68,7 +68,7 @@ public: } }; - util::ignore({ (maybeAddLocation(As::name(), locations.template get<As>()), 0)... }); + util::ignore({ (maybeAddLocation(As::attributeName(), locations.template get<As>()), 0)... }); return result; } 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) { diff --git a/src/mbgl/gl/uniform.hpp b/src/mbgl/gl/uniform.hpp index 770f3e2294..64c83cab6b 100644 --- a/src/mbgl/gl/uniform.hpp +++ b/src/mbgl/gl/uniform.hpp @@ -73,21 +73,21 @@ public: util::ignore( { // Some shader programs have uniforms declared, but not used, so they're not active. // Therefore, we'll only verify them when they are indeed active. - (active.find(Us::name()) != active.end() - ? verifyUniform<typename Us::Value>(active.at(Us::name())) + (active.find(Us::uniformName()) != active.end() + ? verifyUniform<typename Us::Value>(active.at(Us::uniformName())) : false)... }); #endif - state = State{ gl::uniformLocation(id, Us::name())... }; + state = State{ gl::uniformLocation(id, Us::uniformName())... }; } template <class BinaryProgram> void loadNamedLocations(const BinaryProgram& program) { - state = State{ UniformState<typename Us::Value>(program.uniformLocation(Us::name()))... }; + state = State{ UniformState<typename Us::Value>(program.uniformLocation(Us::uniformName()))... }; } NamedUniformLocations getNamedLocations() const { - return NamedUniformLocations{ { Us::name(), state.template get<Us>().location }... }; + return NamedUniformLocations{ { Us::uniformName(), state.template get<Us>().location }... }; } void bind(const gfx::UniformValues<TypeList<Us...>>& values) { |