OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv, drirc: rename radv_require_{etc2,astc}

Browse Source 
Rename them to vk_require_{etc2,astc}.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25467>
This commit is contained in:
Chia-I Wu
2023-09-25 09:54:11 -07:00
committed by Marge Bot
parent cfdc57d120
commit 567c32b55c
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/amd/vulkan/radv_instance.c
View File

@@ -135,14 +135,14 @@ static const driOptionDescription radv_dri_options[] = {
DRI_CONF_OVERRIDE_VRAM_SIZE() DRI_CONF_OVERRIDE_VRAM_SIZE()
DRI_CONF_VK_WSI_FORCE_BGRA8_UNORM_FIRST(false) DRI_CONF_VK_WSI_FORCE_BGRA8_UNORM_FIRST(false)
DRI_CONF_VK_WSI_FORCE_SWAPCHAIN_TO_CURRENT_EXTENT(false) DRI_CONF_VK_WSI_FORCE_SWAPCHAIN_TO_CURRENT_EXTENT(false)
DRI_CONF_VK_REQUIRE_ETC2(false)
DRI_CONF_VK_REQUIRE_ASTC(false)
DRI_CONF_RADV_ZERO_VRAM(false) DRI_CONF_RADV_ZERO_VRAM(false)
DRI_CONF_RADV_LOWER_DISCARD_TO_DEMOTE(false) DRI_CONF_RADV_LOWER_DISCARD_TO_DEMOTE(false)
DRI_CONF_RADV_INVARIANT_GEOM(false) DRI_CONF_RADV_INVARIANT_GEOM(false)
DRI_CONF_RADV_SPLIT_FMA(false) DRI_CONF_RADV_SPLIT_FMA(false)
DRI_CONF_RADV_DISABLE_TC_COMPAT_HTILE_GENERAL(false) DRI_CONF_RADV_DISABLE_TC_COMPAT_HTILE_GENERAL(false)
DRI_CONF_RADV_DISABLE_DCC(false) DRI_CONF_RADV_DISABLE_DCC(false)
DRI_CONF_RADV_REQUIRE_ETC2(false)
DRI_CONF_RADV_REQUIRE_ASTC(false)
DRI_CONF_RADV_DISABLE_ANISO_SINGLE_LEVEL(false) DRI_CONF_RADV_DISABLE_ANISO_SINGLE_LEVEL(false)
DRI_CONF_RADV_DISABLE_SINKING_LOAD_INPUT_FS(false) DRI_CONF_RADV_DISABLE_SINKING_LOAD_INPUT_FS(false)
DRI_CONF_RADV_DGC(false) DRI_CONF_RADV_DGC(false)

4
src/amd/vulkan/radv_physical_device.c
View File

@@ -1827,8 +1827,8 @@ radv_physical_device_try_create(struct radv_instance *instance, drmDevicePtr drm
device->emulate_astc = true; device->emulate_astc = true;
#else #else
device->emulate_etc2 = device->emulate_etc2 =
!radv_device_supports_etc(device) && driQueryOptionb(&device->instance->dri_options, "radv_require_etc2"); !radv_device_supports_etc(device) && driQueryOptionb(&device->instance->dri_options, "vk_require_etc2");
device->emulate_astc = driQueryOptionb(&device->instance->dri_options, "radv_require_astc"); device->emulate_astc = driQueryOptionb(&device->instance->dri_options, "vk_require_astc");
#endif #endif
snprintf(device->name, sizeof(device->name), "AMD RADV %s%s", device->rad_info.name, snprintf(device->name, sizeof(device->name), "AMD RADV %s%s", device->rad_info.name,

16
src/util/driconf.h
View File

@@ -328,6 +328,14 @@
DRI_CONF_OPT_B(intel_enable_wa_14018912822, def, \ DRI_CONF_OPT_B(intel_enable_wa_14018912822, def, \
"Intel workaround for using zero blend constants") "Intel workaround for using zero blend constants")
#define DRI_CONF_VK_REQUIRE_ETC2(def) \
DRI_CONF_OPT_B(vk_require_etc2, def, \
"Implement emulated ETC2 on HW that does not support it")
#define DRI_CONF_VK_REQUIRE_ASTC(def) \
DRI_CONF_OPT_B(vk_require_astc, def, \
"Implement emulated ASTC on HW that does not support it")
/** /**
* \brief Image quality-related options * \brief Image quality-related options
*/ */
@@ -637,14 +645,6 @@
DRI_CONF_OPT_B(radv_disable_dcc, def, \ DRI_CONF_OPT_B(radv_disable_dcc, def, \
"Disable DCC for color images") "Disable DCC for color images")
#define DRI_CONF_RADV_REQUIRE_ETC2(def) \
DRI_CONF_OPT_B(radv_require_etc2, def, \
"Implement emulated ETC2 on HW that does not support it")
#define DRI_CONF_RADV_REQUIRE_ASTC(def) \
DRI_CONF_OPT_B(radv_require_astc, def, \
"Implement emulated ASTC on HW that does not support it")
#define DRI_CONF_RADV_DISABLE_ANISO_SINGLE_LEVEL(def) \ #define DRI_CONF_RADV_DISABLE_ANISO_SINGLE_LEVEL(def) \
DRI_CONF_OPT_B(radv_disable_aniso_single_level, def, \ DRI_CONF_OPT_B(radv_disable_aniso_single_level, def, \
"Disable anisotropic filtering for single level images") "Disable anisotropic filtering for single level images")