From 4b98870e99dfa0aaa63c15a225e971872f8ade71 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 22 Sep 2014 14:05:15 -0700 Subject: Support pixelRatio parameter for render tests --- common/headless_view.cpp | 5 ++++- common/headless_view.hpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'common') diff --git a/common/headless_view.cpp b/common/headless_view.cpp index f790d90cec..ed00f48e82 100644 --- a/common/headless_view.cpp +++ b/common/headless_view.cpp @@ -65,9 +65,12 @@ HeadlessView::HeadlessView() { } -void HeadlessView::resize(int width, int height) { +void HeadlessView::resize(uint16_t width, uint16_t height, float pixelRatio) { clear_buffers(); + width *= pixelRatio; + height *= pixelRatio; + #if MBGL_USE_CGL make_active(); diff --git a/common/headless_view.hpp b/common/headless_view.hpp index 0b255b4a38..a8ce4aa325 100644 --- a/common/headless_view.hpp +++ b/common/headless_view.hpp @@ -19,7 +19,7 @@ public: HeadlessView(); ~HeadlessView(); - void resize(int width, int height); + void resize(uint16_t width, uint16_t height, float pixelRatio); void notify_map_change(MapChange change, timestamp delay = 0); void make_active(); -- cgit v1.2.1 From 0cdaf58027b758650f4bb7ca7a006cb8568c080c Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Wed, 24 Sep 2014 14:40:49 -0400 Subject: add debugging --- common/headless_view.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'common') diff --git a/common/headless_view.cpp b/common/headless_view.cpp index 0fce223986..d38a450070 100644 --- a/common/headless_view.cpp +++ b/common/headless_view.cpp @@ -2,6 +2,7 @@ #include #include +#include namespace mbgl { @@ -155,6 +156,10 @@ HeadlessView::~HeadlessView() { #endif #if MBGL_USE_GLX + std::cerr << "~HeadlessView()" << '\n'; + std::cerr << "x_display: " << x_display << '\n'; + std::cerr << "glx_pixmap: " << glx_pixmap << '\n'; + std::cerr << "gl_context: " << gl_context << '\n'; glXMakeCurrent(x_display, None, NULL); glXDestroyContext(x_display, gl_context); XFree(x_info); @@ -175,6 +180,10 @@ void HeadlessView::make_active() { #endif #if MBGL_USE_GLX + std::cerr << "make_active()" << '\n'; + std::cerr << "x_display: " << x_display << '\n'; + std::cerr << "glx_pixmap: " << glx_pixmap << '\n'; + std::cerr << "gl_context: " << gl_context << '\n'; if (!glXMakeCurrent(x_display, glx_pixmap, gl_context)) { fprintf(stderr, "Switching OpenGL context failed\n"); } -- cgit v1.2.1 From c5a7738dd640604a523e6e069cba92940d502614 Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Wed, 24 Sep 2014 15:17:42 -0400 Subject: move make_active call into MBGL_USE_CGL block --- common/headless_view.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common') diff --git a/common/headless_view.cpp b/common/headless_view.cpp index d38a450070..6ab005b6cf 100644 --- a/common/headless_view.cpp +++ b/common/headless_view.cpp @@ -114,9 +114,9 @@ void HeadlessView::resize(int width, int height) { } void HeadlessView::clear_buffers() { +#if MBGL_USE_CGL make_active(); -#if MBGL_USE_CGL glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); if (fbo) { -- cgit v1.2.1