diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2011-01-24 15:48:13 +0100 |
|---|---|---|
| committer | Michel Dänzer <daenzer@vmware.com> | 2011-01-24 15:48:13 +0100 |
| commit | be0665b461c776e2c4444330a865134e53f3d121 (patch) | |
| tree | 56946440ef2bb146f6d9f86f064cb3aa02620184 | |
| parent | db234176b12293dafbda0c6d4299c7e89430a8f8 (diff) | |
st/xorg: Fix build failure against xserver with XF86_CRTC_VERSION < 3.
Reported by Vinson Lee.
| -rw-r--r-- | src/gallium/state_trackers/xorg/xorg_crtc.c | 6 |
1 files 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 71f7b8c21d..d751ac1870 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; |