tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Refactor OpenGL extension loading mechanism

Browse Source 
Previously, we initialized global variables that held pointers to the extension functions. While this seemed to work, the spec doesn't guarantee that the function pointers are identical for different OpenGL contexts. Therefore, we are now making them a member variable of the Context object.
This commit is contained in:
Konstantin Käfer
2017-02-27 18:33:16 +01:00
committed by John Firebaugh
parent 234384ece9
commit e67abfbe67
23 changed files with 453 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/mbgl/gl/value.cpp
View File

@@ -1,6 +1,7 @@
#include <mbgl/gl/value.hpp>
#include <mbgl/gl/gl.hpp>
#include <mbgl/gl/vertex_array.hpp>
#include <mbgl/gl/context.hpp>
#include <mbgl/gl/vertex_array_extension.hpp>
namespace mbgl {
namespace gl {
@@ -328,15 +329,17 @@ BindElementBuffer::Type BindElementBuffer::Get() {
const constexpr BindVertexArray::Type BindVertexArray::Default;
void BindVertexArray::Set(const Type& value) {
if (gl::BindVertexArray) {
MBGL_CHECK_ERROR(gl::BindVertexArray(value));
void BindVertexArray::Set(const Type& value, const Context& context) {
if (auto vertexArray = context.getVertexArrayExtension()) {
if (vertexArray->bindVertexArray) {
MBGL_CHECK_ERROR(vertexArray->bindVertexArray(value));
}
}
}
BindVertexArray::Type BindVertexArray::Get() {
BindVertexArray::Type BindVertexArray::Get(const Context& context) {
GLint binding = 0;
if (gl::BindVertexArray) {
if (context.getVertexArrayExtension()) {
#ifdef GL_VERTEX_ARRAY_BINDING
MBGL_CHECK_ERROR(glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &binding));
#elif GL_VERTEX_ARRAY_BINDING_OES