summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2013-07-30 22:29:21 +0200
committerMarek Olšák <marek.olsak@amd.com>2013-07-30 23:31:24 +0200
commitbc4f0b6bacff34c724a2a301662051364870e5e5 (patch)
tree171bb0a722405ac8d067c6ac00b4993405cb139e /src
parentdda936e057b01b6401de7747038d341332c6d128 (diff)
st/dri: remove driOptionCache from dri_context in favor of dri_screen
There is no reason to have this duplicated. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/state_trackers/dri/common/dri_context.c12
-rw-r--r--src/gallium/state_trackers/dri/common/dri_context.h2
2 files changed, 1 insertions, 13 deletions
diff --git a/src/gallium/state_trackers/dri/common/dri_context.c b/src/gallium/state_trackers/dri/common/dri_context.c
index 66034915447..b5445f87914 100644
--- a/src/gallium/state_trackers/dri/common/dri_context.c
+++ b/src/gallium/state_trackers/dri/common/dri_context.c
@@ -109,11 +109,7 @@ dri_create_context(gl_api api, const struct gl_config * visual,
ctx->cPriv = cPriv;
ctx->sPriv = sPriv;
- driParseConfigFiles(&ctx->optionCache,
- &screen->optionCacheDefaults,
- sPriv->myNum, driver_descriptor.name);
-
- dri_fill_st_options(&attribs.options, &ctx->optionCache);
+ dri_fill_st_options(&attribs.options, &screen->optionCache);
dri_fill_st_visual(&attribs.visual, screen, visual);
ctx->st = stapi->create_context(stapi, &screen->base, &attribs, &ctx_err,
st_share);
@@ -171,12 +167,6 @@ dri_destroy_context(__DRIcontext * cPriv)
hud_destroy(ctx->hud);
}
- /* note: we are freeing values and nothing more because
- * driParseConfigFiles allocated values only - the rest
- * is owned by screen optionCacheDefaults.
- */
- free(ctx->optionCache.values);
-
/* No particular reason to wait for command completion before
* destroying a context, but we flush the context here
* to avoid having to add code elsewhere to cope with flushing a
diff --git a/src/gallium/state_trackers/dri/common/dri_context.h b/src/gallium/state_trackers/dri/common/dri_context.h
index 2734ee50daa..b87ce40b11e 100644
--- a/src/gallium/state_trackers/dri/common/dri_context.h
+++ b/src/gallium/state_trackers/dri/common/dri_context.h
@@ -50,8 +50,6 @@ struct dri_context
__DRIdrawable *dPriv;
__DRIdrawable *rPriv;
- driOptionCache optionCache;
-
unsigned int bind_count;
/* gallium */