[core] Remove unused WritingMode from getIconQuads

4 files changed, 17 insertions, 18 deletions

diff --git a/src/mbgl/layout/symbol_instance.cpp b/src/mbgl/layout/symbol_instance.cpp
index 5c92d2f678..3a16d25de6 100644
--- a/src/mbgl/layout/symbol_instance.cpp
+++ b/src/mbgl/layout/symbol_instance.cpp
@@ -31,10 +31,9 @@ SymbolInstanceSharedData::SymbolInstanceSharedData(GeometryCoordinates line_,
     : line(std::move(line_)) {
     // Create the quads used for rendering the icon and glyphs.
     if (shapedIcon) {
-        iconQuads = getIconQuads(*shapedIcon, getAnyShaping(shapedTextOrientations).writingMode, iconType);
+        iconQuads = getIconQuads(*shapedIcon, iconType);
         if (verticallyShapedIcon) {
-            verticalIconQuads =
-                getIconQuads(*verticallyShapedIcon, shapedTextOrientations.vertical.writingMode, iconType);
+            verticalIconQuads = getIconQuads(*verticallyShapedIcon, iconType);
         }
     }
 
diff --git a/src/mbgl/text/quads.cpp b/src/mbgl/text/quads.cpp
index 9d4e83c0d6..fe683f7d98 100644
--- a/src/mbgl/text/quads.cpp
+++ b/src/mbgl/text/quads.cpp
@@ -14,7 +14,7 @@ namespace mbgl {
 
 using namespace style;
 
-SymbolQuads getIconQuads(const PositionedIcon& shapedIcon, WritingModeType writingMode, SymbolContent iconType) {
+SymbolQuads getIconQuads(const PositionedIcon& shapedIcon, SymbolContent iconType) {
     const ImagePosition& image = shapedIcon.image();
 
     // If you have a 10px icon that isn't perfectly aligned to the pixel grid it will cover 11 actual
@@ -65,7 +65,7 @@ SymbolQuads getIconQuads(const PositionedIcon& shapedIcon, WritingModeType writi
                        bl,
                        br,
                        image.paddedRect,
-                       writingMode,
+                       WritingModeType::None,
                        {0.0f, 0.0f},
                        iconType == SymbolContent::IconSDF,
                        pixelOffsetTL,
diff --git a/src/mbgl/text/quads.hpp b/src/mbgl/text/quads.hpp
index b6d2687d07..aa1913204e 100644
--- a/src/mbgl/text/quads.hpp
+++ b/src/mbgl/text/quads.hpp
@@ -57,7 +57,7 @@ public:
 
 using SymbolQuads = std::vector<SymbolQuad>;
 
-SymbolQuads getIconQuads(const PositionedIcon& shapedIcon, WritingModeType writingMode, SymbolContent iconType);
+SymbolQuads getIconQuads(const PositionedIcon& shapedIcon, SymbolContent iconType);
 
 SymbolQuads getGlyphQuads(const Shaping& shapedText,
                           const std::array<float, 2> textOffset,
diff --git a/test/text/quads.test.cpp b/test/text/quads.test.cpp
index a07f89f21a..46019da3ce 100644
--- a/test/text/quads.test.cpp
+++ b/test/text/quads.test.cpp
@@ -22,7 +22,7 @@ TEST(getIconQuads, normal) {
 
     GeometryCoordinates line;
 
-    SymbolQuads quads = getIconQuads(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA);
+    SymbolQuads quads = getIconQuads(shapedIcon, SymbolContent::IconRGBA);
 
     ASSERT_EQ(quads.size(), 1);
     const auto& quad = quads[0];
@@ -62,7 +62,7 @@ TEST(getIconQuads, style) {
         EXPECT_FLOAT_EQ(-18.5f, shapedIcon.left());
 
         SymbolLayoutProperties::Evaluated layout;
-        SymbolQuads quads = getIconQuads(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA);
+        SymbolQuads quads = getIconQuads(shapedIcon, SymbolContent::IconRGBA);
 
         ASSERT_EQ(quads.size(), 1);
         const auto& quad = quads[0];
@@ -81,7 +81,7 @@ TEST(getIconQuads, style) {
     {
         auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0);
         shapedIcon.fitIconToText(shapedText, IconTextFitType::Width, {{0, 0, 0, 0}}, {{0, 0}}, 24.0f / 24.0f);
-        SymbolQuads quads = getIconQuads(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA);
+        SymbolQuads quads = getIconQuads(shapedIcon, SymbolContent::IconRGBA);
 
         ASSERT_EQ(quads.size(), 1);
         const auto& quad = quads[0];
@@ -100,7 +100,7 @@ TEST(getIconQuads, style) {
     {
         auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0);
         shapedIcon.fitIconToText(shapedText, IconTextFitType::Width, {{0, 0, 0, 0}}, {{0, 0}}, 12.0f / 24.0f);
-        SymbolQuads quads = getIconQuads(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA);
+        SymbolQuads quads = getIconQuads(shapedIcon, SymbolContent::IconRGBA);
 
         ASSERT_EQ(quads.size(), 1);
         const auto& quad = quads[0];
@@ -119,7 +119,7 @@ TEST(getIconQuads, style) {
     {
         auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0);
         shapedIcon.fitIconToText(shapedText, IconTextFitType::Width, {{5, 10, 5, 10}}, {{0, 0}}, 12.0f / 24.0f);
-        SymbolQuads quads = getIconQuads(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA);
+        SymbolQuads quads = getIconQuads(shapedIcon, SymbolContent::IconRGBA);
 
         ASSERT_EQ(quads.size(), 1);
         const auto& quad = quads[0];
@@ -138,7 +138,7 @@ TEST(getIconQuads, style) {
     {
         auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0);
         shapedIcon.fitIconToText(shapedText, IconTextFitType::Height, {{0, 0, 0, 0}}, {{0, 0}}, 24.0f / 24.0f);
-        SymbolQuads quads = getIconQuads(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA);
+        SymbolQuads quads = getIconQuads(shapedIcon, SymbolContent::IconRGBA);
 
         ASSERT_EQ(quads.size(), 1);
         const auto& quad = quads[0];
@@ -158,7 +158,7 @@ TEST(getIconQuads, style) {
         SymbolLayoutProperties::Evaluated layout;
         auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0);
         shapedIcon.fitIconToText(shapedText, IconTextFitType::Height, {{0, 0, 0, 0}}, {{0, 0}}, 12.0f / 24.0f);
-        SymbolQuads quads = getIconQuads(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA);
+        SymbolQuads quads = getIconQuads(shapedIcon, SymbolContent::IconRGBA);
 
         ASSERT_EQ(quads.size(), 1);
         const auto& quad = quads[0];
@@ -177,7 +177,7 @@ TEST(getIconQuads, style) {
     {
         auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0);
         shapedIcon.fitIconToText(shapedText, IconTextFitType::Height, {{5, 10, 5, 20}}, {{0, 0}}, 12.0f / 24.0f);
-        SymbolQuads quads = getIconQuads(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA);
+        SymbolQuads quads = getIconQuads(shapedIcon, SymbolContent::IconRGBA);
 
         ASSERT_EQ(quads.size(), 1);
         const auto& quad = quads[0];
@@ -196,7 +196,7 @@ TEST(getIconQuads, style) {
     {
         auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0);
         shapedIcon.fitIconToText(shapedText, IconTextFitType::Both, {{0, 0, 0, 0}}, {{0, 0}}, 24.0f / 24.0f);
-        SymbolQuads quads = getIconQuads(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA);
+        SymbolQuads quads = getIconQuads(shapedIcon, SymbolContent::IconRGBA);
 
         ASSERT_EQ(quads.size(), 1);
         const auto& quad = quads[0];
@@ -215,7 +215,7 @@ TEST(getIconQuads, style) {
     {
         auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0);
         shapedIcon.fitIconToText(shapedText, IconTextFitType::Both, {{0, 0, 0, 0}}, {{0, 0}}, 12.0f / 24.0f);
-        SymbolQuads quads = getIconQuads(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA);
+        SymbolQuads quads = getIconQuads(shapedIcon, SymbolContent::IconRGBA);
 
         ASSERT_EQ(quads.size(), 1);
         const auto& quad = quads[0];
@@ -234,7 +234,7 @@ TEST(getIconQuads, style) {
     {
         auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0);
         shapedIcon.fitIconToText(shapedText, IconTextFitType::Both, {{5, 10, 5, 10}}, {{0, 0}}, 12.0f / 24.0f);
-        SymbolQuads quads = getIconQuads(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA);
+        SymbolQuads quads = getIconQuads(shapedIcon, SymbolContent::IconRGBA);
 
         ASSERT_EQ(quads.size(), 1);
         const auto& quad = quads[0];
@@ -255,7 +255,7 @@ TEST(getIconQuads, style) {
         layout.get<TextSize>() = 12.0f;
         auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0);
         shapedIcon.fitIconToText(shapedText, IconTextFitType::Both, {{0, 5, 10, 15}}, {{0, 0}}, 12.0f / 24.0f);
-        SymbolQuads quads = getIconQuads(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA);
+        SymbolQuads quads = getIconQuads(shapedIcon, SymbolContent::IconRGBA);
 
         ASSERT_EQ(quads.size(), 1);
         const auto& quad = quads[0];