From fceadfe7ef01637daf17624e2d7f961d85625845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 3 Aug 2014 13:58:20 +0200 Subject: gallium: pass st_config_options to query_versions So move it from dri_context to dri_screen. This will be needed for version computations. Reviewed-by: Ilia Mirkin --- src/gallium/state_trackers/dri/dri_context.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'src/gallium/state_trackers/dri/dri_context.c') diff --git a/src/gallium/state_trackers/dri/dri_context.c b/src/gallium/state_trackers/dri/dri_context.c index 827f847..fe3240a 100644 --- a/src/gallium/state_trackers/dri/dri_context.c +++ b/src/gallium/state_trackers/dri/dri_context.c @@ -39,26 +39,6 @@ #include "pipe/p_context.h" #include "state_tracker/st_context.h" -static void -dri_fill_st_options(struct st_config_options *options, - const struct driOptionCache * optionCache) -{ - options->disable_blend_func_extended = - driQueryOptionb(optionCache, "disable_blend_func_extended"); - options->disable_glsl_line_continuations = - driQueryOptionb(optionCache, "disable_glsl_line_continuations"); - options->disable_shader_bit_encoding = - driQueryOptionb(optionCache, "disable_shader_bit_encoding"); - options->force_glsl_extensions_warn = - driQueryOptionb(optionCache, "force_glsl_extensions_warn"); - options->force_glsl_version = - driQueryOptioni(optionCache, "force_glsl_version"); - options->force_s3tc_enable = - driQueryOptionb(optionCache, "force_s3tc_enable"); - options->allow_glsl_extension_directive_midshader = - driQueryOptionb(optionCache, "allow_glsl_extension_directive_midshader"); -} - GLboolean dri_create_context(gl_api api, const struct gl_config * visual, __DRIcontext * cPriv, @@ -127,7 +107,7 @@ dri_create_context(gl_api api, const struct gl_config * visual, ctx->cPriv = cPriv; ctx->sPriv = sPriv; - dri_fill_st_options(&attribs.options, &screen->optionCache); + attribs.options = screen->options; dri_fill_st_visual(&attribs.visual, screen, visual); ctx->st = stapi->create_context(stapi, &screen->base, &attribs, &ctx_err, st_share); -- cgit v1.1