wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
patches/advapi32-Token_Integrity_Level/0004-server-Implement-token-integrity-level.patch
View File

@ -1,4 +1,4 @@
From 7d07ac217db0b5226fed0b7233fdb21ef70b0cc9 Mon Sep 17 00:00:00 2001
From ae503e8e7eb8f4fcb9bf3e642458c2a1bba6ccaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 7 Aug 2017 02:28:35 +0200
Subject: [PATCH] server: Implement token integrity level.
@ -10,19 +10,19 @@ Subject: [PATCH] server: Implement token integrity level.
3 files changed, 48 insertions(+), 12 deletions(-)
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index b1dd999cf5..249b715da3 100644
index ca26ab15..8aab0a48 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -400,7 +400,7 @@ NTSTATUS WINAPI NtQueryInformationToken(
0, /* TokenAccessInformation */
0, /* TokenVirtualizationAllowed */
0, /* TokenVirtualizationEnabled */
sizeof(DWORD), /* TokenVirtualizationEnabled */
- sizeof(TOKEN_MANDATORY_LABEL) + sizeof(SID), /* TokenIntegrityLevel [sizeof(SID) includes one SubAuthority] */
+ 0, /* TokenIntegrityLevel */
0, /* TokenUIAccess */
0, /* TokenMandatoryPolicy */
0, /* TokenLogonSid */
@@ -653,18 +653,23 @@ NTSTATUS WINAPI NtQueryInformationToken(
@@ -659,18 +659,23 @@ NTSTATUS WINAPI NtQueryInformationToken(
}
break;
case TokenIntegrityLevel:
@ -55,7 +55,7 @@ index b1dd999cf5..249b715da3 100644
case TokenAppContainerSid:
{
diff --git a/server/protocol.def b/server/protocol.def
index 93afaabca1..685f69f4e2 100644
index 11221d7d..1bfe3234 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -3405,6 +3405,13 @@ enum caret_state
@ -73,7 +73,7 @@ index 93afaabca1..685f69f4e2 100644
obj_handle_t handle; /* handle to the token */
@REPLY
diff --git a/server/token.c b/server/token.c
index e97c460ae0..fb40c1b551 100644
index ccde0c2d..2d81118a 100644
--- a/server/token.c
+++ b/server/token.c
@@ -113,6 +113,7 @@ struct token
@ -112,7 +112,7 @@ index e97c460ae0..fb40c1b551 100644
if (!token) return token;
/* copy groups */
@@ -891,7 +895,7 @@ struct token *token_create_admin( void )
@@ -890,7 +894,7 @@ struct token *token_create_admin( void )
static const TOKEN_SOURCE admin_source = {"SeMgr", {0, 0}};
token = create_token( TRUE, user_sid, admin_groups, ARRAY_SIZE( admin_groups ),
admin_privs, ARRAY_SIZE( admin_privs ), default_dacl,
@ -121,7 +121,7 @@ index e97c460ae0..fb40c1b551 100644
/* we really need a primary group */
assert( token->primary_group );
}
@@ -1525,6 +1529,26 @@ DECL_HANDLER(get_token_sid)
@@ -1524,6 +1528,26 @@ DECL_HANDLER(get_token_sid)
}
}

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

18
patches/libs-Unicode_Collation/0001-libs-Fix-most-problems-with-CompareString.patch
View File

@ -1,18 +1,18 @@
From 2b81cf8ae5a8be48f3548a3a598800f35ee5615f Mon Sep 17 00:00:00 2001
From e5df77725c34e82d7d796b514118be6fece16386 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dtimoshkov@codeweavers.com>
Date: Mon, 28 Jul 2003 07:39:25 -0500
Subject: [PATCH] libs: Fix most problems with CompareString.
---
dlls/kernel32/tests/locale.c | 9 +++----
libs/wine/collation.c | 60 ++++++++++++++++++++++----------------------
dlls/kernel32/tests/locale.c | 9 +++---
libs/wine/collation.c | 60 ++++++++++++++++++------------------
2 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index b9b36d8a132..95e6ee9ea45 100644
index f5d54e06..2f61e1c9 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -1965,13 +1965,13 @@ static void test_CompareStringA(void)
@@ -1963,13 +1963,13 @@ static void test_CompareStringA(void)
todo_wine ok(ret != CSTR_EQUAL, "\\2 vs \\1 expected unequal\n");
ret = CompareStringA(lcid, NORM_IGNORECASE | LOCALE_USE_CP_ACP, "#", -1, ".", -1);
@ -29,8 +29,8 @@ index b9b36d8a132..95e6ee9ea45 100644
lcid = MAKELCID(MAKELANGID(LANG_POLISH, SUBLANG_DEFAULT), SORT_DEFAULT);
@@ -5702,6 +5702,5 @@ START_TEST(locale)
test_FindNLSStringEx();
@@ -5814,6 +5814,5 @@ START_TEST(locale)
test_FindStringOrdinal();
test_SetThreadUILanguage();
test_NormalizeString();
- /* this requires collation table patch to make it MS compatible */
@ -38,7 +38,7 @@ index b9b36d8a132..95e6ee9ea45 100644
+ test_sorting();
}
diff --git a/libs/wine/collation.c b/libs/wine/collation.c
index 465d740001b..f354a75f686 100644
index 465d7400..f354a75f 100644
--- a/libs/wine/collation.c
+++ b/libs/wine/collation.c
@@ -75,34 +75,34 @@ const unsigned int collation_table[12800] =
@ -168,5 +168,5 @@ index 465d740001b..f354a75f686 100644
0x0a130121, 0x0a140121, 0x02370121, 0x02350121, 0x03a30121, 0x03a40121, 0x03a50121, 0x024e0121,
0x02a10121, 0x0a150161, 0x0a290151, 0x0a3d0161, 0x0a490161, 0x0a650161, 0x0a910161, 0x0a990161,
--
2.16.3
2.19.1

32
patches/ntdll-NtSuspendProcess/0001-ntdll-Implement-NtSuspendProcess-and-NtResumeProcess.patch
View File

@ -1,22 +1,22 @@
From cf25edc841ba3490113f23f8f5b64ba099f84d8e Mon Sep 17 00:00:00 2001
From 34f55cc1771af01e49322148c89710f965d0197d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Tue, 21 Mar 2017 23:12:09 +0100
Subject: ntdll: Implement NtSuspendProcess and NtResumeProcess.
---
dlls/ntdll/process.c | 28 +++++-
dlls/ntdll/process.c | 28 ++++-
dlls/ntdll/tests/Makefile.in | 1 +
dlls/ntdll/tests/process.c | 207 +++++++++++++++++++++++++++++++++++++++++++
server/protocol.def | 12 +++
server/thread.c | 49 ++++++++++
dlls/ntdll/tests/process.c | 207 +++++++++++++++++++++++++++++++++++
server/protocol.def | 12 ++
server/thread.c | 49 +++++++++
5 files changed, 293 insertions(+), 4 deletions(-)
create mode 100644 dlls/ntdll/tests/process.c
diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c
index ffc9bff690..ac1dc0a889 100644
index 623bf653..6cd16a42 100644
--- a/dlls/ntdll/process.c
+++ b/dlls/ntdll/process.c
@@ -737,8 +737,18 @@ NTSTATUS WINAPI NtOpenProcess(PHANDLE handle, ACCESS_MASK access,
@@ -763,8 +763,18 @@ NTSTATUS WINAPI NtOpenProcess(PHANDLE handle, ACCESS_MASK access,
*/
NTSTATUS WINAPI NtResumeProcess( HANDLE handle )
{
@ -37,7 +37,7 @@ index ffc9bff690..ac1dc0a889 100644
}
/******************************************************************************
@@ -747,6 +757,16 @@ NTSTATUS WINAPI NtResumeProcess( HANDLE handle )
@@ -773,8 +783,18 @@ NTSTATUS WINAPI NtResumeProcess( HANDLE handle )
*/
NTSTATUS WINAPI NtSuspendProcess( HANDLE handle )
{
@ -56,8 +56,10 @@ index ffc9bff690..ac1dc0a889 100644
+
+ return status;
}
diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in
index 0de4fe8f20..c5c519150e 100644
index 5c70f3f0..a1b85883 100644
--- a/dlls/ntdll/tests/Makefile.in
+++ b/dlls/ntdll/tests/Makefile.in
@@ -16,6 +16,7 @@ C_SRCS = \
@ -70,7 +72,7 @@ index 0de4fe8f20..c5c519150e 100644
rtlbitmap.c \
diff --git a/dlls/ntdll/tests/process.c b/dlls/ntdll/tests/process.c
new file mode 100644
index 0000000000..41303b7e9a
index 00000000..41303b7e
--- /dev/null
+++ b/dlls/ntdll/tests/process.c
@@ -0,0 +1,207 @@
@ -282,10 +284,10 @@ index 0000000000..41303b7e9a
+ test_NtSuspendProcess(argv[0]);
+}
diff --git a/server/protocol.def b/server/protocol.def
index 04377e16c5..f886d958d8 100644
index 41d8f5a4..2aa76bdc 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -3887,3 +3887,15 @@ struct handle_info
@@ -3864,3 +3864,15 @@ struct handle_info
unsigned int threads; /* number of threads */
unsigned int handles; /* number of handles */
@END
@ -302,10 +304,10 @@ index 04377e16c5..f886d958d8 100644
+ obj_handle_t handle; /* process handle */
+@END
diff --git a/server/thread.c b/server/thread.c
index 108444ebc5..5b9b80d303 100644
index 7162fc33..8bdfe41d 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -1797,3 +1797,52 @@ DECL_HANDLER(get_selector_entry)
@@ -1824,3 +1824,52 @@ DECL_HANDLER(get_selector_entry)
release_object( thread );
}
}
@ -359,5 +361,5 @@ index 108444ebc5..5b9b80d303 100644
+ }
+}
--
2.11.0
2.19.1

14
patches/oleaut32-TKIND_COCLASS/0002-oleaut32-Implement-ITypeInfo_fnInvoke-for-TKIND_COCL.patch
View File

@ -1,4 +1,4 @@
From 8e2413e84cb6fe83b5a095f36372288c265dff97 Mon Sep 17 00:00:00 2001
From 17b8cc4be95844c05061f6a6a218e391a1dcdc5f Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 14 Nov 2015 23:45:18 +0100
Subject: [PATCH 2/4] oleaut32: Implement ITypeInfo_fnInvoke for TKIND_COCLASS
@ -10,23 +10,23 @@ Subject: [PATCH 2/4] oleaut32: Implement ITypeInfo_fnInvoke for TKIND_COCLASS
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c
index 00cb464..6aa68c7 100644
index f2197425..06c5d3a2 100644
--- a/dlls/oleaut32/tests/tmarshal.c
+++ b/dlls/oleaut32/tests/tmarshal.c
@@ -1524,7 +1524,7 @@ static void test_typelibmarshal(void)
@@ -2410,7 +2410,7 @@ static void test_typelibmarshal(void)
dispparams.rgvarg = vararg;
VariantInit(&varresult);
hr = IDispatch_Invoke(pDispatch, DISPID_TM_COCLASS, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL);
- todo_wine ok_ole_success(hr, IDispatch_Invoke);
+ ok_ole_success(hr, IDispatch_Invoke);
todo_wine_if(tmarshal_todo)
ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK,
"EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n",
excepinfo.wCode, excepinfo.scode);
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index ebc5c39..69072d3 100644
index 2af6a946..6e479243 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -6623,6 +6623,21 @@ static HRESULT get_iface_guid(ITypeInfo *tinfo, HREFTYPE href, GUID *guid)
@@ -6625,6 +6625,21 @@ static HRESULT get_iface_guid(ITypeInfo *tinfo, HREFTYPE href, GUID *guid)
*guid = tattr->guid;
break;
@ -49,5 +49,5 @@ index ebc5c39..69072d3 100644
ERR("Unexpected typekind %d\n", tattr->typekind);
hres = E_UNEXPECTED;
--
2.7.4
2.19.1

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "853351698842c92db62bddedd2f531b7c5e745d1"
echo "3d5a2567977455d04e4896368a71db74e7b9074b"
}
# Show version information

16
patches/wined3d-CSMT_Main/0001-wined3d-Add-additional-synchronization-CS-ops.patch
View File

@ -1,4 +1,4 @@
From dcc22d7ebd3f18465b541b72887e430f9a925b2b Mon Sep 17 00:00:00 2001
From 61838c8fd1fd47dbbe71c74946b652aa441b7e91 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 19 Feb 2017 00:57:12 +0100
Subject: [PATCH] wined3d: Add additional synchronization CS ops.
@ -8,10 +8,10 @@ Subject: [PATCH] wined3d: Add additional synchronization CS ops.
1 file changed, 6 insertions(+)
diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index 1eebce6..ad649ec 100644
index 59a30ead..f4327373 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -750,6 +750,8 @@ static void wined3d_shader_resource_view_cs_init(void *object)
@@ -775,6 +775,8 @@ static void wined3d_shader_resource_view_cs_init(void *object)
debug_d3dformat(resource->format->id), debug_d3dformat(view_format->id));
}
}
@ -20,7 +20,7 @@ index 1eebce6..ad649ec 100644
}
static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_view *view,
@@ -766,6 +768,7 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_
@@ -791,6 +793,7 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_
wined3d_resource_incref(view->resource = resource);
@ -28,8 +28,8 @@ index 1eebce6..ad649ec 100644
wined3d_cs_init_object(resource->device->cs, wined3d_shader_resource_view_cs_init, view);
return WINED3D_OK;
@@ -1118,6 +1121,8 @@ static void wined3d_unordered_access_view_cs_init(void *object)
desc, texture, view->format);
@@ -1145,6 +1148,8 @@ static void wined3d_unordered_access_view_cs_init(void *object)
desc, texture_gl, view->format);
}
}
+
@ -37,7 +37,7 @@ index 1eebce6..ad649ec 100644
}
static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_access_view *view,
@@ -1134,6 +1139,7 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces
@@ -1161,6 +1166,7 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces
wined3d_resource_incref(view->resource = resource);
@ -46,5 +46,5 @@ index 1eebce6..ad649ec 100644
return WINED3D_OK;
--
2.7.4
2.19.1

17
patches/wined3d-mesa_texture_download/0001-wined3d-Use-glReadPixels-for-RT-texture-download.patch
View File

@ -1,9 +1,7 @@
From 4b7be2feda4db75f80580e64d9220e461e641d36 Mon Sep 17 00:00:00 2001
From: Andrew Wesie <awesie@gmail.com>
Subject: [PATCH 4/4] wined3d: Use glReadPixels for RT texture download.
Message-Id: <1538326920-5825-4-git-send-email-awesie@gmail.com>
Date: Sun, 30 Sep 2018 12:02:00 -0500
In-Reply-To: <1538326920-5825-1-git-send-email-awesie@gmail.com>
References: <1538326920-5825-1-git-send-email-awesie@gmail.com>
Subject: [PATCH] wined3d: Use glReadPixels for RT texture download.
Signed-off-by: Andrew Wesie <awesie@gmail.com>
---
@ -11,10 +9,10 @@ Signed-off-by: Andrew Wesie <awesie@gmail.com>
1 file changed, 19 insertions(+)
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 78e9364..3efd675 100644
index 87998d55..f4ff0027 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -2371,11 +2371,13 @@ void wined3d_texture_download_data(struct wined3d_texture *texture, unsigned int
@@ -2394,11 +2394,13 @@ void wined3d_texture_download_data(struct wined3d_texture *texture, unsigned int
{
const struct wined3d_gl_info *gl_info = context->gl_info;
const struct wined3d_format_gl *format_gl;
@ -23,12 +21,12 @@ index 78e9364..3efd675 100644
GLenum target;
format_gl = wined3d_format_gl(texture->resource.format);
target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx);
target = wined3d_texture_gl_get_sub_resource_target(wined3d_texture_gl(texture), sub_resource_idx);
+ sub_resource = &texture->sub_resources[sub_resource_idx];
level = sub_resource_idx % texture->level_count;
if (texture->resource.type == WINED3D_RTYPE_TEXTURE_2D
@@ -2409,6 +2411,23 @@ void wined3d_texture_download_data(struct wined3d_texture *texture, unsigned int
@@ -2432,6 +2434,23 @@ void wined3d_texture_download_data(struct wined3d_texture *texture, unsigned int
GL_EXTCALL(glGetCompressedTexImage(target, level, data->addr));
checkGLcall("glGetCompressedTexImage");
}
@ -52,7 +50,6 @@ index 78e9364..3efd675 100644
else
{
TRACE("Downloading texture %p, %u, level %u, format %#x, type %#x, data %p.\n",
--
2.7.4
2.19.1