From a0e8851530e6009703e0e922a55c92c2f32dee82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Wed, 13 Aug 2014 17:46:36 +0200 Subject: [PATCH] use vaos only when the value is 1, not when it is merely defined --- include/mbgl/geometry/vao.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/mbgl/geometry/vao.hpp b/include/mbgl/geometry/vao.hpp index 71d7ff89f..e27e2c58a 100644 --- a/include/mbgl/geometry/vao.hpp +++ b/include/mbgl/geometry/vao.hpp @@ -11,7 +11,7 @@ class VertexArrayObject { public: template void bind(Shader& shader, VertexBuffer& vertex_buffer, char *offset) { -#ifdef GL_ARB_vertex_array_object +#if GL_ARB_vertex_array_object if (!vao) { glGenVertexArrays(1, &vao); glBindVertexArray(vao); @@ -28,7 +28,7 @@ public: vertex_buffer.bind(); shader.bind(offset); -#ifdef GL_ARB_vertex_array_object +#if GL_ARB_vertex_array_object shader_ptr = &shader; vertex_buffer_ptr = &vertex_buffer; elements_buffer_ptr = nullptr; @@ -45,7 +45,7 @@ public: template void bind(Shader& shader, VertexBuffer& vertex_buffer, ElementsBuffer& elements_buffer, char *offset) { -#ifdef GL_ARB_vertex_array_object +#if GL_ARB_vertex_array_object if (!vao) { glGenVertexArrays(1, &vao); glBindVertexArray(vao); @@ -60,7 +60,7 @@ public: elements_buffer.bind(); shader.bind(offset); -#ifdef GL_ARB_vertex_array_object +#if GL_ARB_vertex_array_object shader_ptr = &shader; vertex_buffer_ptr = &vertex_buffer; elements_buffer_ptr = &elements_buffer; @@ -76,7 +76,7 @@ public: } ~VertexArrayObject() { -#ifdef GL_ARB_vertex_array_object +#if GL_ARB_vertex_array_object if (vao) { glDeleteVertexArrays(1, &vao); } @@ -84,7 +84,7 @@ public: } private: -#ifdef GL_ARB_vertex_array_object +#if GL_ARB_vertex_array_object GLuint vao = 0; // For debug reasons, we're storing the bind information so that we can