aboutsummaryrefslogtreecommitdiff
path: root/src/canvas-x11.cpp
diff options
context:
space:
mode:
authorJesse Barker <jesse.barker@linaro.org>2012-11-13 08:56:32 -0800
committerJesse Barker <jesse.barker@linaro.org>2012-11-13 08:56:32 -0800
commitce690269c4e456a618b388d4c18a8462d8bae2ee (patch)
tree9b40ec0e5c003d9a96f697f29b8fc606f7b246d8 /src/canvas-x11.cpp
parent9fd15b13acef0cf8a5ff45bd1470a6b1a56e0846 (diff)
downloadglmark2-ce690269c4e456a618b388d4c18a8462d8bae2ee.tar.gz
CanvasX11{EGL,GLX}: Integrate new EGLState object. This requires a small bit
of new plumbing so that there is an explicit acknowledgement of the window system integration layer (::init_gl_winsys()). Additional canvas objects that do not integrate through X11 will not need this as there won't be the added legacy of GLX.
Diffstat (limited to 'src/canvas-x11.cpp')
-rw-r--r--src/canvas-x11.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/canvas-x11.cpp b/src/canvas-x11.cpp
index 29d7ce6..c1b19c0 100644
--- a/src/canvas-x11.cpp
+++ b/src/canvas-x11.cpp
@@ -70,6 +70,9 @@ CanvasX11::init()
if (!xdpy_)
return false;
+ if (!init_gl_winsys())
+ return false;
+
resize_no_viewport(width_, height_);
if (!xwin_)