diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2016-09-27 12:27:35 +0200 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-27 11:03:29 -0700 |
commit | 21386b31465302d63cae5d93680442555c8560f1 (patch) | |
tree | 1220ea780dcbc6d79b83f476900a6f12cb3f71fc /platform/default | |
parent | e881795ed10484ecfe8de73aaaa349c44eb259db (diff) | |
download | qtlocation-mapboxgl-21386b31465302d63cae5d93680442555c8560f1.tar.gz |
[core] move GL value accessors to gl::value namespace
Diffstat (limited to 'platform/default')
-rw-r--r-- | platform/default/glfw_view.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp index 6995c6e9bd..17b233a414 100644 --- a/platform/default/glfw_view.cpp +++ b/platform/default/glfw_view.cpp @@ -3,14 +3,15 @@ #include <mbgl/sprite/sprite_image.hpp> #include <mbgl/style/transition_options.hpp> #include <mbgl/gl/gl.hpp> -#include <mbgl/gl/gl_values.hpp> -#include <mbgl/gl/gl_helper.hpp> #include <mbgl/platform/log.hpp> #include <mbgl/platform/platform.hpp> #include <mbgl/util/string.hpp> #include <mbgl/util/chrono.hpp> #include <mbgl/map/camera.hpp> +#include <mbgl/gl/state.hpp> +#include <mbgl/gl/value.hpp> + #include <cassert> #include <cstdlib> @@ -533,8 +534,8 @@ void showDebugImage(std::string name, const char *data, size_t width, size_t hei float scale = static_cast<float>(fbWidth) / static_cast<float>(width); { - gl::Preserve<gl::PixelZoom> pixelZoom; - gl::Preserve<gl::RasterPos> rasterPos; + gl::PreserveState<gl::value::PixelZoom> pixelZoom; + gl::PreserveState<gl::value::RasterPos> rasterPos; MBGL_CHECK_ERROR(glPixelZoom(scale, -scale)); MBGL_CHECK_ERROR(glRasterPos2f(-1.0f, 1.0f)); @@ -570,11 +571,11 @@ void showColorDebugImage(std::string name, const char *data, size_t logicalWidth float yScale = static_cast<float>(fbHeight) / static_cast<float>(height); { - gl::Preserve<gl::ClearColor> clearColor; - gl::Preserve<gl::Blend> blend; - gl::Preserve<gl::BlendFunc> blendFunc; - gl::Preserve<gl::PixelZoom> pixelZoom; - gl::Preserve<gl::RasterPos> rasterPos; + gl::PreserveState<gl::value::ClearColor> clearColor; + gl::PreserveState<gl::value::Blend> blend; + gl::PreserveState<gl::value::BlendFunc> blendFunc; + gl::PreserveState<gl::value::PixelZoom> pixelZoom; + gl::PreserveState<gl::value::RasterPos> rasterPos; MBGL_CHECK_ERROR(glClearColor(0.8, 0.8, 0.8, 1)); MBGL_CHECK_ERROR(glClear(GL_COLOR_BUFFER_BIT)); |