frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ephyr: Hook the glamor into damage and draw into the backbuffer. 

This should avoid a bunch of absurdity with GLX front buffer handling,
fix exposes, and improve performance.  For now we're copying the whole
buffer while glamor is developed.
This commit is contained in:
Eric Anholt 2010-02-08 13:05:13 +01:00 committed by Zhigang Gong
parent b5087ff9b1
commit ec526eab8f
3 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/kdrive/ephyr/ephyr.c
View File

@ -395,9 +395,6 @@ ephyrSetInternalDamage (ScreenPtr pScreen)
EphyrScrPriv *scrpriv = screen->driver; EphyrScrPriv *scrpriv = screen->driver;
PixmapPtr pPixmap = NULL; PixmapPtr pPixmap = NULL;
if (ephyrFuncs.initAccel == ephyr_glamor_init)
return TRUE;
scrpriv->pDamage = DamageCreate ((DamageReportFunc) 0, scrpriv->pDamage = DamageCreate ((DamageReportFunc) 0,
(DamageDestroyFunc) 0, (DamageDestroyFunc) 0,
DamageReportNone, DamageReportNone,

1
hw/kdrive/ephyr/ephyr.h
View File

@ -201,6 +201,7 @@ Bool ephyr_glamor_init(ScreenPtr pScreen);
void ephyr_glamor_enable(ScreenPtr pScreen); void ephyr_glamor_enable(ScreenPtr pScreen);
void ephyr_glamor_disable(ScreenPtr pScreen); void ephyr_glamor_disable(ScreenPtr pScreen);
void ephyr_glamor_fini(ScreenPtr pScreen); void ephyr_glamor_fini(ScreenPtr pScreen);
void ephyr_glamor_host_paint_rect(ScreenPtr pScreen);
/*ephyvideo.c*/ /*ephyvideo.c*/

37
hw/kdrive/ephyr/hostx.c
View File

@ -767,6 +767,11 @@ hostx_screen_init (EphyrScreenInfo screen,
static void hostx_paint_debug_rect (struct EphyrHostScreen *host_screen, static void hostx_paint_debug_rect (struct EphyrHostScreen *host_screen,
int x, int y, int x, int y,
int width, int height); int width, int height);
static void
ephyr_glamor_paint_rect (EphyrScreenInfo screen,
int sx, int sy,
int dx, int dy,
int width, int height);
void void
hostx_paint_rect (EphyrScreenInfo screen, hostx_paint_rect (EphyrScreenInfo screen,
@ -778,6 +783,11 @@ hostx_paint_rect (EphyrScreenInfo screen,
EPHYR_DBG ("painting in screen %d\n", host_screen->mynum) ; EPHYR_DBG ("painting in screen %d\n", host_screen->mynum) ;
if (ephyr_glamor) {
ephyr_glamor_paint_rect(screen, sx, sy, dx, dy, width, height);
return;
}
/* /*
* Copy the image data updated by the shadow layer * Copy the image data updated by the shadow layer
* on to the window * on to the window
@ -1464,6 +1474,7 @@ ephyr_glamor_get_visual(void)
GLX_RED_SIZE, 1, GLX_RED_SIZE, 1,
GLX_GREEN_SIZE, 1, GLX_GREEN_SIZE, 1,
GLX_BLUE_SIZE, 1, GLX_BLUE_SIZE, 1,
GLX_DOUBLEBUFFER, 1,
None}; None};
XVisualInfo *visual_info; XVisualInfo *visual_info;
int event_base = 0, error_base = 0; int event_base = 0, error_base = 0;
@ -1495,3 +1506,29 @@ ephyr_glamor_host_create_context(EphyrScreenInfo ephyr_screen)
if (!glXMakeCurrent(dpy, host_screen->win, ctx)) if (!glXMakeCurrent(dpy, host_screen->win, ctx))
errx(1, "glXMakeCurrent failed\n"); errx(1, "glXMakeCurrent failed\n");
} }
static void
ephyr_glamor_paint_rect (EphyrScreenInfo screen,
int sx, int sy,
int dx, int dy,
int width, int height)
{
struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);
static PFNGLXCOPYSUBBUFFERMESAPROC pglXCopySubBufferMESA = NULL;
if (!pglXCopySubBufferMESA) {
pglXCopySubBufferMESA = (PFNGLXCOPYSUBBUFFERMESAPROC)
glXGetProcAddressARB((const GLubyte*)"glXCopySubBufferMESA");
assert(pglXCopySubBufferMESA);
}
/* Always copy the full screen until we get things rendering correctly. */
#if 0
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);
#endif
}