[core] add texture bindings to draw call instead of Context member fn

1 files changed, 6 insertions, 16 deletions

diff --git a/src/mbgl/gfx/context.hpp b/src/mbgl/gfx/context.hpp
index 05a87eeeac..5ec73b8a41 100644
--- a/src/mbgl/gfx/context.hpp
+++ b/src/mbgl/gfx/context.hpp
@@ -62,43 +62,33 @@ public:
     // Create a texture from an image with data.
     template <typename Image>
     Texture createTexture(const Image& image,
-                          uint8_t unit = 0,
                           TextureChannelDataType type = TextureChannelDataType::UnsignedByte) {
         auto format = image.channels == 4 ? TexturePixelType::RGBA : TexturePixelType::Alpha;
         return { image.size,
-                 createTextureResource(image.size, image.data.get(), format, unit, type) };
+                 createTextureResource(image.size, image.data.get(), format, type) };
     }
 
     // Creates an empty texture with the specified dimensions.
     Texture createTexture(const Size size,
                           TexturePixelType format = TexturePixelType::RGBA,
-                          uint8_t unit = 0,
                           TextureChannelDataType type = TextureChannelDataType::UnsignedByte) {
-        return { size, createTextureResource(size, nullptr, format, unit, type) };
+        return { size, createTextureResource(size, nullptr, format, type) };
     }
 
     template <typename Image>
     void updateTexture(Texture& texture,
                        const Image& image,
-                       uint8_t unit = 0,
                        TextureChannelDataType type = TextureChannelDataType::UnsignedByte) {
         auto format = image.channels == 4 ? TexturePixelType::RGBA : TexturePixelType::Alpha;
-        updateTextureResource(*texture.resource, image.size, image.data.get(), format, unit, type);
+        updateTextureResource(*texture.resource, image.size, image.data.get(), format, type);
         texture.size = image.size;
     }
 
-    virtual void bindTexture(Texture&,
-                             uint8_t unit = 0,
-                             TextureFilterType = TextureFilterType::Nearest,
-                             TextureMipMapType = TextureMipMapType::No,
-                             TextureWrapType wrapX = TextureWrapType::Clamp,
-                             TextureWrapType wrapY = TextureWrapType::Clamp) = 0;
-
 protected:
-    virtual std::unique_ptr<const TextureResource> createTextureResource(
-        Size, const void* data, TexturePixelType, uint8_t unit, TextureChannelDataType) = 0;
+    virtual std::unique_ptr<TextureResource> createTextureResource(
+        Size, const void* data, TexturePixelType, TextureChannelDataType) = 0;
     virtual void updateTextureResource(const TextureResource&, Size, const void* data,
-        TexturePixelType, uint8_t unit, TextureChannelDataType) = 0;
+        TexturePixelType, TextureChannelDataType) = 0;
 };
 
 } // namespace gfx