[core] Remove TexturePool from style::UpdateParameters (#5442)

This commit is contained in:
John Firebaugh
2016-06-22 12:32:06 -07:00
committed by GitHub
parent 9b533eb916
commit 699076c2fa
4 changed files with 0 additions and 10 deletions

View File

@@ -234,7 +234,6 @@ void Map::Impl::update() {
transform.getState(),
style->workers,
fileSource,
*texturePool,
style->shouldReparsePartialTiles,
mode,
*annotationManager,

View File

@@ -7,7 +7,6 @@ namespace mbgl {
class TransformState;
class Worker;
class FileSource;
namespace gl { class TexturePool; }
class AnnotationManager;
namespace style {
@@ -22,7 +21,6 @@ public:
const TransformState& transformState_,
Worker& worker_,
FileSource& fileSource_,
gl::TexturePool& texturePool_,
bool shouldReparsePartialTiles_,
const MapMode mode_,
AnnotationManager& annotationManager_,
@@ -33,7 +31,6 @@ public:
transformState(transformState_),
worker(worker_),
fileSource(fileSource_),
texturePool(texturePool_),
shouldReparsePartialTiles(shouldReparsePartialTiles_),
mode(mode_),
annotationManager(annotationManager_),
@@ -45,7 +42,6 @@ public:
const TransformState& transformState;
Worker& worker;
FileSource& fileSource;
gl::TexturePool& texturePool;
bool shouldReparsePartialTiles;
const MapMode mode;
AnnotationManager& annotationManager;

View File

@@ -9,8 +9,6 @@ namespace mbgl {
class AsyncRequest;
class Tileset;
namespace gl { class TexturePool; }
namespace style {
class Layer;
class UpdateParameters;

View File

@@ -15,7 +15,6 @@
#include <mbgl/map/transform.hpp>
#include <mbgl/util/worker.hpp>
#include <mbgl/gl/texture_pool.hpp>
#include <mbgl/style/style.hpp>
#include <mbgl/style/update_parameters.hpp>
#include <mbgl/style/layers/line_layer.hpp>
@@ -33,7 +32,6 @@ public:
Transform transform;
TransformState transformState;
Worker worker { 1 };
gl::TexturePool texturePool;
AnnotationManager annotationManager { 1.0 };
style::Style style { fileSource, 1.0 };
@@ -44,7 +42,6 @@ public:
transformState,
worker,
fileSource,
texturePool,
true,
MapMode::Continuous,
annotationManager,