Module: wine Branch: master Commit: d6204ccd54fd2cb6404d86ce5d89ed92c856db0a URL: https://gitlab.winehq.org/wine/wine/-/commit/d6204ccd54fd2cb6404d86ce5d89ed9... Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 3 20:49:04 2024 -0600 ddraw: Use the sysmem wined3d texture for sysmem surfaces if possible. --- dlls/ddraw/ddraw_private.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index f40188f75ef..6fc93b91860 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -698,7 +698,8 @@ static inline struct wined3d_texture *ddraw_surface_get_draw_texture(struct ddra static inline struct wined3d_texture *ddraw_surface_get_any_texture(struct ddraw_surface *surface, unsigned int flags) { - if (surface->texture_location & DDRAW_SURFACE_LOCATION_DEFAULT) + if ((surface->texture_location & DDRAW_SURFACE_LOCATION_DEFAULT) + || (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY)) return ddraw_surface_get_default_texture(surface, flags); assert(surface->texture_location & DDRAW_SURFACE_LOCATION_DRAW);