summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorLeith Bade <leith@mapbox.com>2015-01-09 09:30:52 +1100
committerLeith Bade <leith@mapbox.com>2015-01-09 09:30:52 +1100
commit5ed8d4544f2e0cb5f78a6960a6378d7ed4eb7620 (patch)
treeb8d882c4ea4264bce5fcb9557397c37130a4c833 /platform
parent3127301976bfa66e2782905100382fe906e721c6 (diff)
parent166a3e21fac8632cdf5afdf4d38bf429e45dc699 (diff)
downloadqtlocation-mapboxgl-5ed8d4544f2e0cb5f78a6960a6378d7ed4eb7620.tar.gz
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Diffstat (limited to 'platform')
-rw-r--r--platform/default/glfw_view.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp
index a33fc5b5a3..295e106621 100644
--- a/platform/default/glfw_view.cpp
+++ b/platform/default/glfw_view.cpp
@@ -391,9 +391,10 @@ void showColorDebugImage(std::string name, const char *data, size_t logicalWidth
float xScale = static_cast<float>(fbWidth) / static_cast<float>(width);
float yScale = static_cast<float>(fbHeight) / static_cast<float>(height);
+ MBGL_CHECK_ERROR(glClearColor(0.8, 0.8, 0.8, 1));
MBGL_CHECK_ERROR(glClear(GL_COLOR_BUFFER_BIT));
MBGL_CHECK_ERROR(glEnable(GL_BLEND));
- MBGL_CHECK_ERROR(glBlendFunc(GL_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
+ MBGL_CHECK_ERROR(glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
MBGL_CHECK_ERROR(glPixelZoom(xScale, -yScale));
MBGL_CHECK_ERROR(glRasterPos2f(-1.0f, 1.0f));