Derive ProgramCompiler::DeclarationCombiner from BlockModifier

[libs/gl.git] / source / mesh.cpp

diff --git a/source/mesh.cpp b/source/mesh.cpp
index d0e71489f1f48a22c6de0d1b686648c452024d98..8c1e79c49b3efaffbfcdbf0216a7105a15bd5fe9 100644 (file)
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -1,4 +1,5 @@
 #include <msp/gl/extensions/arb_vertex_array_object.h>
+#include <msp/gl/extensions/arb_vertex_buffer_object.h>
 #include <msp/gl/extensions/arb_vertex_shader.h>
 #include <msp/gl/extensions/nv_primitive_restart.h>
 #include "buffer.h"
@@ -29,7 +30,7 @@ void Mesh::init(ResourceManager *rm)
        vbuf = 0;
        ibuf = 0;
        vao_id = 0;
-       defer_buffers = true;
+       defer_buffers = ARB_vertex_buffer_object;
        dirty = true;
        disallow_rendering = false;
        winding = 0;
@@ -274,7 +275,7 @@ Mesh::AsyncLoader::AsyncLoader(Mesh &m, IO::Seekable &i):
        phase(0)
 {
        // Make sure the extension is initialized in the rendering thread.
-       (bool)NV_primitive_restart;
+       (void)(bool)NV_primitive_restart;
 
        mesh.disallow_rendering = true;
        if(mesh.defer_buffers)