fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 02:50:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: move drirc options to a separate struct

Browse source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37145>
This commit is contained in:
Samuel Pitoiset 2025-09-02 17:44:19 +02:00 • committed by Marge Bot
parent d98e31eab6
commit d915f24cb2
2 changed files with 84 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
src/amd/vulkan/radv_instance.c
View file

@ -206,99 +206,90 @@ static const driOptionDescription radv_dri_options[] = {
static void
radv_init_dri_options(struct radv_instance *instance)
{
driParseOptionInfo(&instance->drirc.available_options, radv_dri_options, ARRAY_SIZE(radv_dri_options));
driParseConfigFiles(&instance->drirc.options, &instance->drirc.available_options, 0, "radv", NULL, NULL,
struct radv_drirc *drirc = &instance->drirc;
driParseOptionInfo(&drirc->available_options, radv_dri_options, ARRAY_SIZE(radv_dri_options));
driParseConfigFiles(&drirc->options, &drirc->available_options, 0, "radv", NULL, NULL,
instance->vk.app_info.app_name, instance->vk.app_info.app_version,
instance->vk.app_info.engine_name, instance->vk.app_info.engine_version);
instance->drirc.enable_mrt_output_nan_fixup =
driQueryOptionb(&instance->drirc.options, "radv_enable_mrt_output_nan_fixup");
drirc->enable_mrt_output_nan_fixup = driQueryOptionb(&drirc->options, "radv_enable_mrt_output_nan_fixup");
instance->drirc.disable_shrink_image_store =
driQueryOptionb(&instance->drirc.options, "radv_disable_shrink_image_store");
drirc->disable_shrink_image_store = driQueryOptionb(&drirc->options, "radv_disable_shrink_image_store");
instance->drirc.disable_tc_compat_htile_in_general =
driQueryOptionb(&instance->drirc.options, "radv_disable_tc_compat_htile_general");
drirc->disable_tc_compat_htile_in_general = driQueryOptionb(&drirc->options, "radv_disable_tc_compat_htile_general");
instance->drirc.no_dynamic_bounds = driQueryOptionb(&instance->drirc.options, "radv_no_dynamic_bounds");
drirc->no_dynamic_bounds = driQueryOptionb(&drirc->options, "radv_no_dynamic_bounds");
instance->drirc.invariant_geom = driQueryOptionb(&instance->drirc.options, "radv_invariant_geom");
drirc->invariant_geom = driQueryOptionb(&drirc->options, "radv_invariant_geom");
instance->drirc.split_fma = driQueryOptionb(&instance->drirc.options, "radv_split_fma");
drirc->split_fma = driQueryOptionb(&drirc->options, "radv_split_fma");
if (driQueryOptionb(&instance->drirc.options, "radv_disable_dcc"))
if (driQueryOptionb(&drirc->options, "radv_disable_dcc"))
instance->debug_flags |= RADV_DEBUG_NO_DCC;
instance->drirc.disable_ngg_gs = driQueryOptionb(&instance->drirc.options, "radv_disable_ngg_gs");
drirc->disable_ngg_gs = driQueryOptionb(&drirc->options, "radv_disable_ngg_gs");
instance->drirc.clear_lds = driQueryOptionb(&instance->drirc.options, "radv_clear_lds");
drirc->clear_lds = driQueryOptionb(&drirc->options, "radv_clear_lds");
instance->drirc.zero_vram = driQueryOptionb(&instance->drirc.options, "radv_zero_vram");
drirc->zero_vram = driQueryOptionb(&drirc->options, "radv_zero_vram");
instance->drirc.disable_aniso_single_level =
driQueryOptionb(&instance->drirc.options, "radv_disable_aniso_single_level");
drirc->disable_aniso_single_level = driQueryOptionb(&drirc->options, "radv_disable_aniso_single_level");
instance->drirc.disable_trunc_coord = driQueryOptionb(&instance->drirc.options, "radv_disable_trunc_coord");
drirc->disable_trunc_coord = driQueryOptionb(&drirc->options, "radv_disable_trunc_coord");
if (instance->vk.app_info.engine_name && !strcmp(instance->vk.app_info.engine_name, "DXVK")) {
/* Since 2.3.1+, DXVK uses the application version to notify the driver about D3D9. */
const bool is_d3d9 = instance->vk.app_info.app_version & 0x1;
instance->drirc.disable_trunc_coord &= !is_d3d9;
drirc->disable_trunc_coord &= !is_d3d9;
}
instance->drirc.disable_sinking_load_input_fs =
driQueryOptionb(&instance->drirc.options, "radv_disable_sinking_load_input_fs");
drirc->disable_sinking_load_input_fs = driQueryOptionb(&drirc->options, "radv_disable_sinking_load_input_fs");
instance->drirc.disable_depth_storage = driQueryOptionb(&instance->drirc.options, "radv_disable_depth_storage");
drirc->disable_depth_storage = driQueryOptionb(&drirc->options, "radv_disable_depth_storage");
instance->drirc.flush_before_query_copy = driQueryOptionb(&instance->drirc.options, "radv_flush_before_query_copy");
drirc->flush_before_query_copy = driQueryOptionb(&drirc->options, "radv_flush_before_query_copy");
instance->drirc.enable_unified_heap_on_apu =
driQueryOptionb(&instance->drirc.options, "radv_enable_unified_heap_on_apu");
drirc->enable_unified_heap_on_apu = driQueryOptionb(&drirc->options, "radv_enable_unified_heap_on_apu");
instance->drirc.tex_non_uniform = driQueryOptionb(&instance->drirc.options, "radv_tex_non_uniform");
drirc->tex_non_uniform = driQueryOptionb(&drirc->options, "radv_tex_non_uniform");
instance->drirc.ssbo_non_uniform = driQueryOptionb(&instance->drirc.options, "radv_ssbo_non_uniform");
drirc->ssbo_non_uniform = driQueryOptionb(&drirc->options, "radv_ssbo_non_uniform");
instance->drirc.app_layer = driQueryOptionstr(&instance->drirc.options, "radv_app_layer");
drirc->app_layer = driQueryOptionstr(&drirc->options, "radv_app_layer");
instance->drirc.flush_before_timestamp_write =
driQueryOptionb(&instance->drirc.options, "radv_flush_before_timestamp_write");
drirc->flush_before_timestamp_write = driQueryOptionb(&drirc->options, "radv_flush_before_timestamp_write");
if (driQueryOptionb(&instance->drirc.options, "radv_rt_wave64"))
if (driQueryOptionb(&drirc->options, "radv_rt_wave64"))
instance->perftest_flags |= RADV_PERFTEST_RT_WAVE_64;
instance->drirc.override_graphics_shader_version =
driQueryOptioni(&instance->drirc.options, "radv_override_graphics_shader_version");
instance->drirc.override_compute_shader_version =
driQueryOptioni(&instance->drirc.options, "radv_override_compute_shader_version");
instance->drirc.override_ray_tracing_shader_version =
driQueryOptioni(&instance->drirc.options, "radv_override_ray_tracing_shader_version");
drirc->override_graphics_shader_version = driQueryOptioni(&drirc->options, "radv_override_graphics_shader_version");
drirc->override_compute_shader_version = driQueryOptioni(&drirc->options, "radv_override_compute_shader_version");
drirc->override_ray_tracing_shader_version =
driQueryOptioni(&drirc->options, "radv_override_ray_tracing_shader_version");
instance->drirc.override_vram_size = driQueryOptioni(&instance->drirc.options, "override_vram_size");
drirc->override_vram_size = driQueryOptioni(&drirc->options, "override_vram_size");
instance->drirc.override_uniform_offset_alignment =
driQueryOptioni(&instance->drirc.options, "radv_override_uniform_offset_alignment");
drirc->override_uniform_offset_alignment =
driQueryOptioni(&drirc->options, "radv_override_uniform_offset_alignment");
instance->drirc.report_llvm9_version_string =
driQueryOptionb(&instance->drirc.options, "radv_report_llvm9_version_string");
drirc->report_llvm9_version_string = driQueryOptionb(&drirc->options, "radv_report_llvm9_version_string");
instance->drirc.vk_require_etc2 = driQueryOptionb(&instance->drirc.options, "vk_require_etc2");
instance->drirc.vk_require_astc = driQueryOptionb(&instance->drirc.options, "vk_require_astc");
drirc->vk_require_etc2 = driQueryOptionb(&drirc->options, "vk_require_etc2");
drirc->vk_require_astc = driQueryOptionb(&drirc->options, "vk_require_astc");
instance->drirc.disable_dcc_mips = driQueryOptionb(&instance->drirc.options, "radv_disable_dcc_mips");
instance->drirc.disable_dcc_stores = driQueryOptionb(&instance->drirc.options, "radv_disable_dcc_stores");
drirc->disable_dcc_mips = driQueryOptionb(&drirc->options, "radv_disable_dcc_mips");
drirc->disable_dcc_stores = driQueryOptionb(&drirc->options, "radv_disable_dcc_stores");
instance->drirc.lower_terminate_to_discard =
driQueryOptionb(&instance->drirc.options, "vk_lower_terminate_to_discard");
drirc->lower_terminate_to_discard = driQueryOptionb(&drirc->options, "vk_lower_terminate_to_discard");
instance->drirc.emulate_rt = driQueryOptionb(&instance->drirc.options, "radv_emulate_rt");
drirc->emulate_rt = driQueryOptionb(&drirc->options, "radv_emulate_rt");
instance->drirc.expose_float16_gfx8 = driQueryOptionb(&instance->drirc.options, "radv_enable_float16_gfx8");
drirc->expose_float16_gfx8 = driQueryOptionb(&drirc->options, "radv_enable_float16_gfx8");
instance->drirc.disable_hiz_his_gfx12 = driQueryOptionb(&instance->drirc.options, "radv_disable_hiz_his_gfx12");
drirc->disable_hiz_his_gfx12 = driQueryOptionb(&drirc->options, "radv_disable_hiz_his_gfx12");
instance->drirc.cooperative_matrix2_nv = driQueryOptionb(&instance->drirc.options, "radv_cooperative_matrix2_nv");
drirc->cooperative_matrix2_nv = driQueryOptionb(&drirc->options, "radv_cooperative_matrix2_nv");
}
static const struct vk_instance_extension_table radv_instance_extensions_supported = {

80
src/amd/vulkan/radv_instance.h
View file

@ -34,6 +34,46 @@ enum radv_trace_mode {
RADV_TRACE_MODE_CTX_ROLLS = 1 << (VK_TRACE_MODE_COUNT + 2),
};
struct radv_drirc {
struct driOptionCache options;
struct driOptionCache available_options;
bool enable_mrt_output_nan_fixup;
bool disable_tc_compat_htile_in_general;
bool disable_shrink_image_store;
bool disable_aniso_single_level;
bool disable_trunc_coord;
bool disable_depth_storage;
bool zero_vram;
bool disable_sinking_load_input_fs;
bool flush_before_query_copy;
bool enable_unified_heap_on_apu;
bool tex_non_uniform;
bool ssbo_non_uniform;
bool flush_before_timestamp_write;
bool clear_lds;
bool report_llvm9_version_string;
bool vk_require_etc2;
bool vk_require_astc;
bool disable_dcc_mips;
bool disable_dcc_stores;
bool lower_terminate_to_discard;
bool emulate_rt;
bool expose_float16_gfx8;
bool disable_hiz_his_gfx12;
bool cooperative_matrix2_nv;
bool no_dynamic_bounds;
bool invariant_geom;
bool split_fma;
bool disable_ngg_gs;
char *app_layer;
uint8_t override_graphics_shader_version;
uint8_t override_compute_shader_version;
uint8_t override_ray_tracing_shader_version;
int override_vram_size;
int override_uniform_offset_alignment;
};
struct radv_instance {
struct vk_instance vk;
@ -46,45 +86,7 @@ struct radv_instance {
uint64_t trap_excp_flags;
enum radeon_ctx_pstate profile_pstate;
struct {
struct driOptionCache options;
struct driOptionCache available_options;
bool enable_mrt_output_nan_fixup;
bool disable_tc_compat_htile_in_general;
bool disable_shrink_image_store;
bool disable_aniso_single_level;
bool disable_trunc_coord;
bool disable_depth_storage;
bool zero_vram;
bool disable_sinking_load_input_fs;
bool flush_before_query_copy;
bool enable_unified_heap_on_apu;
bool tex_non_uniform;
bool ssbo_non_uniform;
bool flush_before_timestamp_write;
bool clear_lds;
bool report_llvm9_version_string;
bool vk_require_etc2;
bool vk_require_astc;
bool disable_dcc_mips;
bool disable_dcc_stores;
bool lower_terminate_to_discard;
bool emulate_rt;
bool expose_float16_gfx8;
bool disable_hiz_his_gfx12;
bool cooperative_matrix2_nv;
bool no_dynamic_bounds;
bool invariant_geom;
bool split_fma;
bool disable_ngg_gs;
char *app_layer;
uint8_t override_graphics_shader_version;
uint8_t override_compute_shader_version;
uint8_t override_ray_tracing_shader_version;
int override_vram_size;
int override_uniform_offset_alignment;
} drirc;
struct radv_drirc drirc;
FILE *pso_history_logfile;
};