diff options
| author | Keith Packard <keithp@keithp.com> | 2014-10-29 20:30:12 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2015-03-24 12:01:39 -0700 |
| commit | 697f8581e04a93862a6049cc982d01d25f9a0410 (patch) | |
| tree | 1200db0db89a77b3c7b1954a270df52df7a4ea62 /hw/xfree86 | |
| parent | 28ff815c4b32c88bd9007fd79f2acf3682a4b4db (diff) | |
glamor: Eliminate GLAMOR_USE_SCREEN and GLAMOR_USE_PICTURE_SCREEN
Remove these defines as we start to remove support for non-standard
glamor layering as used by the intel driver.
v2: Rebase on the blockhandler change and the Xephyr init failure
change (by anholt), fix stray NO_DRI3 addition to xwayland.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'hw/xfree86')
| -rw-r--r-- | hw/xfree86/drivers/modesetting/driver.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c index d52517d1a..e2f3846ca 100644 --- a/hw/xfree86/drivers/modesetting/driver.c +++ b/hw/xfree86/drivers/modesetting/driver.c @@ -1049,10 +1049,7 @@ ScreenInit(ScreenPtr pScreen, int argc, char **argv) #ifdef GLAMOR if (ms->drmmode.glamor) { - if (!glamor_init(pScreen, - GLAMOR_USE_EGL_SCREEN | - GLAMOR_USE_SCREEN | - GLAMOR_USE_PICTURE_SCREEN)) { + if (!glamor_init(pScreen, GLAMOR_USE_EGL_SCREEN)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to initialize glamor at ScreenInit() time.\n"); return FALSE; |