diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-05-25 08:50:33 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-05-25 10:06:57 +0100 |
| commit | 8a9a585341e2dd43c649204fcf6d92a867671ba3 (patch) | |
| tree | f91a521d5906658745633bc9b35c5c0ab4bb2439 /src/intel_options.h | |
| parent | e45629135065d0cc73c285f8df35ab4e1d07c6dc (diff) | |
Only create a single instance of the intel_options array
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/intel_options.h')
| -rw-r--r-- | src/intel_options.h | 36 |
1 files changed, 5 insertions, 31 deletions
diff --git a/src/intel_options.h b/src/intel_options.h index 8863878a..42a9e560 100644 --- a/src/intel_options.h +++ b/src/intel_options.h @@ -1,6 +1,9 @@ #ifndef INTEL_OPTIONS_H #define INTEL_OPTIONS_H +#include <xf86.h> +#include <xf86Opt.h> + /* * Note: "ColorKey" is provided for compatibility with the i810 driver. * However, the correct option name is "VideoKey". "ColorKey" usually @@ -40,36 +43,7 @@ enum intel_options { NUM_OPTIONS, }; -static OptionInfoRec intel_options[] = { - {OPTION_ACCEL_METHOD, "AccelMethod", OPTV_STRING, {0}, 0}, - {OPTION_DRI, "DRI", OPTV_BOOLEAN, {0}, TRUE}, - {OPTION_COLOR_KEY, "ColorKey", OPTV_INTEGER, {0}, FALSE}, - {OPTION_VIDEO_KEY, "VideoKey", OPTV_INTEGER, {0}, FALSE}, - {OPTION_TILING_2D, "Tiling", OPTV_BOOLEAN, {0}, TRUE}, - {OPTION_TILING_FB, "LinearFramebuffer", OPTV_BOOLEAN, {0}, FALSE}, - {OPTION_SHADOW, "Shadow", OPTV_BOOLEAN, {0}, FALSE}, - {OPTION_SWAPBUFFERS_WAIT, "SwapbuffersWait", OPTV_BOOLEAN, {0}, TRUE}, - {OPTION_TRIPLE_BUFFER, "TripleBuffer", OPTV_BOOLEAN, {0}, TRUE}, -#ifdef INTEL_XVMC - {OPTION_XVMC, "XvMC", OPTV_BOOLEAN, {0}, TRUE}, -#endif - {OPTION_PREFER_OVERLAY, "XvPreferOverlay", OPTV_BOOLEAN, {0}, FALSE}, - {OPTION_DEBUG_FLUSH_BATCHES, "DebugFlushBatches", OPTV_BOOLEAN, {0}, FALSE}, - {OPTION_DEBUG_FLUSH_CACHES, "DebugFlushCaches", OPTV_BOOLEAN, {0}, FALSE}, - {OPTION_DEBUG_WAIT, "DebugWait", OPTV_BOOLEAN, {0}, FALSE}, - {OPTION_HOTPLUG, "HotPlug", OPTV_BOOLEAN, {0}, TRUE}, - {OPTION_RELAXED_FENCING, "RelaxedFencing", OPTV_BOOLEAN, {0}, TRUE}, -#ifdef USE_SNA - {OPTION_THROTTLE, "Throttle", OPTV_BOOLEAN, {0}, TRUE}, - {OPTION_VMAP, "UseVmap", OPTV_BOOLEAN, {0}, TRUE}, - {OPTION_ZAPHOD, "ZaphodHeads", OPTV_STRING, {0}, FALSE}, - {OPTION_DELAYED_FLUSH, "DelayedFlush", OPTV_BOOLEAN, {0}, TRUE}, -#endif -#ifdef USE_UXA - {OPTION_FALLBACKDEBUG, "FallbackDebug", OPTV_BOOLEAN, {0}, FALSE}, - {OPTION_BUFFER_CACHE, "BufferCache", OPTV_BOOLEAN, {0}, TRUE}, -#endif - {-1, NULL, OPTV_NONE, {0}, FALSE} -}; +extern const OptionInfoRec intel_options[]; +OptionInfoPtr intel_options_get(ScrnInfoPtr scrn); #endif /* INTEL_OPTIONS_H */ |