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 853351698842c92db62bddedd2f531b7c5e745d1

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-10-30 11:18:13 +11:00
parent 5a85ab07af
commit b874b3656e
4 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 636fa0f406701e9af68f4274f07da1489a7b0c72 Mon Sep 17 00:00:00 2001
From ecc77dff2c2d1bebf3cc546389cedc60569c0f1d 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,10 +13,10 @@ 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 17bcb70bc3..1777638751 100644
index 58e5685..784860e 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -1304,6 +1304,24 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc
@@ -1306,6 +1306,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);
}
@@ -41,7 +41,7 @@ index 17bcb70bc3..1777638751 100644
static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx)
{
if (sub_resource_idx)
@@ -1323,6 +1341,7 @@ static const struct wined3d_resource_ops buffer_resource_ops =
@@ -1325,6 +1343,7 @@ static const struct wined3d_resource_ops buffer_resource_ops =
buffer_resource_preload,
buffer_unload,
buffer_resource_sub_resource_map,
@@ -50,7 +50,7 @@ index 17bcb70bc3..1777638751 100644
};
diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
index 9df0a0923b..909dd3ae4b 100644
index 9df0a09..909dd3a 100644
--- a/dlls/wined3d/resource.c
+++ b/dlls/wined3d/resource.c
@@ -360,6 +360,14 @@ HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned i
@@ -69,10 +69,10 @@ index 9df0a0923b..909dd3ae4b 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 a3d834e8f5..2d62e697f5 100644
index 42bae13..80cbe01 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -2683,6 +2683,36 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour
@@ -2696,6 +2696,36 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour
return WINED3D_OK;
}
@@ -109,16 +109,16 @@ index a3d834e8f5..2d62e697f5 100644
static HRESULT texture_resource_sub_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx)
{
struct wined3d_texture_sub_resource *sub_resource;
@@ -2734,6 +2764,7 @@ static const struct wined3d_resource_ops texture_resource_ops =
@@ -2747,6 +2777,7 @@ static const struct wined3d_resource_ops texture_resource_ops =
texture_resource_preload,
wined3d_texture_unload,
wined3d_texture_gl_unload,
texture_resource_sub_resource_map,
+ texture_resource_sub_resource_map_info,
texture_resource_sub_resource_unmap,
};
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index ee70221191..f494456451 100644
index ee70221..f494456 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -220,6 +220,7 @@
@@ -130,7 +130,7 @@ index ee70221191..f494456451 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 2b52218972..e0ec463805 100644
index e4cd7d3..1938ccd 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3094,6 +3094,8 @@ struct wined3d_resource_ops
@@ -143,7 +143,7 @@ index 2b52218972..e0ec463805 100644
};
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index dc491d3b98..8e0cf66509 100644
index dc491d3..8e0cf66 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -1835,6 +1835,13 @@ struct wined3d_map_desc
@@ -170,5 +170,5 @@ index dc491d3b98..8e0cf66509 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);
--
2.19.1
1.9.1