diff options
Diffstat (limited to 'xorg-server/hw/kdrive/ephyr')
| -rw-r--r-- | xorg-server/hw/kdrive/ephyr/ephyr_glamor_glx.c | 1 | ||||
| -rwxr-xr-x | xorg-server/hw/kdrive/ephyr/hostx.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/xorg-server/hw/kdrive/ephyr/ephyr_glamor_glx.c b/xorg-server/hw/kdrive/ephyr/ephyr_glamor_glx.c index 9903cc772..eaf565496 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyr_glamor_glx.c +++ b/xorg-server/hw/kdrive/ephyr/ephyr_glamor_glx.c @@ -313,7 +313,6 @@ ephyr_glamor_get_visual(void) GLX_GREEN_SIZE, 1, GLX_BLUE_SIZE, 1, GLX_DOUBLEBUFFER, 1, - GLX_VISUAL_ID, DefaultVisual(dpy, DefaultScreen(dpy)), None }; int event_base = 0, error_base = 0, nelements; diff --git a/xorg-server/hw/kdrive/ephyr/hostx.c b/xorg-server/hw/kdrive/ephyr/hostx.c index 8aadb2aab..dea6f730c 100755 --- a/xorg-server/hw/kdrive/ephyr/hostx.c +++ b/xorg-server/hw/kdrive/ephyr/hostx.c @@ -752,13 +752,16 @@ __asm int 3; scrpriv->win_width = width; scrpriv->win_height = height; +#ifdef GLAMOR if (ephyr_glamor) { *bytes_per_line = 0; *bits_per_pixel = 0; ephyr_glamor_set_window_size(scrpriv->glamor, scrpriv->win_width, scrpriv->win_height); return NULL; - } else if (host_depth_matches_server(scrpriv)) { + } else +#endif + if (host_depth_matches_server(scrpriv)) { *bytes_per_line = scrpriv->ximg->stride; *bits_per_pixel = scrpriv->ximg->bpp; |