NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dzn: Remove driconf for quad ops in vertex stages

Browse source 
These actually work now.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22606>
This commit is contained in:
Jesse Natalie 2023-04-20 07:41:25 -07:00 • committed by Marge Bot
parent fe128dca28
commit 1e11645a30
3 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/microsoft/vulkan/dzn_device.c
View file

@ -1149,9 +1149,6 @@ static const driOptionDescription dzn_dri_options[] = {
DRI_CONF_SECTION_DEBUG
DRI_CONF_DZN_CLAIM_WIDE_LINES(false)
DRI_CONF_DZN_ENABLE_8BIT_LOADS_STORES(false)
/* Default-disabled because the CTS doesn't check subgroupQuadOperationsInAllStages
* and tries to do quad ops in VS/GS which is unsupported. */
DRI_CONF_DZN_ENABLE_SUBGROUP_OPS_IN_VTX_PIPELINE(false)
DRI_CONF_SECTION_END
};
@ -1602,7 +1599,6 @@ dzn_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice,
VkPhysicalDeviceProperties2 *pProperties)
{
VK_FROM_HANDLE(dzn_physical_device, pdevice, physicalDevice);
struct dzn_instance *instance = container_of(pdevice->vk.instance, struct dzn_instance, vk);
(void)dzn_physical_device_get_d3d12_dev(pdevice);
@ -1795,9 +1791,8 @@ dzn_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice,
VK_SUBGROUP_FEATURE_QUAD_BIT |
VK_SUBGROUP_FEATURE_ARITHMETIC_BIT,
.subgroupSupportedStages = VK_SHADER_STAGE_FRAGMENT_BIT | VK_SHADER_STAGE_COMPUTE_BIT |
(driQueryOptionb(&instance->dri_options, "dzn_enable_subgroup_ops_in_vtx_pipeline") ?
(VK_SHADER_STAGE_GEOMETRY_BIT | VK_SHADER_STAGE_VERTEX_BIT) : 0),
.subgroupQuadOperationsInAllStages = false,
VK_SHADER_STAGE_GEOMETRY_BIT | VK_SHADER_STAGE_VERTEX_BIT,
.subgroupQuadOperationsInAllStages = true,
.subgroupSize = pdevice->options1.WaveOps ? pdevice->options1.WaveLaneCountMin : 1,
};
memcpy(core_1_1.driverUUID, pdevice->driver_uuid, VK_UUID_SIZE);

1
src/util/00-mesa-defaults.conf
View file

@ -1043,7 +1043,6 @@ TODO: document the other workarounds.
<device driver="dzn">
<application name="DOOMEternal" executable="DOOMEternalx64vk.exe">
<option name="dzn_enable_8bit_loads_stores" value="true" />
<option name="dzn_enable_subgroup_ops_in_vtx_pipeline" value="true" />
<option name="dzn_claim_wide_lines" value="true" />
</application>
<application name="No Man's Sky" executable="NMS.exe">

3
src/util/driconf.h
View file

@ -672,7 +672,4 @@
#define DRI_CONF_DZN_ENABLE_8BIT_LOADS_STORES(def) \
DRI_CONF_OPT_B(dzn_enable_8bit_loads_stores, def, "Enable VK_KHR_8bit_loads_stores")
#define DRI_CONF_DZN_ENABLE_SUBGROUP_OPS_IN_VTX_PIPELINE(def) \
DRI_CONF_OPT_B(dzn_enable_subgroup_ops_in_vtx_pipeline, def, "Enable subgroup ops in pre-rasterizer stages (VS/GS)")
#endif