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

radv: Override the uniform buffer offset alignment for World War Z.

Browse source 
Game does the equivalent of a

ALIGN(..., minUniformBufferOffsetAlignment >> 4)

which breaks when said alignment is <16 with a SIGFPE.

CC: <mesa-stable@lists.freedesktop.org>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6120>
(cherry picked from commit 0067f89920)
This commit is contained in:
Bas Nieuwenhuizen 2020-07-30 02:49:33 +02:00 • committed by Eric Engestrom
parent 1cccae506c
commit f2673b2287
4 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -724,7 +724,7 @@
"description": "radv: Override the uniform buffer offset alignment for World War Z.",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": null
},

18
src/amd/vulkan/radv_device.c
View file

@ -582,6 +582,7 @@ DRI_CONF_BEGIN
DRI_CONF_VK_X11_STRICT_IMAGE_COUNT("false")
DRI_CONF_VK_X11_ENSURE_MIN_IMAGE_COUNT("false")
DRI_CONF_RADV_NO_DYNAMIC_BOUNDS("false")
DRI_CONF_RADV_OVERRIDE_UNIFORM_OFFSET_ALIGNMENT(0)
DRI_CONF_SECTION_END
DRI_CONF_SECTION_DEBUG
@ -1318,6 +1319,21 @@ radv_max_descriptor_set_size()
64 /* storage image */);
}
static uint32_t
radv_uniform_buffer_offset_alignment(const struct radv_physical_device *pdevice)
{
uint32_t uniform_offset_alignment = driQueryOptioni(&pdevice->instance->dri_options,
"radv_override_uniform_offset_alignment");
if (!util_is_power_of_two_or_zero(uniform_offset_alignment)) {
fprintf(stderr, "ERROR: invalid radv_override_uniform_offset_alignment setting %d:"
"not a power of two\n", uniform_offset_alignment);
uniform_offset_alignment = 0;
}
/* Take at least the hardware limit. */
return MAX2(uniform_offset_alignment, 4);
}
void radv_GetPhysicalDeviceProperties(
VkPhysicalDevice physicalDevice,
VkPhysicalDeviceProperties* pProperties)
@ -1400,7 +1416,7 @@ void radv_GetPhysicalDeviceProperties(
.viewportSubPixelBits = 8,
.minMemoryMapAlignment = 4096, /* A page */
.minTexelBufferOffsetAlignment = 4,
.minUniformBufferOffsetAlignment = 4,
.minUniformBufferOffsetAlignment = radv_uniform_buffer_offset_alignment(pdevice),
.minStorageBufferOffsetAlignment = 4,
.minTexelOffset = -32,
.maxTexelOffset = 31,

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

@ -687,5 +687,9 @@ TODO: document the other workarounds.
<application name="Path of Exile (32-bit)" executable="PathOfExile.exe">
<option name="radv_no_dynamic_bounds" value="true" />
</application>
<application name="World War Z" application_name_match="WWZ">
<option name="radv_override_uniform_offset_alignment" value="16" />
</application>
</device>
</driconf>

5
src/util/xmlpool/t_options.h
View file

@ -435,3 +435,8 @@ DRI_CONF_OPT_END
DRI_CONF_OPT_BEGIN_B(radv_no_dynamic_bounds, def) \
DRI_CONF_DESC(en,gettext("Disabling bounds checking for dynamic buffer descriptors")) \
DRI_CONF_OPT_END
#define DRI_CONF_RADV_OVERRIDE_UNIFORM_OFFSET_ALIGNMENT(def) \
DRI_CONF_OPT_BEGIN_V(radv_override_uniform_offset_alignment, int, def, "0:128") \
DRI_CONF_DESC(en, gettext("Override the minUniformBufferOffsetAlignment exposed to the application. (0 = default)")) \
DRI_CONF_OPT_END