niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

wined3d: Correctly handle 3D textures in wined3d_view_{load, invalidate}_location().

Browse source 
The sub-resource index should not be offset by the layer index, which represents
a depth offset.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53027
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 7c529506af)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
Zebediah Figura 2022-05-23 17:37:43 -05:00 • committed by Alexandre Julliard
parent 0d24c0f5ab
commit cdd2d5716e
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
dlls/wined3d/view.c
View file

@ -317,7 +317,7 @@ static void create_buffer_view(struct wined3d_gl_view *view, struct wined3d_cont
static void wined3d_view_invalidate_location(struct wined3d_resource *resource,
const struct wined3d_view_desc *desc, DWORD location)
{
unsigned int i, sub_resource_idx, layer_count;
unsigned int i, sub_resource_idx;
struct wined3d_texture *texture;
if (resource->type == WINED3D_RTYPE_BUFFER)
@ -327,17 +327,21 @@ static void wined3d_view_invalidate_location(struct wined3d_resource *resource,
}
texture = texture_from_resource(resource);
if (resource->type == WINED3D_RTYPE_TEXTURE_3D)
{
wined3d_texture_invalidate_location(texture, desc->u.texture.level_idx, location);
return;
}
sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx;
layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? desc->u.texture.layer_count : 1;
for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count)
for (i = 0; i < desc->u.texture.layer_count; ++i, sub_resource_idx += texture->level_count)
wined3d_texture_invalidate_location(texture, sub_resource_idx, location);
}
static void wined3d_view_load_location(struct wined3d_resource *resource,
const struct wined3d_view_desc *desc, struct wined3d_context *context, DWORD location)
{
unsigned int i, sub_resource_idx, layer_count;
unsigned int i, sub_resource_idx;
struct wined3d_texture *texture;
if (resource->type == WINED3D_RTYPE_BUFFER)
@ -347,9 +351,14 @@ static void wined3d_view_load_location(struct wined3d_resource *resource,
}
texture = texture_from_resource(resource);
if (resource->type == WINED3D_RTYPE_TEXTURE_3D)
{
wined3d_texture_load_location(texture, desc->u.texture.level_idx, context, location);
return;
}
sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx;
layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? desc->u.texture.layer_count : 1;
for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count)
for (i = 0; i < desc->u.texture.layer_count; ++i, sub_resource_idx += texture->level_count)
wined3d_texture_load_location(texture, sub_resource_idx, context, location);
}