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 3d5a2567977455d04e4896368a71db74e7b9074b.

Browse Source
This commit is contained in:
Zebediah Figura
2018-10-31 00:06:39 -05:00
parent b874b3656e
commit 6fc555874b
8 changed files with 71 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From ecc77dff2c2d1bebf3cc546389cedc60569c0f1d Mon Sep 17 00:00:00 2001
From 837daae12d4c7fd40a35511d8d45299b46e91b38 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,7 +13,7 @@ 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 58e5685..784860e 100644
index 4c90d820..8065839d 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -1306,6 +1306,24 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc
@@ -31,8 +31,8 @@ index 58e5685..784860e 100644
+ return E_INVALIDARG;
+ }
+
+ info->row_pitch = buffer->desc.byte_width;
+ info->slice_pitch = buffer->desc.byte_width;
+ info->row_pitch = resource->size;
+ info->slice_pitch = resource->size;
+ info->size = buffer->resource.size;
+
+ return WINED3D_OK;
@@ -50,10 +50,10 @@ index 58e5685..784860e 100644
};
diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
index 9df0a09..909dd3a 100644
index a1b2cbd2..dd4ca20c 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
@@ -361,6 +361,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 9df0a09..909dd3a 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 42bae13..80cbe01 100644
index 87998d55..45ee3d3d 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -2696,6 +2696,36 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour
@@ -2698,6 +2698,36 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour
return WINED3D_OK;
}
@@ -109,7 +109,7 @@ index 42bae13..80cbe01 100644
static HRESULT texture_resource_sub_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx)
{
struct wined3d_texture_sub_resource *sub_resource;
@@ -2747,6 +2777,7 @@ static const struct wined3d_resource_ops texture_resource_ops =
@@ -2749,6 +2779,7 @@ static const struct wined3d_resource_ops texture_resource_ops =
texture_resource_preload,
wined3d_texture_gl_unload,
texture_resource_sub_resource_map,
@@ -118,7 +118,7 @@ index 42bae13..80cbe01 100644
};
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index ee70221..f494456 100644
index ee702211..f4944564 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -220,6 +220,7 @@
@@ -130,10 +130,10 @@ index ee70221..f494456 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 e4cd7d3..1938ccd 100644
index 9a01ed29..9f8f784e 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3094,6 +3094,8 @@ struct wined3d_resource_ops
@@ -3096,6 +3096,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,7 +143,7 @@ index e4cd7d3..1938ccd 100644
};
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index dc491d3..8e0cf66 100644
index dc491d3b..8e0cf665 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -1835,6 +1835,13 @@ struct wined3d_map_desc
@@ -170,5 +170,5 @@ index dc491d3..8e0cf66 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