diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-03-15 20:31:12 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-15 20:31:12 +0100 |
commit | c8cfdb1ced822711e772dfcc8f708b1a7a68b5fc (patch) | |
tree | bf511253e25459cafc91a5f3bea2f5c773677162 /src/mbgl/gl/value.cpp | |
parent | 62695c56956add5560933137a479f29f2d3a091b (diff) | |
download | qtlocation-mapboxgl-c8cfdb1ced822711e772dfcc8f708b1a7a68b5fc.tar.gz |
Merge pull request #14126 from mapbox/gfx-refactor-4
Graphics refactor #4
Diffstat (limited to 'src/mbgl/gl/value.cpp')
-rw-r--r-- | src/mbgl/gl/value.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/gl/value.cpp b/src/mbgl/gl/value.cpp index 8f5b53fcac..bd08ac48fc 100644 --- a/src/mbgl/gl/value.cpp +++ b/src/mbgl/gl/value.cpp @@ -397,7 +397,7 @@ BindVertexArray::Type BindVertexArray::Get(const Context& context) { return binding; } -const optional<AttributeBinding> VertexAttribute::Default {}; +const VertexAttribute::Type VertexAttribute::Default {}; namespace { @@ -484,7 +484,7 @@ GLint components(const gfx::AttributeDataType type) { } // namespace -void VertexAttribute::Set(const optional<AttributeBinding>& binding, Context& context, AttributeLocation location) { +void VertexAttribute::Set(const Type& binding, Context& context, AttributeLocation location) { if (binding) { context.vertexBuffer = reinterpret_cast<const gl::VertexBufferResource&>(*binding->vertexBufferResource).buffer; MBGL_CHECK_ERROR(glEnableVertexAttribArray(location)); |