summaryrefslogtreecommitdiff
path: root/src/mbgl/gl/context.hpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2019-03-20 13:48:14 +0100
committerKonstantin Käfer <mail@kkaefer.com>2019-04-05 11:49:17 +0200
commit839f4687aacb98440f85660120173c9b9895f46a (patch)
tree8b0b34ee2742b4261bc5411d1c0f8deb8e750cda /src/mbgl/gl/context.hpp
parentca60095071bbc2938011957b524c511ba15ff49d (diff)
downloadqtlocation-mapboxgl-839f4687aacb98440f85660120173c9b9895f46a.tar.gz
[core] gl::RenderbufferType -> gfx::RenderbufferPixelType
Diffstat (limited to 'src/mbgl/gl/context.hpp')
-rw-r--r--src/mbgl/gl/context.hpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mbgl/gl/context.hpp b/src/mbgl/gl/context.hpp
index d46727cb7a..b16a9994bf 100644
--- a/src/mbgl/gl/context.hpp
+++ b/src/mbgl/gl/context.hpp
@@ -60,23 +60,23 @@ public:
#endif
optional<std::pair<BinaryProgramFormat, std::string>> getBinaryProgram(ProgramID) const;
- template <RenderbufferType type>
+ template <gfx::RenderbufferPixelType type>
Renderbuffer<type> createRenderbuffer(const Size size) {
- static_assert(type == RenderbufferType::RGBA ||
- type == RenderbufferType::DepthStencil ||
- type == RenderbufferType::DepthComponent,
+ static_assert(type == gfx::RenderbufferPixelType::RGBA ||
+ type == gfx::RenderbufferPixelType::DepthStencil ||
+ type == gfx::RenderbufferPixelType::Depth,
"invalid renderbuffer type");
return { size, createRenderbuffer(type, size) };
}
- Framebuffer createFramebuffer(const Renderbuffer<RenderbufferType::RGBA>&,
- const Renderbuffer<RenderbufferType::DepthStencil>&);
- Framebuffer createFramebuffer(const Renderbuffer<RenderbufferType::RGBA>&);
+ Framebuffer createFramebuffer(const Renderbuffer<gfx::RenderbufferPixelType::RGBA>&,
+ const Renderbuffer<gfx::RenderbufferPixelType::DepthStencil>&);
+ Framebuffer createFramebuffer(const Renderbuffer<gfx::RenderbufferPixelType::RGBA>&);
Framebuffer createFramebuffer(const gfx::Texture&,
- const Renderbuffer<RenderbufferType::DepthStencil>&);
+ const Renderbuffer<gfx::RenderbufferPixelType::DepthStencil>&);
Framebuffer createFramebuffer(const gfx::Texture&);
Framebuffer createFramebuffer(const gfx::Texture&,
- const Renderbuffer<RenderbufferType::DepthComponent>&);
+ const Renderbuffer<gfx::RenderbufferPixelType::Depth>&);
template <typename Image,
gfx::TexturePixelType format = Image::channels == 4 ? gfx::TexturePixelType::RGBA
@@ -216,7 +216,7 @@ private:
std::unique_ptr<gfx::DrawScopeResource> createDrawScopeResource() override;
UniqueFramebuffer createFramebuffer();
- UniqueRenderbuffer createRenderbuffer(RenderbufferType, Size size);
+ UniqueRenderbuffer createRenderbuffer(gfx::RenderbufferPixelType, Size size);
std::unique_ptr<uint8_t[]> readFramebuffer(Size, gfx::TexturePixelType, bool flip);
#if not MBGL_USE_GLES2
void drawPixels(Size size, const void* data, gfx::TexturePixelType);