X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fstate_trackers%2Fdri%2Fdri_screen.c;h=bd0925b905518c60b608fe2698dcd173709b320e;hb=ebdc4c31e23ffd5ce0d1fc47dd8f76c146961e25;hp=43e67b6555f58db866f4c757a3748193fc1b48b4;hpb=601093f95ddf6b49a79baa91dc51d4f163dfc8de;p=mesa.git diff --git a/src/gallium/state_trackers/dri/dri_screen.c b/src/gallium/state_trackers/dri/dri_screen.c index 43e67b6555f..bd0925b9055 100644 --- a/src/gallium/state_trackers/dri/dri_screen.c +++ b/src/gallium/state_trackers/dri/dri_screen.c @@ -30,7 +30,6 @@ */ #include "utils.h" -#include "util/xmlpool.h" #include "dri_screen.h" #include "dri_context.h" @@ -50,45 +49,9 @@ #undef false const __DRIconfigOptionsExtension gallium_config_options = { - .base = { __DRI_CONFIG_OPTIONS, 1 }, - .xml = - - DRI_CONF_BEGIN - DRI_CONF_SECTION_PERFORMANCE - DRI_CONF_MESA_GLTHREAD("false") - DRI_CONF_MESA_NO_ERROR("false") - DRI_CONF_DISABLE_EXT_BUFFER_AGE("false") - DRI_CONF_DISABLE_OML_SYNC_CONTROL("false") - DRI_CONF_SECTION_END - - DRI_CONF_SECTION_QUALITY - DRI_CONF_FORCE_S3TC_ENABLE("false") - DRI_CONF_PP_CELSHADE(0) - DRI_CONF_PP_NORED(0) - DRI_CONF_PP_NOGREEN(0) - DRI_CONF_PP_NOBLUE(0) - DRI_CONF_PP_JIMENEZMLAA(0, 0, 32) - DRI_CONF_PP_JIMENEZMLAA_COLOR(0, 0, 32) - DRI_CONF_SECTION_END - - DRI_CONF_SECTION_DEBUG - DRI_CONF_FORCE_GLSL_EXTENSIONS_WARN("false") - DRI_CONF_DISABLE_GLSL_LINE_CONTINUATIONS("false") - DRI_CONF_DISABLE_BLEND_FUNC_EXTENDED("false") - DRI_CONF_DISABLE_SHADER_BIT_ENCODING("false") - DRI_CONF_FORCE_GLSL_VERSION(0) - DRI_CONF_ALLOW_GLSL_EXTENSION_DIRECTIVE_MIDSHADER("false") - DRI_CONF_ALLOW_GLSL_BUILTIN_VARIABLE_REDECLARATION("false") - DRI_CONF_ALLOW_HIGHER_COMPAT_VERSION("false") - DRI_CONF_FORCE_GLSL_ABS_SQRT("false") - DRI_CONF_GLSL_CORRECT_DERIVATIVES_AFTER_DISCARD("false") - DRI_CONF_SECTION_END - - DRI_CONF_SECTION_MISCELLANEOUS - DRI_CONF_ALWAYS_HAVE_DEPTH_BUFFER("false") - DRI_CONF_GLSL_ZERO_INIT("false") - DRI_CONF_SECTION_END - DRI_CONF_END + .base = { __DRI_CONFIG_OPTIONS, 2 }, + .xml = gallium_driinfo_xml, + .getXml = pipe_loader_get_driinfo_xml }; #define false 0 @@ -97,7 +60,7 @@ static void dri_fill_st_options(struct dri_screen *screen) { struct st_config_options *options = &screen->options; - const struct driOptionCache *optionCache = &screen->optionCache; + const struct driOptionCache *optionCache = &screen->dev->option_cache; options->disable_blend_func_extended = driQueryOptionb(optionCache, "disable_blend_func_extended"); @@ -109,8 +72,6 @@ dri_fill_st_options(struct dri_screen *screen) 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"); options->allow_glsl_builtin_variable_redeclaration = @@ -120,6 +81,8 @@ dri_fill_st_options(struct dri_screen *screen) options->glsl_zero_init = driQueryOptionb(optionCache, "glsl_zero_init"); options->force_glsl_abs_sqrt = driQueryOptionb(optionCache, "force_glsl_abs_sqrt"); + options->allow_glsl_cross_stage_interpolation_mismatch = + driQueryOptionb(optionCache, "allow_glsl_cross_stage_interpolation_mismatch"); driComputeOptionsSha1(optionCache, options->config_options_sha1); } @@ -130,10 +93,12 @@ dri_loader_get_cap(struct dri_screen *screen, enum dri_loader_cap cap) const __DRIdri2LoaderExtension *dri2_loader = screen->sPriv->dri2.loader; const __DRIimageLoaderExtension *image_loader = screen->sPriv->image.loader; - if (dri2_loader && dri2_loader->base.version >= 4) + if (dri2_loader && dri2_loader->base.version >= 4 && + dri2_loader->getCapability) return dri2_loader->getCapability(screen->sPriv->loaderPrivate, cap); - if (image_loader && image_loader->base.version >= 2) + if (image_loader && image_loader->base.version >= 2 && + image_loader->getCapability) return image_loader->getCapability(screen->sPriv->loaderPrivate, cap); return 0; @@ -143,6 +108,10 @@ static const __DRIconfig ** dri_fill_in_modes(struct dri_screen *screen) { static const mesa_format mesa_formats[] = { + MESA_FORMAT_B10G10R10A2_UNORM, + MESA_FORMAT_B10G10R10X2_UNORM, + MESA_FORMAT_R10G10B10A2_UNORM, + MESA_FORMAT_R10G10B10X2_UNORM, MESA_FORMAT_B8G8R8A8_UNORM, MESA_FORMAT_B8G8R8X8_UNORM, MESA_FORMAT_B8G8R8A8_SRGB, @@ -171,6 +140,10 @@ dri_fill_in_modes(struct dri_screen *screen) MESA_FORMAT_R8G8B8X8_UNORM, }; static const enum pipe_format pipe_formats[] = { + PIPE_FORMAT_B10G10R10A2_UNORM, + PIPE_FORMAT_B10G10R10X2_UNORM, + PIPE_FORMAT_R10G10B10A2_UNORM, + PIPE_FORMAT_R10G10B10X2_UNORM, PIPE_FORMAT_BGRA8888_UNORM, PIPE_FORMAT_BGRX8888_UNORM, PIPE_FORMAT_BGRA8888_SRGB, @@ -189,12 +162,14 @@ dri_fill_in_modes(struct dri_screen *screen) struct pipe_screen *p_screen = screen->base.screen; boolean pf_z16, pf_x8z24, pf_z24x8, pf_s8z24, pf_z24s8, pf_z32; boolean mixed_color_depth; + boolean allow_rgb10; static const GLenum back_buffer_modes[] = { - GLX_NONE, GLX_SWAP_UNDEFINED_OML, GLX_SWAP_COPY_OML + __DRI_ATTRIB_SWAP_NONE, __DRI_ATTRIB_SWAP_UNDEFINED, + __DRI_ATTRIB_SWAP_COPY }; - if (driQueryOptionb(&screen->optionCache, "always_have_depth_buffer")) { + if (driQueryOptionb(&screen->dev->option_cache, "always_have_depth_buffer")) { /* all visuals will have a depth buffer */ depth_buffer_factor = 0; } @@ -204,6 +179,8 @@ dri_fill_in_modes(struct dri_screen *screen) depth_buffer_factor = 1; } + allow_rgb10 = driQueryOptionb(&screen->dev->option_cache, "allow_rgb10_configs"); + msaa_samples_max = (screen->st_api->feature_mask & ST_API_FEATURE_MS_VISUALS_MASK) ? MSAA_VISUAL_MAX_SAMPLES : 1; @@ -255,7 +232,7 @@ dri_fill_in_modes(struct dri_screen *screen) if (dri_loader_get_cap(screen, DRI_LOADER_CAP_RGBA_ORDERING)) num_formats = ARRAY_SIZE(mesa_formats); else - num_formats = 5; + num_formats = ARRAY_SIZE(mesa_formats) - 2; /* all - RGBA_ORDERING formats */ /* Add configs. */ for (format = 0; format < num_formats; format++) { @@ -263,6 +240,13 @@ dri_fill_in_modes(struct dri_screen *screen) unsigned num_msaa_modes = 0; /* includes a single-sample mode */ uint8_t msaa_modes[MSAA_VISUAL_MAX_SAMPLES]; + if (!allow_rgb10 && + (mesa_formats[format] == MESA_FORMAT_B10G10R10A2_UNORM || + mesa_formats[format] == MESA_FORMAT_B10G10R10X2_UNORM || + mesa_formats[format] == MESA_FORMAT_R10G10B10A2_UNORM || + mesa_formats[format] == MESA_FORMAT_R10G10B10X2_UNORM)) + continue; + if (!p_screen->is_format_supported(p_screen, pipe_formats[format], PIPE_TEXTURE_2D, 0, PIPE_BIND_RENDER_TARGET)) @@ -323,6 +307,24 @@ dri_fill_st_visual(struct st_visual *stvis, struct dri_screen *screen, /* Deduce the color format. */ switch (mode->redMask) { + case 0x3FF00000: + if (mode->alphaMask) { + assert(mode->alphaMask == 0xC0000000); + stvis->color_format = PIPE_FORMAT_B10G10R10A2_UNORM; + } else { + stvis->color_format = PIPE_FORMAT_B10G10R10X2_UNORM; + } + break; + + case 0x000003FF: + if (mode->alphaMask) { + assert(mode->alphaMask == 0xC0000000); + stvis->color_format = PIPE_FORMAT_R10G10B10A2_UNORM; + } else { + stvis->color_format = PIPE_FORMAT_R10G10B10X2_UNORM; + } + break; + case 0x00FF0000: if (mode->alphaMask) { assert(mode->alphaMask == 0xFF000000); @@ -454,28 +456,6 @@ dri_get_param(struct st_manager *smapi, } } -static void -dri_destroy_option_cache(struct dri_screen * screen) -{ - int i; - - if (screen->optionCache.info) { - for (i = 0; i < (1 << screen->optionCache.tableSize); ++i) { - free(screen->optionCache.info[i].name); - free(screen->optionCache.info[i].ranges); - } - free(screen->optionCache.info); - } - - free(screen->optionCache.values); - - /* Default values are copied to screen->optionCache->values in - * initOptionCache. The info field, however, is a pointer copy, so don't free - * that twice. - */ - free(screen->optionCacheDefaults.values); -} - void dri_destroy_screen_helper(struct dri_screen * screen) { @@ -488,7 +468,6 @@ dri_destroy_screen_helper(struct dri_screen * screen) if (screen->base.screen) screen->base.screen->destroy(screen->base.screen); - dri_destroy_option_cache(screen); mtx_destroy(&screen->opencl_func_mutex); } @@ -512,7 +491,7 @@ dri_postprocessing_init(struct dri_screen *screen) unsigned i; for (i = 0; i < PP_FILTERS; i++) { - screen->pp_enabled[i] = driQueryOptioni(&screen->optionCache, + screen->pp_enabled[i] = driQueryOptioni(&screen->dev->option_cache, pp_filters[i].name); } } @@ -536,24 +515,12 @@ dri_set_background_context(struct st_context_iface *st, hud_add_queue_for_monitoring(ctx->hud, queue_info); } -unsigned -dri_init_options_get_screen_flags(struct dri_screen *screen, - const char* driver_name) +void +dri_init_options(struct dri_screen *screen) { - unsigned flags = 0; + pipe_loader_load_options(screen->dev); - driParseOptionInfo(&screen->optionCacheDefaults, gallium_config_options.xml); - driParseConfigFiles(&screen->optionCache, - &screen->optionCacheDefaults, - screen->sPriv->myNum, - driver_name); dri_fill_st_options(screen); - - if (driQueryOptionb(&screen->optionCache, - "glsl_correct_derivatives_after_discard")) - flags |= PIPE_SCREEN_ENABLE_CORRECT_TGSI_DERIVATIVES_AFTER_KILL; - - return flags; } const __DRIconfig ** @@ -574,19 +541,6 @@ dri_init_screen_helper(struct dri_screen *screen, else screen->target = PIPE_TEXTURE_RECT; - /* Handle force_s3tc_enable. */ - if (!util_format_s3tc_enabled && screen->options.force_s3tc_enable) { - /* Ensure libtxc_dxtn has been loaded if available. - * Forcing S3TC on before calling this would prevent loading - * the library. - * This is just a precaution, the driver should have called it - * already. - */ - util_format_s3tc_init(); - - util_format_s3tc_enabled = TRUE; - } - dri_postprocessing_init(screen); screen->st_api->query_versions(screen->st_api, &screen->base,