[core] remove Raster object in favor of a more low-level Texture object

1 files changed, 21 insertions, 0 deletions

diff --git a/src/mbgl/gl/context.hpp b/src/mbgl/gl/context.hpp
index 04089c2000..0ec846033a 100644
--- a/src/mbgl/gl/context.hpp
+++ b/src/mbgl/gl/context.hpp
@@ -3,6 +3,7 @@
 #include <mbgl/gl/object.hpp>
 #include <mbgl/gl/state.hpp>
 #include <mbgl/gl/value.hpp>
+#include <mbgl/gl/texture.hpp>
 #include <mbgl/util/noncopyable.hpp>
 
 #include <memory>
@@ -28,6 +29,23 @@ public:
 
     void uploadBuffer(BufferType, size_t, void*);
 
+    // Create a texture from an image with data.
+    template <typename Image>
+    Texture createTexture(const Image& image, TextureUnit unit = 0) {
+        return { {{ image.width, image.height }},
+                 createTexture(image.width, image.height, image.data.get(), unit) };
+    }
+
+    // Creates an empty texture with the specified dimensions.
+    Texture createTexture(const std::array<uint16_t, 2>& size, TextureUnit unit = 0) {
+        return { size, createTexture(size[0], size[1], nullptr, unit) };
+    }
+
+    void bindTexture(Texture&,
+                     TextureUnit = 0,
+                     TextureFilter = TextureFilter::Nearest,
+                     TextureMipMap = TextureMipMap::No);
+
     // Actually remove the objects we marked as abandoned with the above methods.
     // Only call this while the OpenGL context is exclusive to this thread.
     void performCleanup();
@@ -80,6 +98,9 @@ public:
     State<value::BindVertexArray> vertexArrayObject;
 
 private:
+    UniqueTexture createTexture(uint16_t width, uint16_t height, const void* data, TextureUnit);
+
+private:
     friend detail::ProgramDeleter;
     friend detail::ShaderDeleter;
     friend detail::BufferDeleter;