diff options
author | Leith Bade <leith@mapbox.com> | 2014-12-09 03:41:05 +1100 |
---|---|---|
committer | Leith Bade <leith@mapbox.com> | 2014-12-09 21:47:30 +1100 |
commit | d2792e29870629faeaebd0eea91b5819fc58e719 (patch) | |
tree | 8ecbc7e31222bdd2c515135f05b27ae50c26f29f /include/mbgl | |
parent | 318ef5d44314814f4dd7da2ba8c532b0119bdb35 (diff) | |
download | qtlocation-mapboxgl-d2792e29870629faeaebd0eea91b5819fc58e719.tar.gz |
Tidy up HeadlessView
Diffstat (limited to 'include/mbgl')
-rw-r--r-- | include/mbgl/platform/default/headless_display.hpp | 4 | ||||
-rw-r--r-- | include/mbgl/platform/default/headless_view.hpp | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/mbgl/platform/default/headless_display.hpp b/include/mbgl/platform/default/headless_display.hpp index 08c423c587..bf67e3c3b3 100644 --- a/include/mbgl/platform/default/headless_display.hpp +++ b/include/mbgl/platform/default/headless_display.hpp @@ -15,8 +15,8 @@ public: #endif #if MBGL_USE_GLX - Display *x_display = nullptr; - GLXFBConfig *fb_configs = nullptr; + Display *xDisplay = nullptr; + GLXFBConfig *fbConfigs = nullptr; #endif }; diff --git a/include/mbgl/platform/default/headless_view.hpp b/include/mbgl/platform/default/headless_view.hpp index 9d8acf70f7..a521cff547 100644 --- a/include/mbgl/platform/default/headless_view.hpp +++ b/include/mbgl/platform/default/headless_view.hpp @@ -46,19 +46,19 @@ private: float pixelRatio_; #if MBGL_USE_CGL - CGLContextObj gl_context; + CGLContextObj glContext; #endif #if MBGL_USE_GLX - Display *x_display = nullptr; - GLXFBConfig *fb_configs = nullptr; - GLXContext gl_context = 0; - GLXPbuffer glx_pbuffer = 0; + Display *xDisplay = nullptr; + GLXFBConfig *fbConfigs = nullptr; + GLXContext glContext = 0; + GLXPbuffer glxPbuffer = 0; #endif GLuint fbo = 0; - GLuint fbo_depth_stencil = 0; - GLuint fbo_color = 0; + GLuint fboDepthStencil = 0; + GLuint fboColor = 0; }; } |