[PATCH] glamor: Prepare for GLAMOR_* flags being removed from xserver

[Alex Deucher]

On Thu, Mar 26, 2015 at 4:28 AM, Michel Dänzer <michel at daenzer.net> wrote:
> From: Michel Dänzer <michel.daenzer at amd.com>
>
> The behaviour will be the same when the flags are removed.
>
> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  src/radeon_glamor.c |  8 +++-----
>  src/radeon_glamor.h | 11 +++++++++++
>  2 files changed, 14 insertions(+), 5 deletions(-)
>
> diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
> index c49c7f6..e3633ce 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;
> diff --git a/src/radeon_glamor.h b/src/radeon_glamor.h
> index 7cef1a9..a504acb 100644
> --- a/src/radeon_glamor.h
> +++ b/src/radeon_glamor.h
> @@ -36,10 +36,21 @@
>  #include "radeon_surface.h"
>
>  #ifndef GLAMOR_NO_DRI3
> +#define GLAMOR_NO_DRI3 0
>  #define glamor_fd_from_pixmap glamor_dri3_fd_from_pixmap
>  #define glamor_pixmap_from_fd glamor_egl_dri3_pixmap_from_fd
>  #endif
>
> +#ifndef GLAMOR_INVERTED_Y_AXIS
> +#define GLAMOR_INVERTED_Y_AXIS 0
> +#endif
> +#ifndef GLAMOR_USE_SCREEN
> +#define GLAMOR_USE_SCREEN 0
> +#endif
> +#ifndef GLAMOR_USE_PICTURE_SCREEN
> +#define GLAMOR_USE_PICTURE_SCREEN 0
> +#endif
> +
>  Bool radeon_glamor_pre_init(ScrnInfoPtr scrn);
>  Bool radeon_glamor_init(ScreenPtr screen);
>  Bool radeon_glamor_create_screen_resources(ScreenPtr screen);
> --
> 2.1.4
>
> _______________________________________________
> xorg-driver-ati mailing list
> xorg-driver-ati at lists.x.org
> http://lists.x.org/mailman/listinfo/xorg-driver-ati