merge text and icon buckets/styles

(we're not yet placing together!)

1 files changed, 0 insertions, 61 deletions

diff --git a/include/mbgl/renderer/text_bucket.hpp b/include/mbgl/renderer/text_bucket.hpp
deleted file mode 100644
index cb4b8f2cda..0000000000
--- a/include/mbgl/renderer/text_bucket.hpp
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef MBGL_RENDERER_TEXTBUCKET
-#define MBGL_RENDERER_TEXTBUCKET
-
-#include "bucket.hpp"
-#include <mbgl/geometry/vao.hpp>
-#include <mbgl/geometry/elements_buffer.hpp>
-#include <mbgl/map/vector_tile.hpp>
-#include <mbgl/text/types.hpp>
-#include <mbgl/text/glyph.hpp>
-#include <mbgl/style/style_bucket.hpp>
-
-#include <memory>
-#include <map>
-#include <vector>
-
-namespace mbgl {
-
-class Style;
-class TextVertexBuffer;
-class TriangleElementsBuffer;
-class TextShader;
-class Placement;
-struct pbf;
-
-class TextBucket : public Bucket {
-    typedef ElementGroup triangle_group_type;
-
-public:
-    TextBucket(
-        TextVertexBuffer &vertexBuffer,
-        TriangleElementsBuffer &triangleElementsBuffer,
-        const StyleBucketText &properties, Placement &placement);
-
-    virtual void render(Painter &painter, std::shared_ptr<StyleLayer> layer_desc, const Tile::ID &id);
-    virtual bool hasData() const;
-
-    void addGlyphs(const PlacedGlyphs &glyphs, float placementZoom,
-                   PlacementRange placementRange, float zoom);
-
-    void addFeature(const pbf &geometry,
-                    const GlyphPositions &face,
-                    const Shaping &shaping);
-
-    void drawGlyphs(TextShader &shader);
-
-public:
-    const StyleBucketText &properties;
-
-private:
-    TextVertexBuffer& vertexBuffer;
-    TriangleElementsBuffer& triangleElementsBuffer;
-    Placement &placement;
-
-    const size_t vertex_start;
-    const size_t triangle_elements_start;
-
-    std::vector<triangle_group_type> triangleGroups;
-};
-}
-
-#endif