diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-03-07 17:50:02 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-03-11 14:04:19 +0100 |
commit | c83d9a6cc56b88b97ee1b455ed1d02b85fdd43e0 (patch) | |
tree | 4686cced26b195374c97f2c389dc39482309484c /src/mbgl/gl/context.hpp | |
parent | 0bb5e431621b45d29f812a25d8cf26cd26006067 (diff) | |
download | qtlocation-mapboxgl-upstream/gfx-refactor-3.tar.gz |
[core] add texture bindings to draw call instead of Context member fnupstream/gfx-refactor-3
Diffstat (limited to 'src/mbgl/gl/context.hpp')
-rw-r--r-- | src/mbgl/gl/context.hpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/mbgl/gl/context.hpp b/src/mbgl/gl/context.hpp index 1200e3b49a..51b79200ba 100644 --- a/src/mbgl/gl/context.hpp +++ b/src/mbgl/gl/context.hpp @@ -88,13 +88,6 @@ public: return { size, readFramebuffer(size, format, flip) }; } - void bindTexture(gfx::Texture&, - uint8_t unit = 0, - gfx::TextureFilterType = gfx::TextureFilterType::Nearest, - gfx::TextureMipMapType = gfx::TextureMipMapType::No, - gfx::TextureWrapType wrapX = gfx::TextureWrapType::Clamp, - gfx::TextureWrapType wrapY = gfx::TextureWrapType::Clamp) override; - #if not MBGL_USE_GLES2 template <typename Image> void drawPixels(const Image& image) { @@ -220,8 +213,8 @@ private: std::unique_ptr<const gfx::IndexBufferResource> createIndexBufferResource(const void* data, std::size_t size, const gfx::BufferUsageType) override; void updateIndexBufferResource(const gfx::IndexBufferResource&, const void* data, std::size_t size) override; - std::unique_ptr<const gfx::TextureResource> createTextureResource(Size, const void* data, gfx::TexturePixelType, uint8_t, gfx::TextureChannelDataType) override; - void updateTextureResource(const gfx::TextureResource&, Size, const void* data, gfx::TexturePixelType, uint8_t, gfx::TextureChannelDataType) override; + std::unique_ptr<gfx::TextureResource> createTextureResource(Size, const void* data, gfx::TexturePixelType, gfx::TextureChannelDataType) override; + void updateTextureResource(const gfx::TextureResource&, Size, const void* data, gfx::TexturePixelType, gfx::TextureChannelDataType) override; UniqueFramebuffer createFramebuffer(); UniqueRenderbuffer createRenderbuffer(RenderbufferType, Size size); |