diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-09-23 08:56:50 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-09-23 08:56:50 +0100 |
| commit | c2ca1c5abca687adb08d6e137bc3b70bdecb083d (patch) | |
| tree | e1afe51977ad5cb30d842b640e2131a1cf388a89 | |
| parent | 92dbedc6138b923aa473935013ecb0346280c4d3 (diff) | |
| download | xorg-driver-xf86-video-intel-c2ca1c5abca687adb08d6e137bc3b70bdecb083d.tar.gz | |
Reorder INTEL_XVMC define so that we pick up Option "XvMC"
Otherwise it will remain disabled.
Reported-by: Giacomo Comes <comes@naic.edu>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/intel.h | 7 | ||||
| -rw-r--r-- | src/intel_options.h | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/intel.h b/src/intel.h index 48ec386a..a5603fee 100644 --- a/src/intel.h +++ b/src/intel.h @@ -68,6 +68,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "i915_drm.h" #include "intel_driver.h" +#include "intel_options.h" #include "intel_list.h" #include "compat-api.h" @@ -142,12 +143,6 @@ void intel_set_pixmap_bo(PixmapPtr pixmap, dri_bo * bo); #include "common.h" -#ifdef XvMCExtension -#ifdef ENABLE_XVMC -#define INTEL_XVMC 1 -#endif -#endif - #define PITCH_NONE 0 /** enumeration of 3d consumers so some can maintain invariant state. */ diff --git a/src/intel_options.h b/src/intel_options.h index 39c0b73f..3b5262a5 100644 --- a/src/intel_options.h +++ b/src/intel_options.h @@ -23,8 +23,9 @@ enum intel_options { OPTION_PREFER_OVERLAY, OPTION_HOTPLUG, OPTION_RELAXED_FENCING, -#ifdef INTEL_XVMC +#if defined(XvMCExtension) && defined(ENABLE_XVMC) OPTION_XVMC, +#define INTEL_XVMC 1 #endif #ifdef USE_SNA OPTION_THROTTLE, |