Paul Gofman : ddraw: Request read only texture access for read only maps.
Alexandre Julliard
julliard at winehq.org
Fri Mar 26 16:03:32 CDT 2021
Module: wine
Branch: master
Commit: 944014afb46b78a3adee7fbb694cb85289c16e30
URL: https://source.winehq.org/git/wine.git/?a=commit;h=944014afb46b78a3adee7fbb694cb85289c16e30
Author: Paul Gofman <pgofman at codeweavers.com>
Date: Fri Mar 26 13:56:22 2021 +0300
ddraw: Request read only texture access for read only maps.
Signed-off-by: Paul Gofman <pgofman at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ddraw/surface.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 19a1ae3d2d2..08e3811436d 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -1027,6 +1027,7 @@ static HRESULT surface_lock(struct ddraw_surface *surface,
DWORD flags, HANDLE h)
{
struct wined3d_map_desc map_desc;
+ unsigned int wined3d_flags;
struct wined3d_box box;
HRESULT hr = DD_OK;
@@ -1061,9 +1062,12 @@ static HRESULT surface_lock(struct ddraw_surface *surface,
if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)
hr = ddraw_surface_update_frontbuffer(surface, rect, TRUE, 0);
if (SUCCEEDED(hr))
+ {
+ wined3d_flags = wined3dmapflags_from_ddrawmapflags(flags);
hr = wined3d_resource_map(wined3d_texture_get_resource
- (ddraw_surface_get_default_texture(surface, DDRAW_SURFACE_RW)), surface->sub_resource_idx,
- &map_desc, rect ? &box : NULL, wined3dmapflags_from_ddrawmapflags(flags));
+ (ddraw_surface_get_default_texture(surface, wined3d_flags & WINED3D_MAP_WRITE ? DDRAW_SURFACE_RW
+ : DDRAW_SURFACE_READ)), surface->sub_resource_idx, &map_desc, rect ? &box : NULL, wined3d_flags);
+ }
if (FAILED(hr))
{
wined3d_mutex_unlock();
More information about the wine-cvs
mailing list