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

turnip: Add debug option to allow non-conforming features.

Browse source 
This is because we still may want to be able to expose vulkan 1.3
on some devices that technically do not support it, for instance
the adreno 610 has everything required except multiview, which is
not essential for most games.

Signed-off-by: Amber Amber <amber@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20991>
This commit is contained in:
Amber 2023-05-26 15:31:43 +02:00 • committed by Marge Bot
parent 576a4e85f0
commit 426708796c
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/freedreno/vulkan/tu_device.cc
View file

@ -161,7 +161,7 @@ get_device_extensions(const struct tu_physical_device *device,
.KHR_maintenance2 = true,
.KHR_maintenance3 = true,
.KHR_maintenance4 = true,
.KHR_multiview = device->info->a6xx.has_hw_multiview,
.KHR_multiview = TU_DEBUG(NOCONFORM) ? true : device->info->a6xx.has_hw_multiview,
.KHR_performance_query = TU_DEBUG(PERFC),
.KHR_pipeline_executable_properties = true,
.KHR_pipeline_library = true,
@ -258,7 +258,7 @@ get_device_extensions(const struct tu_physical_device *device,
.EXT_shader_demote_to_helper_invocation = true,
.EXT_shader_module_identifier = true,
.EXT_shader_stencil_export = true,
.EXT_shader_viewport_index_layer = device->info->a6xx.has_hw_multiview,
.EXT_shader_viewport_index_layer = TU_DEBUG(NOCONFORM) ? true : device->info->a6xx.has_hw_multiview,
.EXT_subgroup_size_control = true,
.EXT_texel_buffer_alignment = true,
.EXT_tooling_info = true,
@ -302,7 +302,7 @@ tu_get_features(struct tu_physical_device *pdevice,
features->wideLines = false;
features->largePoints = true;
features->alphaToOne = true;
features->multiViewport = pdevice->info->a6xx.has_hw_multiview;
features->multiViewport = true;
features->samplerAnisotropy = true;
features->textureCompressionETC2 = true;
features->textureCompressionASTC_LDR = true;
@ -335,7 +335,7 @@ tu_get_features(struct tu_physical_device *pdevice,
features->uniformAndStorageBuffer16BitAccess = false;
features->storagePushConstant16 = false;
features->storageInputOutput16 = false;
features->multiview = pdevice->info->a6xx.has_hw_multiview;
features->multiview = true;
features->multiviewGeometryShader = false;
features->multiviewTessellationShader = false;
features->variablePointersStorageBuffer = true;
@ -871,7 +871,7 @@ tu_get_physical_device_properties_1_1(struct tu_physical_device *pdevice,
p->pointClippingBehavior = VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES;
p->maxMultiviewViewCount =
pdevice->info->a6xx.has_hw_multiview ? MAX_VIEWPORTS : 1;
(pdevice->info->a6xx.has_hw_multiview || TU_DEBUG(NOCONFORM)) ? MAX_VIEWPORTS : 1;
p->maxMultiviewInstanceIndex = INT_MAX;
p->protectedNoFault = false;
/* Our largest descriptors are 2 texture descriptors, or a texture and
@ -1106,7 +1106,8 @@ tu_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice,
.maxDrawIndirectCount = UINT32_MAX,
.maxSamplerLodBias = 4095.0 / 256.0, /* [-16, 15.99609375] */
.maxSamplerAnisotropy = 16,
.maxViewports = pdevice->info->a6xx.has_hw_multiview ? MAX_VIEWPORTS : 1,
.maxViewports =
(pdevice->info->a6xx.has_hw_multiview || TU_DEBUG(NOCONFORM)) ? MAX_VIEWPORTS : 1,
.maxViewportDimensions = { MAX_VIEWPORT_SIZE, MAX_VIEWPORT_SIZE },
.viewportBoundsRange = { INT16_MIN, INT16_MAX },
.viewportSubPixelBits = 8,
@ -1153,7 +1154,9 @@ tu_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice,
};
pProperties->properties = (VkPhysicalDeviceProperties) {
.apiVersion = TU_API_VERSION,
.apiVersion =
(pdevice->info->a6xx.has_hw_multiview || TU_DEBUG(NOCONFORM)) ?
TU_API_VERSION : VK_MAKE_VERSION(1, 0, VK_HEADER_VERSION),
.driverVersion = vk_get_driver_version(),
.vendorID = 0x5143,
.deviceID = pdevice->dev_id.chip_id,

1
src/freedreno/vulkan/tu_util.cc
View file

@ -38,6 +38,7 @@ static const struct debug_control tu_debug_options[] = {
{ "bos", TU_DEBUG_BOS },
{ "3d_load", TU_DEBUG_3D_LOAD },
{ "fdm", TU_DEBUG_FDM },
{ "noconform", TU_DEBUG_NOCONFORM },
{ NULL, 0 }
};

1
src/freedreno/vulkan/tu_util.h
View file

@ -45,6 +45,7 @@ enum tu_debug_flags
TU_DEBUG_BOS = 1 << 21,
TU_DEBUG_3D_LOAD = 1 << 22,
TU_DEBUG_FDM = 1 << 23,
TU_DEBUG_NOCONFORM = 1 << 24,
};
struct tu_env {