Merge pull request #14126 from mapbox/gfx-refactor-4

Graphics refactor #4
This commit is contained in:
Konstantin Käfer
2019-03-15 20:31:12 +01:00
committed by GitHub
parent 62695c5695
commit c8cfdb1ced
156 changed files with 2486 additions and 2573 deletions

View File

@@ -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));