system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-22 11:13:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ddraw: Use wined3d_bit_scan() in compute_sphere_visibility().

Browse source 
Rémi Bernon reports an unspecified issue with gcc 11 related to
compute_sphere_visibility() expecting 12 input planes, but
d3d_device3_ComputeSphereVisibility() only providing 6. The actual number of
planes required depends on the "enabled_planes" mask. This patch should make
the code better reflect that, but I do not have a gcc 11 setup to verify it
resolves the issue there.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2021-11-10 11:36:08 +01:00 committed by Alexandre Julliard
parent f43b312562
commit 996cfb841e
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
dlls/ddraw/device.c
View file

@ -4638,17 +4638,20 @@ static void prepare_clip_space_planes(struct d3d_device *device, struct wined3d_
plane[5].w = m._44 - m._43;
}
static void compute_sphere_visibility(struct wined3d_vec4 plane[12], DWORD enabled_planes, BOOL equality,
D3DVECTOR *centers, D3DVALUE *radii, DWORD sphere_count, DWORD *return_values)
static void compute_sphere_visibility(const struct wined3d_vec4 *planes, DWORD enabled_planes, BOOL equality,
const D3DVECTOR *centres, const D3DVALUE *radii, unsigned int sphere_count, DWORD *return_values)
{
UINT i, j;
unsigned int mask, i, j;
memset(return_values, 0, sphere_count * sizeof(*return_values));
for (i = 0; i < sphere_count; ++i)
{
return_values[i] = 0;
for (j = 0; j < 12; ++j)
if (enabled_planes & 1u << j)
return_values[i] |= in_plane(j, plane[j], centers[i], radii[i], equality);
mask = enabled_planes;
while (mask)
{
j = wined3d_bit_scan(&mask);
return_values[i] |= in_plane(j, planes[j], centres[i], radii[i], equality);
}
}
}