summaryrefslogtreecommitdiff
path: root/include/llmr
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-07-07 12:39:03 -0700
committerKonstantin Käfer <mail@kkaefer.com>2014-07-07 12:39:03 -0700
commit59967fd709f04532a36030e56c3ea064b9b3fc19 (patch)
tree416a3cdfcb89ef9f2ad65cc47f5282e007a3bc7b /include/llmr
parent853c9a58763e990d1a66ee24423413109da05930 (diff)
downloadqtlocation-mapboxgl-59967fd709f04532a36030e56c3ea064b9b3fc19.tar.gz
make headless rendering work again by setting the correct fbo
Diffstat (limited to 'include/llmr')
-rw-r--r--include/llmr/map/map.hpp4
-rw-r--r--include/llmr/map/view.hpp6
2 files changed, 9 insertions, 1 deletions
diff --git a/include/llmr/map/map.hpp b/include/llmr/map/map.hpp
index 6ffb0b8041..1af6b3c540 100644
--- a/include/llmr/map/map.hpp
+++ b/include/llmr/map/map.hpp
@@ -150,8 +150,10 @@ private:
// ready for rendering.
std::atomic_flag is_rendered = ATOMIC_FLAG_INIT;
-private:
+public:
View &view;
+
+private:
Transform transform;
TransformState state;
diff --git a/include/llmr/map/view.hpp b/include/llmr/map/view.hpp
index 47ea244598..d032f783cb 100644
--- a/include/llmr/map/view.hpp
+++ b/include/llmr/map/view.hpp
@@ -20,6 +20,12 @@ public:
// renderer setup since the render thread doesn't switch the contexts.
virtual void make_active() = 0;
+ // Returns the base framebuffer object, if any, and 0 if using the system
+ // provided framebuffer.
+ virtual unsigned int root_fbo() {
+ return 0;
+ }
+
protected:
llmr::Map *map = nullptr;
};