wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-12-15 08:03:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

Removed patch to rename wined3d_resource_(un)map to wined3d_resource_sub_resource_(un)map.

Browse Source 
The patch was initially added for compatibility with the old CSMT patchset.
This commit is contained in:
Sebastian Lackner
2016-04-08 02:55:48 +02:00
parent 16975cdd43
commit 1e7df1a0d8
5 changed files with 6 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/ddraw-IDirect3DTexture2_Load/0001-ddraw-Allow-size-and-format-conversions-in-IDirect3D.patch
View File

@@ -155,7 +155,7 @@ index 6a07cd7..cacf14c 100644
+ return E_FAIL;
+ }
- if (FAILED(hr = wined3d_resource_sub_resource_map(src_resource,
- if (FAILED(hr = wined3d_resource_map(src_resource,
- src_surface->sub_resource_idx, &src_map_desc, NULL, 0)))
- {
- ERR("Failed to lock source surface, hr %#x.\n", hr);
@@ -163,11 +163,11 @@ index 6a07cd7..cacf14c 100644
- return D3DERR_TEXTURE_LOAD_FAILED;
- }
-
- if (FAILED(hr = wined3d_resource_sub_resource_map(dst_resource,
- if (FAILED(hr = wined3d_resource_map(dst_resource,
- dst_surface->sub_resource_idx, &dst_map_desc, NULL, 0)))
- {
- ERR("Failed to lock destination surface, hr %#x.\n", hr);
- wined3d_resource_sub_resource_unmap(src_resource, src_surface->sub_resource_idx);
- wined3d_resource_unmap(src_resource, src_surface->sub_resource_idx);
- wined3d_mutex_unlock();
- return D3DERR_TEXTURE_LOAD_FAILED;
- }
@@ -181,8 +181,8 @@ index 6a07cd7..cacf14c 100644
+ SetRect(&src_rect, 0, 0, src_surface->surface_desc.dwWidth, src_surface->surface_desc.dwHeight);
+ SetRect(&dst_rect, 0, 0, dst_surface->surface_desc.dwWidth, dst_surface->surface_desc.dwHeight);
- wined3d_resource_sub_resource_unmap(dst_resource, dst_surface->sub_resource_idx);
- wined3d_resource_sub_resource_unmap(src_resource, src_surface->sub_resource_idx);
- wined3d_resource_unmap(dst_resource, dst_surface->sub_resource_idx);
- wined3d_resource_unmap(src_resource, src_surface->sub_resource_idx);
+ hr = wined3d_texture_blt(dst_surface->wined3d_texture, dst_surface->sub_resource_idx, &dst_rect,
+ src_surface->wined3d_texture, src_surface->sub_resource_idx, &src_rect,
+ 0, NULL, WINED3D_TEXF_LINEAR);

1
patches/ddraw-IDirect3DTexture2_Load/definition
View File

@@ -1,2 +1 @@
Fixes: Fix scaling behaviour of images and mipmap levels in IDirect3DTexture2_Load (needed for example by Prezzie Hunt)
Depends: wined3d-resource_map