[core] Restore support for GL implementations without VAO extension

This commit is contained in:
John Firebaugh
2017-02-08 15:57:58 -08:00
parent 0b3873c7b5
commit 0bbc6b814c
5 changed files with 42 additions and 10 deletions

View File

@@ -6,6 +6,7 @@
#include <mbgl/map/map.hpp>
#include <mbgl/gl/headless_backend.hpp>
#include <mbgl/gl/offscreen_view.hpp>
#include <mbgl/gl/context.hpp>
#include <mbgl/util/default_thread_pool.hpp>
#include <mbgl/sprite/sprite_image.hpp>
#include <mbgl/storage/network_status.hpp>
@@ -305,6 +306,24 @@ TEST(Map, AddLayer) {
test::checkImage("test/fixtures/map/add_layer", test::render(map, test.view));
}
TEST(Map, WithoutVAOExtension) {
MapTest test;
test.backend.getContext().disableVAOExtension = true;
#ifdef MBGL_ASSET_ZIP
// Regenerate with `cd test/fixtures/api/ && zip -r assets.zip assets/`
DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets.zip");
#else
DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets");
#endif
Map map(test.backend, test.view.size, 1, fileSource, test.threadPool, MapMode::Still);
map.setStyleJSON(util::read_file("test/fixtures/api/water.json"));
test::checkImage("test/fixtures/map/no_vao", test::render(map, test.view), 0.002);
}
TEST(Map, RemoveLayer) {
MapTest test;