From be0665b461c776e2c4444330a865134e53f3d121 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michel=20D=C3=A4nzer?= Date: Mon, 24 Jan 2011 15:48:13 +0100 Subject: [PATCH] st/xorg: Fix build failure against xserver with XF86_CRTC_VERSION < 3. Reported by Vinson Lee. --- src/gallium/state_trackers/xorg/xorg_crtc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/gallium/state_trackers/xorg/xorg_crtc.c b/src/gallium/state_trackers/xorg/xorg_crtc.c index 71f7b8c21d0..d751ac18704 100644 --- a/src/gallium/state_trackers/xorg/xorg_crtc.c +++ b/src/gallium/state_trackers/xorg/xorg_crtc.c @@ -135,14 +135,12 @@ crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, /* Only set gamma when needed, to avoid unneeded delays. */ #if defined(XF86_CRTC_VERSION) && XF86_CRTC_VERSION >= 3 - if (!crtc->active) -#endif + if (!crtc->active && crtc->version >= 3) crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green, crtc->gamma_blue, crtc->gamma_size); - -#if defined(XF86_CRTC_VERSION) && XF86_CRTC_VERSION >= 3 crtc->active = TRUE; #endif + crtc->x = x; crtc->y = y; crtc->mode = *mode; -- 2.30.2