summaryrefslogtreecommitdiff
path: root/src/radeon_glamor.c
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2015-03-26 17:15:21 +0900
committerMichel Dänzer <michel@daenzer.net>2015-03-30 10:34:57 +0900
commitb16609b453bb1a181198cf27778f205dc23fb642 (patch)
tree83ea270acb2797c6a9b1f6fcdb7f0f4cbef8e8b6 /src/radeon_glamor.c
parent391900a670addec39515f924265bfa9f8bfa9ec0 (diff)
glamor: Handle GLAMOR_* flags removed from xserver
The behaviour is the same as when the removed flags were passed in. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'src/radeon_glamor.c')
-rw-r--r--src/radeon_glamor.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
index c49c7f6b..e3633cec 100644
--- a/src/radeon_glamor.c
+++ b/src/radeon_glamor.c
@@ -327,11 +327,9 @@ radeon_glamor_init(ScreenPtr screen)
{
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
- if (!glamor_init(screen, GLAMOR_INVERTED_Y_AXIS | GLAMOR_USE_EGL_SCREEN |
-#ifdef GLAMOR_NO_DRI3
- GLAMOR_NO_DRI3 |
-#endif
- GLAMOR_USE_SCREEN | GLAMOR_USE_PICTURE_SCREEN)) {
+ if (!glamor_init(screen, GLAMOR_USE_EGL_SCREEN | GLAMOR_USE_SCREEN |
+ GLAMOR_USE_PICTURE_SCREEN | GLAMOR_INVERTED_Y_AXIS |
+ GLAMOR_NO_DRI3)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Failed to initialize glamor.\n");
return FALSE;