diff options
| author | Keith Packard <keithp@keithp.com> | 2014-08-16 18:40:40 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-09-12 13:51:16 -0700 |
| commit | d83b30b7042dd0207116f4a059637794c4becb04 (patch) | |
| tree | ade78c1f627b4b6966d051a3971f70971cf4e253 | |
| parent | e3c06746c7c22dcc2a862859c6f45dd1dfecdca7 (diff) | |
Move some UXA-specific code under #if USE_UXA.
This makes the UXA-specific elements of intel_screen_private and a bit
of code in intel_driver covered under #if USE_UXA
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | src/uxa/intel.h | 6 | ||||
| -rw-r--r-- | src/uxa/intel_driver.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/uxa/intel.h b/src/uxa/intel.h index 28f11b6e..65d8e5c8 100644 --- a/src/uxa/intel.h +++ b/src/uxa/intel.h @@ -127,6 +127,7 @@ typedef struct intel_screen_private { dri_bufmgr *bufmgr; +#if USE_UXA uint32_t batch_ptr[4096]; /** Byte offset in batch_ptr for the next dword to be emitted. */ unsigned int batch_used; @@ -142,6 +143,7 @@ typedef struct intel_screen_private { struct list batch_pixmaps; drm_intel_bo *wa_scratch_bo; OsTimerPtr cache_expire; +#endif /* For Xvideo */ Bool use_overlay; @@ -178,8 +180,10 @@ typedef struct intel_screen_private { void (*batch_flush) (struct intel_screen_private *intel); void (*batch_commit_notify) (struct intel_screen_private *intel); +#if USE_UXA struct _UxaDriver *uxa_driver; int uxa_flags; +#endif Bool need_sync; int accel_pixmap_offset_alignment; int accel_max_x; @@ -212,6 +216,7 @@ typedef struct intel_screen_private { drm_intel_bo *gen6_depth_stencil_bo; } video; +#if USE_UXA /* Render accel state */ float scale_units[2][2]; /** Transform pointers for src/mask, or NULL if identity */ @@ -269,6 +274,7 @@ typedef struct intel_screen_private { /* 965 render acceleration state */ struct gen4_render_state *gen4_render_state; +#endif /* DRI enabled this generation. */ enum dri_type dri2, dri3; diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c index 9198e8ad..ea990e40 100644 --- a/src/uxa/intel_driver.c +++ b/src/uxa/intel_driver.c @@ -211,6 +211,7 @@ static Bool I830GetEarlyOptions(ScrnInfoPtr scrn) if (!intel->Options) return FALSE; +#if USE_UXA intel->fallback_debug = xf86ReturnOptValBool(intel->Options, OPTION_FALLBACKDEBUG, FALSE); @@ -232,6 +233,7 @@ static Bool I830GetEarlyOptions(ScrnInfoPtr scrn) FALSE)) intel->debug_flush |= DEBUG_FLUSH_WAIT; +#endif return TRUE; } |