[core] Privatize OpenGL/Context headers

2 files changed, 36 insertions, 0 deletions

diff --git a/src/mbgl/map/backend.cpp b/src/mbgl/map/backend.cpp
index c228719ba6..0b4fd01050 100644
--- a/src/mbgl/map/backend.cpp
+++ b/src/mbgl/map/backend.cpp
@@ -21,6 +21,38 @@ gl::Context& Backend::getContext() {
     return *context;
 }
 
+PremultipliedImage Backend::readFramebuffer(const Size& size) const {
+    assert(context);
+    return context->readFramebuffer<PremultipliedImage>(size);
+}
+
+void Backend::assumeFramebufferBinding(const gl::FramebufferID fbo) {
+    getContext().bindFramebuffer.setCurrentValue(fbo);
+    if (fbo != ImplicitFramebufferBinding) {
+        assert(gl::value::BindFramebuffer::Get() == getContext().bindFramebuffer.getCurrentValue());
+    }
+}
+void Backend::assumeViewportSize(const Size& size) {
+    getContext().viewport.setCurrentValue({ 0, 0, size });
+    assert(gl::value::Viewport::Get() == getContext().viewport.getCurrentValue());
+}
+
+bool Backend::implicitFramebufferBound() {
+    return getContext().bindFramebuffer.getCurrentValue() == ImplicitFramebufferBinding;
+}
+
+void Backend::setFramebufferBinding(const gl::FramebufferID fbo) {
+    getContext().bindFramebuffer = fbo;
+    if (fbo != ImplicitFramebufferBinding) {
+        assert(gl::value::BindFramebuffer::Get() == getContext().bindFramebuffer.getCurrentValue());
+    }
+}
+
+void Backend::setViewportSize(const Size& size) {
+    getContext().viewport = { 0, 0, size };
+    assert(gl::value::Viewport::Get() == getContext().viewport.getCurrentValue());
+}
+
 Backend::~Backend() = default;
 
 } // namespace mbgl
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index 9e0b1a7575..8957f3272e 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -285,6 +285,8 @@ void Map::Impl::render(View& view) {
                               contextMode,
                               debugOptions };
 
+        backend.updateAssumedState();
+
         painter->render(*style,
                         frameData,
                         view,
@@ -323,6 +325,8 @@ void Map::Impl::render(View& view) {
                               contextMode,
                               debugOptions };
 
+        backend.updateAssumedState();
+
         try {
             painter->render(*style,
                             frameData,