i965: Don't parse driconf again
It was already parsed in intelInitScree2, and the results are stored in
the screen.
Fixes: d67ef48580
("i965/screen: Allow drirc to set 'allow_rgb10_configs' again.")
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7387>
This commit is contained in:
parent
f11a827941
commit
0f1a8f8a6d
|
@ -579,7 +579,7 @@ brw_initialize_context_constants(struct brw_context *brw)
|
|||
int max_samples;
|
||||
const int *msaa_modes = intel_supported_msaa_modes(brw->screen);
|
||||
const int clamp_max_samples =
|
||||
driQueryOptioni(&brw->optionCache, "clamp_max_samples");
|
||||
driQueryOptioni(&brw->screen->optionCache, "clamp_max_samples");
|
||||
|
||||
if (clamp_max_samples < 0) {
|
||||
max_samples = msaa_modes[0];
|
||||
|
@ -858,11 +858,7 @@ brw_process_driconf_options(struct brw_context *brw)
|
|||
{
|
||||
const struct gen_device_info *devinfo = &brw->screen->devinfo;
|
||||
struct gl_context *ctx = &brw->ctx;
|
||||
|
||||
driOptionCache *options = &brw->optionCache;
|
||||
driParseConfigFiles(options, &brw->screen->optionCache,
|
||||
brw->driContext->driScreenPriv->myNum,
|
||||
"i965", NULL, NULL, 0, NULL, 0);
|
||||
const driOptionCache *const options = &brw->screen->optionCache;
|
||||
|
||||
if (INTEL_DEBUG & DEBUG_NO_HIZ) {
|
||||
brw->has_hiz = false;
|
||||
|
@ -889,9 +885,9 @@ brw_process_driconf_options(struct brw_context *brw)
|
|||
brw->disable_throttling = true;
|
||||
}
|
||||
|
||||
brw->precompile = driQueryOptionb(&brw->optionCache, "shader_precompile");
|
||||
brw->precompile = driQueryOptionb(&brw->screen->optionCache, "shader_precompile");
|
||||
|
||||
if (driQueryOptionb(&brw->optionCache, "precise_trig"))
|
||||
if (driQueryOptionb(&brw->screen->optionCache, "precise_trig"))
|
||||
brw->screen->compiler->precise_trig = true;
|
||||
|
||||
ctx->Const.ForceGLSLExtensionsWarn =
|
||||
|
@ -1267,8 +1263,6 @@ intelDestroyContext(__DRIcontext * driContextPriv)
|
|||
brw->throttle_batch[1] = NULL;
|
||||
brw->throttle_batch[0] = NULL;
|
||||
|
||||
driDestroyOptionCache(&brw->optionCache);
|
||||
|
||||
/* free the Mesa context */
|
||||
_mesa_free_context_data(&brw->ctx, true);
|
||||
|
||||
|
|
|
@ -813,8 +813,6 @@ struct brw_context
|
|||
bool disable_throttling;
|
||||
bool precompile;
|
||||
bool dual_color_blend_by_location;
|
||||
|
||||
driOptionCache optionCache;
|
||||
/** @} */
|
||||
|
||||
GLuint primitive; /**< Hardware primitive, such as _3DPRIM_TRILIST. */
|
||||
|
|
|
@ -180,7 +180,7 @@ intelInitExtensions(struct gl_context *ctx)
|
|||
|
||||
if (devinfo->gen >= 6) {
|
||||
ctx->Extensions.ARB_blend_func_extended =
|
||||
!driQueryOptionb(&brw->optionCache, "disable_blend_func_extended");
|
||||
!driQueryOptionb(&brw->screen->optionCache, "disable_blend_func_extended");
|
||||
ctx->Extensions.ARB_conditional_render_inverted = true;
|
||||
ctx->Extensions.ARB_cull_distance = true;
|
||||
ctx->Extensions.ARB_draw_buffers_blend = true;
|
||||
|
|
Loading…
Reference in New Issue