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 d279bc24934fd1b68324017ae1b9e70975640a0a

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-10-27 16:22:42 +11:00
parent eb630f686f
commit 4f57895f06
6 changed files with 61 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
patches/d3d11-Deferred_Context/0002-wined3d-Add-wined3d_resource_map_info-function.patch
View File

@@ -1,4 +1,4 @@
From 3755d929ed2c1ceb101bf0741e78888624fbcf44 Mon Sep 17 00:00:00 2001
From 636fa0f406701e9af68f4274f07da1489a7b0c72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 19 Jan 2017 16:54:42 +0100
Subject: [PATCH] wined3d: Add wined3d_resource_map_info function.
@@ -13,11 +13,11 @@ Subject: [PATCH] wined3d: Add wined3d_resource_map_info function.
6 files changed, 70 insertions(+)
diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
index 3f4552f..2350661 100644
index 17bcb70bc3..1777638751 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -1275,6 +1275,24 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc
return wined3d_buffer_map(buffer, offset, size, (BYTE **)&map_desc->data, flags);
@@ -1304,6 +1304,24 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc
return wined3d_buffer_gl_map(buffer_gl, offset, size, (BYTE **)&map_desc->data, flags);
}
+static HRESULT buffer_resource_sub_resource_map_info(struct wined3d_resource *resource, unsigned int sub_resource_idx,
@@ -41,7 +41,7 @@ index 3f4552f..2350661 100644
static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx)
{
if (sub_resource_idx)
@@ -1294,6 +1312,7 @@ static const struct wined3d_resource_ops buffer_resource_ops =
@@ -1323,6 +1341,7 @@ static const struct wined3d_resource_ops buffer_resource_ops =
buffer_resource_preload,
buffer_unload,
buffer_resource_sub_resource_map,
@@ -50,10 +50,10 @@ index 3f4552f..2350661 100644
};
diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
index b5dcdf0..28581a1 100644
index 9df0a0923b..909dd3ae4b 100644
--- a/dlls/wined3d/resource.c
+++ b/dlls/wined3d/resource.c
@@ -358,6 +358,14 @@ HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned i
@@ -360,6 +360,14 @@ HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned i
return wined3d_cs_map(resource->device->cs, resource, sub_resource_idx, map_desc, box, flags);
}
@@ -69,10 +69,10 @@ index b5dcdf0..28581a1 100644
{
TRACE("resource %p, sub_resource_idx %u.\n", resource, sub_resource_idx);
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index dadcd03..ed63158 100644
index a3d834e8f5..2d62e697f5 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -2345,6 +2345,36 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour
@@ -2683,6 +2683,36 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour
return WINED3D_OK;
}
@@ -109,7 +109,7 @@ index dadcd03..ed63158 100644
static HRESULT texture_resource_sub_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx)
{
struct wined3d_texture_sub_resource *sub_resource;
@@ -2396,6 +2426,7 @@ static const struct wined3d_resource_ops texture_resource_ops =
@@ -2734,6 +2764,7 @@ static const struct wined3d_resource_ops texture_resource_ops =
texture_resource_preload,
wined3d_texture_unload,
texture_resource_sub_resource_map,
@@ -118,10 +118,10 @@ index dadcd03..ed63158 100644
};
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index bf29e20..58dc0a9 100644
index ee70221191..f494456451 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -229,6 +229,7 @@
@@ -220,6 +220,7 @@
@ cdecl wined3d_resource_get_parent(ptr)
@ cdecl wined3d_resource_get_priority(ptr)
@ cdecl wined3d_resource_map(ptr long ptr ptr long)
@@ -130,10 +130,10 @@ index bf29e20..58dc0a9 100644
@ cdecl wined3d_resource_set_parent(ptr ptr)
@ cdecl wined3d_resource_set_priority(ptr long)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index b297799..ed08c4b 100644
index 2b52218972..e0ec463805 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3030,6 +3030,8 @@ struct wined3d_resource_ops
@@ -3094,6 +3094,8 @@ struct wined3d_resource_ops
void (*resource_unload)(struct wined3d_resource *resource);
HRESULT (*resource_sub_resource_map)(struct wined3d_resource *resource, unsigned int sub_resource_idx,
struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags);
@@ -143,10 +143,10 @@ index b297799..ed08c4b 100644
};
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 15e14e5..fa929e5 100644
index dc491d3b98..8e0cf66509 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -1806,6 +1806,13 @@ struct wined3d_map_desc
@@ -1835,6 +1835,13 @@ struct wined3d_map_desc
void *data;
};
@@ -160,7 +160,7 @@ index 15e14e5..fa929e5 100644
struct wined3d_sub_resource_data
{
const void *data;
@@ -2584,6 +2591,8 @@ void * __cdecl wined3d_resource_get_parent(const struct wined3d_resource *resour
@@ -2606,6 +2613,8 @@ void * __cdecl wined3d_resource_get_parent(const struct wined3d_resource *resour
DWORD __cdecl wined3d_resource_get_priority(const struct wined3d_resource *resource);
HRESULT __cdecl wined3d_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx,
struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags);
@@ -170,5 +170,5 @@ index 15e14e5..fa929e5 100644
void __cdecl wined3d_resource_set_parent(struct wined3d_resource *resource, void *parent);
DWORD __cdecl wined3d_resource_set_priority(struct wined3d_resource *resource, DWORD priority);
--
1.9.1
2.19.1