summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorAdam Hunter <adam@mapbox.com>2015-09-29 14:42:52 -0700
committerJustin R. Miller <incanus@codesorcery.net>2015-09-29 15:07:39 -0700
commitc958ee45abe978274c1c86b8517b2c86bc303c8f (patch)
tree8a68192e493b97bb1cac5337fc32b3ea465e0212 /platform
parentfa2d7453a5dfee90fcd627e99988bc38da55ef51 (diff)
downloadqtlocation-mapboxgl-c958ee45abe978274c1c86b8517b2c86bc303c8f.tar.gz
Removed couts from headless view.
Diffstat (limited to 'platform')
-rw-r--r--platform/default/headless_view.cpp14
1 files changed, 0 insertions, 14 deletions
diff --git a/platform/default/headless_view.cpp b/platform/default/headless_view.cpp
index aa80a1e720..0587f5f380 100644
--- a/platform/default/headless_view.cpp
+++ b/platform/default/headless_view.cpp
@@ -11,7 +11,6 @@
#include <string>
#include <cstring>
#include <cassert>
-#include <iostream>
#ifdef MBGL_USE_CGL
#include <CoreFoundation/CoreFoundation.h>
@@ -23,7 +22,6 @@ namespace mbgl {
HeadlessView::HeadlessView(float pixelRatio_, uint16_t width, uint16_t height)
: display(std::make_shared<HeadlessDisplay>()), pixelRatio(pixelRatio_) {
- std::cout << "HeadlessView::HeadlessView" << std::endl;
resize(width, height);
}
@@ -32,12 +30,10 @@ HeadlessView::HeadlessView(std::shared_ptr<HeadlessDisplay> display_,
uint16_t width,
uint16_t height)
: display(display_), pixelRatio(pixelRatio_) {
- std::cout << "HeadlessView::HeadlessView" << std::endl;
resize(width, height);
}
void HeadlessView::loadExtensions() {
- std::cout << "HeadlessView::loadExtensions" << std::endl;
if (extensionsLoaded) {
return;
}
@@ -67,7 +63,6 @@ void HeadlessView::loadExtensions() {
}
void HeadlessView::createContext() {
- std::cout << "HeadlessView::createContext" << std::endl;
if (!display) {
throw std::runtime_error("Display is not set");
}
@@ -120,7 +115,6 @@ bool HeadlessView::isActive() {
}
void HeadlessView::resizeFramebuffer() {
- std::cout << "HeadlessView::resizeFramebuffer: " << this << std::endl;
assert(isActive());
if (!needsResize) return;
@@ -141,7 +135,6 @@ void HeadlessView::resizeFramebuffer() {
MBGL_CHECK_ERROR(glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGBA8, w, h));
MBGL_CHECK_ERROR(glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, 0));
- std::cout << "I am creating a new framebuffer right here: " << this << " " << fbo << std::endl;
MBGL_CHECK_ERROR(glGenFramebuffersEXT(1, &fbo));
MBGL_CHECK_ERROR(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fbo));
@@ -178,7 +171,6 @@ void HeadlessView::resize(const uint16_t width, const uint16_t height) {
}
std::unique_ptr<StillImage> HeadlessView::readStillImage() {
- std::cout << "HeadlessView::readStillImage: " << this << "fbo = " << fbo<< std::endl;
assert(isActive());
const unsigned int w = dimensions[0] * pixelRatio;
@@ -204,16 +196,13 @@ std::unique_ptr<StillImage> HeadlessView::readStillImage() {
}
void HeadlessView::clearBuffers() {
- std::cout << "HeadlessView::clearBuffers: " << this << "fbo = " << fbo << std::endl;
assert(isActive());
MBGL_CHECK_ERROR(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0));
if (fbo) {
MBGL_CHECK_ERROR(glDeleteFramebuffersEXT(1, &fbo));
- std::cout << "HeadlessView::clearBuffers2: " << this << "fbo = " << fbo << std::endl;
fbo = 0;
- std::cout << "HeadlessView::clearBuffers3: " << this << "fbo = " << fbo << std::endl;
}
if (fboColor) {
@@ -228,7 +217,6 @@ void HeadlessView::clearBuffers() {
}
HeadlessView::~HeadlessView() {
- std::cout << "HeadlessView::~HeadlessView" << std::endl;
activate();
clearBuffers();
deactivate();
@@ -265,7 +253,6 @@ std::array<uint16_t, 2> HeadlessView::getFramebufferSize() const {
}
void HeadlessView::activate() {
- std::cout << "HeadlessView::activate" << std::endl;
if (thread != std::thread::id()) {
throw std::runtime_error("OpenGL context was already current");
}
@@ -292,7 +279,6 @@ void HeadlessView::activate() {
}
void HeadlessView::deactivate() {
- std::cout << "HeadlessView::deactivate" << std::endl;
if (thread == std::thread::id()) {
throw std::runtime_error("OpenGL context was not current");
}