diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2009-05-19 15:53:55 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2009-05-20 08:13:45 +0100 |
| commit | 87b764908a38cbb4159ac76d8b7d1d08a24b838e (patch) | |
| tree | 90150c81390f7e8386474b43f28fbb8a939f3725 /boilerplate | |
| parent | 17b41fe7e3b8b493341be6384d816105aadf0cb6 (diff) | |
[gl] Add EGL target
Split the GLX context from the GL surface to enable use of an alternative
EGL interface.
Diffstat (limited to 'boilerplate')
| -rw-r--r-- | boilerplate/Makefile.win32.features | 20 | ||||
| -rw-r--r-- | boilerplate/cairo-boilerplate-gl.c | 2 |
2 files changed, 21 insertions, 1 deletions
diff --git a/boilerplate/Makefile.win32.features b/boilerplate/Makefile.win32.features index 3d55ced7a..fd08ed606 100644 --- a/boilerplate/Makefile.win32.features +++ b/boilerplate/Makefile.win32.features @@ -149,6 +149,26 @@ enabled_cairo_boilerplate_private += $(cairo_boilerplate_gl_private) enabled_cairo_boilerplate_sources += $(cairo_boilerplate_gl_sources) endif +supported_cairo_boilerplate_headers += $(cairo_boilerplate_gl_glx_headers) +all_cairo_boilerplate_headers += $(cairo_boilerplate_gl_glx_headers) +all_cairo_boilerplate_private += $(cairo_boilerplate_gl_glx_private) +all_cairo_boilerplate_sources += $(cairo_boilerplate_gl_glx_sources) +ifeq ($(CAIRO_HAS_GL_GLX_SURFACE),1) +enabled_cairo_boilerplate_headers += $(cairo_boilerplate_gl_glx_headers) +enabled_cairo_boilerplate_private += $(cairo_boilerplate_gl_glx_private) +enabled_cairo_boilerplate_sources += $(cairo_boilerplate_gl_glx_sources) +endif + +supported_cairo_boilerplate_headers += $(cairo_boilerplate_gl_egl_headers) +all_cairo_boilerplate_headers += $(cairo_boilerplate_gl_egl_headers) +all_cairo_boilerplate_private += $(cairo_boilerplate_gl_egl_private) +all_cairo_boilerplate_sources += $(cairo_boilerplate_gl_egl_sources) +ifeq ($(CAIRO_HAS_GL_EGL_SURFACE),1) +enabled_cairo_boilerplate_headers += $(cairo_boilerplate_gl_egl_headers) +enabled_cairo_boilerplate_private += $(cairo_boilerplate_gl_egl_private) +enabled_cairo_boilerplate_sources += $(cairo_boilerplate_gl_egl_sources) +endif + unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_glitz_headers) all_cairo_boilerplate_headers += $(cairo_boilerplate_glitz_headers) all_cairo_boilerplate_private += $(cairo_boilerplate_glitz_private) diff --git a/boilerplate/cairo-boilerplate-gl.c b/boilerplate/cairo-boilerplate-gl.c index e818341ca..37dfc42f9 100644 --- a/boilerplate/cairo-boilerplate-gl.c +++ b/boilerplate/cairo-boilerplate-gl.c @@ -119,7 +119,7 @@ _cairo_boilerplate_gl_create_surface (const char *name, XFree (visinfo); gltc->gl_ctx = gl_ctx; - gltc->ctx = cairo_gl_glx_context_create (dpy, gl_ctx); + gltc->ctx = cairo_glx_context_create (dpy, gl_ctx); gltc->surface = cairo_gl_surface_create (gltc->ctx, content, width, height); |