[PATCH v3 2/5] wined3d: Prepare sysmem LOCATION_CLEARED handling for non-zero colors (v2).
Stefan Dösinger
wine at gitlab.winehq.org
Wed May 25 09:18:40 CDT 2022
From: Stefan Dösinger <stefan at codeweavers.com>
Signed-off-by: Stefan Dösinger <stefan at codeweavers.com>
---
Version 2: Remove the FIXME from wined3d_resource_memory_colour_fill. If
it accidentally gets called to fill a blocky format with a non-zero
color, wined3d_format_convert_from_float will write a FIXME anyhow.
---
dlls/wined3d/texture.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 99cb7101aed..6b80fed0c1b 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -815,7 +815,6 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture,
{
struct wined3d_bo_address source, destination;
struct wined3d_range range;
- void *map_ptr;
if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location))
return FALSE;
@@ -824,12 +823,21 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture,
range.size = texture->sub_resources[sub_resource_idx].size;
if (current & WINED3D_LOCATION_CLEARED)
{
+ static const struct wined3d_color black;
+ unsigned int level_idx = sub_resource_idx % texture->level_count;
+ struct wined3d_map_desc map;
+ struct wined3d_box box;
+
+ wined3d_texture_get_pitch(texture, level_idx, &map.row_pitch, &map.slice_pitch);
if (destination.buffer_object)
- map_ptr = wined3d_context_map_bo_address(context, &destination, range.size,
+ map.data = wined3d_context_map_bo_address(context, &destination, range.size,
WINED3D_MAP_WRITE | WINED3D_MAP_DISCARD);
else
- map_ptr = destination.addr;
- memset(map_ptr, 0, range.size);
+ map.data = destination.addr;
+
+ wined3d_texture_get_level_box(texture, level_idx, &box);
+ wined3d_resource_memory_colour_fill(&texture->resource, &map, &black, &box, true);
+
if (destination.buffer_object)
wined3d_context_unmap_bo_address(context, &destination, 1, &range);
}
--
GitLab
https://gitlab.winehq.org/wine/wine/-/merge_requests/109
More information about the wine-devel
mailing list