From 6868923702d5cdb93d06627ea4f40abe99cda75a Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 27 Sep 2013 15:25:40 -0700 Subject: dri: Move driver config options to dri driver extensions. This way they aren't all sitting in the global namespace (with the same name per driver). Reviewed-by: Matt Turner Reviewed-by: Chad Versace Reviewed-by: Emil Velikov --- src/mesa/drivers/dri/i915/intel_screen.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/mesa/drivers/dri/i915/intel_screen.c') diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c index 4f8c342e8e2..49bae5d67f8 100644 --- a/src/mesa/drivers/dri/i915/intel_screen.c +++ b/src/mesa/drivers/dri/i915/intel_screen.c @@ -40,8 +40,11 @@ #include "utils.h" #include "xmlpool.h" -PUBLIC const char __driConfigOptions[] = - DRI_CONF_BEGIN +static const __DRIconfigOptionsExtension i915_config_options = { + .base = { __DRI_CONFIG_OPTIONS, 1 }, + .xml = + +DRI_CONF_BEGIN DRI_CONF_SECTION_PERFORMANCE DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_ALWAYS_SYNC) /* Options correspond to DRI_CONF_BO_REUSE_DISABLED, @@ -75,7 +78,8 @@ PUBLIC const char __driConfigOptions[] = DRI_CONF_DESC(en, "Perform code generation at shader link time.") DRI_CONF_OPT_END DRI_CONF_SECTION_END -DRI_CONF_END; +DRI_CONF_END +}; #include "intel_batchbuffer.h" #include "intel_buffers.h" @@ -1109,7 +1113,7 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp) return false; } /* parse information in __driConfigOptions */ - driParseOptionInfo(&intelScreen->optionCache, __driConfigOptions); + driParseOptionInfo(&intelScreen->optionCache, i915_config_options.xml); intelScreen->driScrnPriv = psp; psp->driverPrivate = (void *) intelScreen; @@ -1203,5 +1207,6 @@ const struct __DriverAPIRec driDriverAPI = { PUBLIC const __DRIextension *__driDriverExtensions[] = { &driCoreExtension.base, &driDRI2Extension.base, + &i915_config_options.base, NULL }; -- cgit v1.2.3