wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 6037179f6b48a9becdc9e8328ee3b4cc45a8f8eb.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-02-05 16:45:33 +01:00
parent e369069feb
commit 5d71a4eff3
6 changed files with 346 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/wined3d-resource_map/0001-wined3d-Rename-wined3d_resource_-un-map-to-wined3d_r.patch
View File

@@ -1,4 +1,4 @@
From 450ad7808200772e20a81e538628a86b304a5fd8 Mon Sep 17 00:00:00 2001
From 8a4931be2728787f751461a2482c33ff722808ee Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 4 Nov 2015 19:31:30 +0100
Subject: wined3d: Rename wined3d_resource_(un)map to
@@ -169,7 +169,7 @@ index 52502bf..a81b6c7 100644
return hr;
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 71b424d..8fa19e2 100644
index 923a935..409fa32 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -984,7 +984,7 @@ static HRESULT surface_lock(struct ddraw_surface *surface,
@@ -247,7 +247,7 @@ index 73250ec..c1079ba 100644
TRACE("resource %p, sub_resource_idx %u.\n", resource, sub_resource_idx);
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 6f930ef..33ce73d 100644
index aa468d1..9d451a1 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -182,10 +182,10 @@
@@ -262,9 +262,9 @@ index 6f930ef..33ce73d 100644
+@ cdecl wined3d_resource_sub_resource_unmap(ptr long)
@ cdecl wined3d_rendertarget_view_create(ptr ptr ptr ptr ptr)
@ cdecl wined3d_rendertarget_view_create_from_surface(ptr ptr ptr ptr)
@ cdecl wined3d_rendertarget_view_create_from_sub_resource(ptr long ptr ptr ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index f29f4ff..e56ee35 100644
index 507d63f..50d3213 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2421,11 +2421,11 @@ void __cdecl wined3d_resource_get_desc(const struct wined3d_resource *resource,