diff options
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/window-opengl/gl_xcb.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/c++/window-opengl/gl_xcb.cpp b/c++/window-opengl/gl_xcb.cpp index c758b80..f9ccc08 100644 --- a/c++/window-opengl/gl_xcb.cpp +++ b/c++/window-opengl/gl_xcb.cpp @@ -42,7 +42,7 @@ int translate_render_type_settings(gl_settings::render_type cmp){ return 0; } -int translate_drawable_type_setting(gl_settings::drawable_type cmp){ +int translate_drawable_type_settings(gl_settings::drawable_type cmp){ int i = 0; if (static_cast<int32_t>(cmp) & static_cast<int32_t>(gl_settings::drawable_type::window_bit)) { @@ -117,7 +117,7 @@ own<gpu_context<backend::gl_linux_xcb> > create_gl_context(io_provider& prov, co attributes.push_back(settings.renderable ? True : False); attributes.push_back(GLX_RENDER_TYPE); - attributes.push_back(translate_render_type_setting(settings.render_t)); + attributes.push_back(translate_render_type_settings(settings.render_t)); attributes.push_back(GLX_RED_SIZE); attributes.push_back(settings.red_bits); @@ -142,7 +142,7 @@ own<gpu_context<backend::gl_linux_xcb> > create_gl_context(io_provider& prov, co attributes.push_back(GLX_DRAWABLE_TYPE); attributes.push_back( - translate_drawable_type_setting(settings.drawable_t)); + translate_drawable_type_settings(settings.drawable_t)); attributes.push_back(GLX_X_VISUAL_TYPE); attributes.push_back(GLX_TRUE_COLOR); @@ -152,10 +152,10 @@ own<gpu_context<backend::gl_linux_xcb> > create_gl_context(io_provider& prov, co int num_fb_configs = 0; glx_library_extensions lib_ext = load_glx_library_extensions( - glXQueryExtensionsString(device->display_, device->screen_)); + glXQueryExtensionsString(device->get_xcb_display(), device->get_xcb_screen())); GLXFBConfig *fb_configs = glXChooseFBConfig( - device->display_, device->screen_, &attributes[0], &num_fb_configs); + device->get_xcb_display(), device->get_xcb_screen(), &attributes[0], &num_fb_configs); if (!fb_configs || num_fb_configs == 0) { /// @todo log errors return nullptr; @@ -196,7 +196,7 @@ own<gpu_context<backend::gl_linux_xcb> > create_gl_context(io_provider& prov, co return nullptr; } -gpu_window<backend::gl_linux_xcb>::gpu_window(own<xcb_window> &&win, gpu_context<backend::gl_linux_xcb> &ctx, +gpu_window<backend::gl_linux_xcb>::gpu_window(own<window<backend::linux_xcb>> &&win, gpu_context<backend::gl_linux_xcb> &ctx, ::GLXWindow glx_win) : window_{std::move(win)}, context_{&ctx}, glx_window_handle_{glx_win} {} |