From b391fb26df9f1b0c1673cb79be2478b0fe459f9e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 8 Jan 2018 17:58:27 +0100 Subject: [PATCH] dri_util: remove ALLOW_RGB10_CONFIGS option (v2) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This is unused because it's for libGL/libEGL, not drivers. v2: i965 was wrong, because it used dri_util instead of its own config. Reviewed-by: Tapani Pälli --- src/mesa/drivers/dri/common/dri_util.c | 4 ---- src/mesa/drivers/dri/i965/intel_screen.c | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index d4fba0b2747..e6a7d2391a7 100644 --- a/src/mesa/drivers/dri/common/dri_util.c +++ b/src/mesa/drivers/dri/common/dri_util.c @@ -55,10 +55,6 @@ const char __dri2ConfigOptions[] = DRI_CONF_SECTION_PERFORMANCE DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_1) DRI_CONF_SECTION_END - - DRI_CONF_SECTION_MISCELLANEOUS - DRI_CONF_ALLOW_RGB10_CONFIGS("true") - DRI_CONF_SECTION_END DRI_CONF_END; /*****************************************************************/ diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 3e016b5b7ae..08032c9b224 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -92,6 +92,7 @@ DRI_CONF_BEGIN DRI_CONF_SECTION_MISCELLANEOUS DRI_CONF_GLSL_ZERO_INIT("false") + DRI_CONF_ALLOW_RGB10_CONFIGS("false") DRI_CONF_SECTION_END DRI_CONF_END }; @@ -2064,7 +2065,7 @@ intel_screen_make_configs(__DRIscreen *dri_screen) num_formats = ARRAY_SIZE(formats) - 2; /* all - RGBA_ORDERING formats */ /* Shall we expose 10 bpc formats? */ - bool allow_rgb10_configs = driQueryOptionb(&dri_screen->optionCache, + bool allow_rgb10_configs = driQueryOptionb(&screen->optionCache, "allow_rgb10_configs"); /* Generate singlesample configs without accumulation buffer. */ -- 2.30.2