diff options
| author | Eric Anholt <eric@anholt.net> | 2013-08-18 00:28:07 +0200 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2013-08-18 00:28:07 +0200 |
| commit | 4e6eb486759dc92321ab78c5d6c3164b04d00a0d (patch) | |
| tree | 714631a027b2febc30be4b2f343108d8cec0e4f6 | |
| parent | 0bb65e3b571ece24a82251b0789b69a0b5d778b4 (diff) | |
| -rw-r--r-- | hw/kdrive/ephyr/ephyr_glamor.c | 6 | ||||
| -rw-r--r-- | hw/kdrive/ephyr/hostx.c | 20 | ||||
| -rw-r--r-- | hw/kdrive/ephyr/hostx.h | 3 |
3 files changed, 11 insertions, 18 deletions
diff --git a/hw/kdrive/ephyr/ephyr_glamor.c b/hw/kdrive/ephyr/ephyr_glamor.c index 592418e4d..5b84fd241 100644 --- a/hw/kdrive/ephyr/ephyr_glamor.c +++ b/hw/kdrive/ephyr/ephyr_glamor.c @@ -30,6 +30,9 @@ #endif #include "ephyr.h" +#include <EGL/egl.h> +#include <EGL/eglext.h> +#define GLAMOR_FOR_XORG #include "glamor.h" /** @@ -43,7 +46,8 @@ ephyr_glamor_init(ScreenPtr screen) KdScreenPriv(screen); KdScreenInfo *kd_screen = pScreenPriv->screen; - ephyr_glamor_host_create_context(kd_screen); + glamor_egl_init(ephyr_screen->pScreen, + ephyr_glamor_host_egl_display(kd_screen)); glamor_init(screen, GLAMOR_USE_SCREEN | GLAMOR_USE_PICTURE_SCREEN); diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c index 6bf31f2b8..4e432d269 100644 --- a/hw/kdrive/ephyr/hostx.c +++ b/hw/kdrive/ephyr/hostx.c @@ -64,6 +64,7 @@ #include "ephyrlog.h" #include "GL/glx.h" #include "EGL/egl.h" +#include "EGL/eglext.h" #ifdef XF86DRI extern Bool XF86DRIQueryExtension(Display * dpy, @@ -1459,17 +1460,7 @@ ephyr_glamor_get_visual(void) HostX.visual = visual_info->visual; } -void -ephyr_glamor_host_create_context(EphyrScreenInfo ephyr_screen) -{ - Display *dpy = HostX.dpy; - struct EphyrHostScreen *host_screen; - host_screen = host_screen_from_screen_info(ephyr_screen); - - egl_glamor_init_egl(ephyr_screen->pScreen, - (EGlnativeDisplayType)dpy); -} static void ephyr_glamor_paint_rect (EphyrScreenInfo screen, @@ -1482,7 +1473,7 @@ ephyr_glamor_paint_rect (EphyrScreenInfo screen, if (!peglPostSubBufferNV) { peglPostSubBufferNV = (PFNEGLPOSTSUBBUFFERNVPROC) - eglGetProcAddress((const GLubyte*)"eglPostSubBufferNV"); + eglGetProcAddress("eglPostSubBufferNV"); assert(peglPostSubBufferNV); } @@ -1491,8 +1482,9 @@ ephyr_glamor_paint_rect (EphyrScreenInfo screen, pglXCopySubBufferMESA(HostX.dpy, host_screen->win, sx, sy, width, height); #else - pglXCopySubBufferMESA(HostX.dpy, host_screen->win, - 0, 0, - host_screen->win_width, host_screen->win_height); + peglPostSubBufferNV(HostX.dpy, host_screen->win, + 0, 0, + host_screen->win_width, host_screen->win_height); #endif } + diff --git a/hw/kdrive/ephyr/hostx.h b/hw/kdrive/ephyr/hostx.h index fda68106f..f47297c5d 100644 --- a/hw/kdrive/ephyr/hostx.h +++ b/hw/kdrive/ephyr/hostx.h @@ -252,7 +252,4 @@ int hostx_has_dri(void); int hostx_has_glx(void); #endif /* XF86DRI */ -/* ephyr_glamor_host.c */ -void ephyr_glamor_host_create_context(EphyrScreenInfo ephyr_screen); - #endif /*_XLIBS_STUFF_H_*/ |