You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-04-13 14:42:51 -07:00
Compare commits
54 Commits
v2.10-back
...
v2.12
Author | SHA1 | Date | |
---|---|---|---|
|
3ebda6fa93 | ||
|
8d2edd8de8 | ||
|
e3b7fd770e | ||
|
e2a70628df | ||
|
a5daeb1e36 | ||
|
eed8160b22 | ||
|
996d9ab307 | ||
|
325f3758f8 | ||
|
ad2d0fdc3a | ||
|
5e62fbb2d0 | ||
|
0211a4935e | ||
|
a59a69804a | ||
|
55b5c61703 | ||
|
8b3a73a4df | ||
|
f9ad524910 | ||
|
68d0ea3a19 | ||
|
00969f9cd8 | ||
|
de4694c81b | ||
|
b888a45d12 | ||
|
46514b9952 | ||
|
de09d74c97 | ||
|
aa00b4044e | ||
|
9aabd07862 | ||
|
3dad3ddae9 | ||
|
8fb3cd2056 | ||
|
d78dc772d6 | ||
|
0e64c29e85 | ||
|
ff7e264839 | ||
|
8f35a7629b | ||
|
735a9982cc | ||
|
1b5a0095b8 | ||
|
12a893e94f | ||
|
dab61e7333 | ||
|
b1cb4553ec | ||
|
4d290efd99 | ||
|
c0c29e5a88 | ||
|
e179ddf842 | ||
|
83a65ef99b | ||
|
0a16521c7e | ||
|
866e79688c | ||
|
dbe0e706a4 | ||
|
907dc4eae6 | ||
|
e24fc5fec1 | ||
|
8ebf6f58e5 | ||
|
f254a73e66 | ||
|
463f2b02c9 | ||
|
e9daff5bc8 | ||
|
be0d43d2b1 | ||
|
2420bc89ed | ||
|
ecdf44fe29 | ||
|
e2b993408e | ||
|
4a13b7eac7 | ||
|
3a7c5ae711 | ||
|
3fab2fbed2 |
@@ -1,37 +0,0 @@
|
||||
From 9d0f651d9cb5c3ae68810e37dd6030373c7aeab6 Mon Sep 17 00:00:00 2001
|
||||
From: Nils Kuhnhenn <kuhnhenn.nils@gmail.com>
|
||||
Date: Wed, 24 Aug 2016 19:56:00 +0200
|
||||
Subject: oleaut32: Use variable with the correct type in LIST_FOR_EACH_ENTRY_SAFE macro.
|
||||
|
||||
---
|
||||
dlls/oleaut32/typelib.c | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
|
||||
index b9318fba423..5a6dad496ed 100644
|
||||
--- a/dlls/oleaut32/typelib.c
|
||||
+++ b/dlls/oleaut32/typelib.c
|
||||
@@ -4830,10 +4830,9 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface)
|
||||
if (!ref)
|
||||
{
|
||||
TLBImpLib *pImpLib, *pImpLibNext;
|
||||
- TLBRefType *ref_type;
|
||||
+ TLBRefType *ref_type, *ref_type_next;
|
||||
TLBString *tlbstr, *tlbstr_next;
|
||||
TLBGuid *tlbguid, *tlbguid_next;
|
||||
- void *cursor2;
|
||||
int i;
|
||||
|
||||
/* remove cache entry */
|
||||
@@ -4883,7 +4882,7 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface)
|
||||
heap_free(pImpLib);
|
||||
}
|
||||
|
||||
- LIST_FOR_EACH_ENTRY_SAFE(ref_type, cursor2, &This->ref_list, TLBRefType, entry)
|
||||
+ LIST_FOR_EACH_ENTRY_SAFE(ref_type, ref_type_next, &This->ref_list, TLBRefType, entry)
|
||||
{
|
||||
list_remove(&ref_type->entry);
|
||||
heap_free(ref_type);
|
||||
--
|
||||
2.13.1
|
||||
|
@@ -1,24 +0,0 @@
|
||||
From 380543910f8912374a13b9773738e018bd638341 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sun, 11 Jun 2017 02:42:47 +0200
|
||||
Subject: gdiplus: Initialize containers list in GdipCloneImage.
|
||||
|
||||
---
|
||||
dlls/gdiplus/image.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
|
||||
index ce2194317ff..b28606e916c 100644
|
||||
--- a/dlls/gdiplus/image.c
|
||||
+++ b/dlls/gdiplus/image.c
|
||||
@@ -1339,6 +1339,7 @@ GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage)
|
||||
result->unit = metafile->unit;
|
||||
result->metafile_type = metafile->metafile_type;
|
||||
result->hemf = CopyEnhMetaFileW(metafile->hemf, NULL);
|
||||
+ list_init(&result->containers);
|
||||
|
||||
if (!result->hemf)
|
||||
{
|
||||
--
|
||||
2.13.1
|
||||
|
@@ -0,0 +1,25 @@
|
||||
From 814a4e7a4cad942e284a4828927dd0b67938af33 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sun, 2 Jul 2017 22:32:45 +0200
|
||||
Subject: wsdapi: Avoid implicit cast of interface pointer.
|
||||
|
||||
---
|
||||
dlls/wsdapi/msgparams.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/wsdapi/msgparams.c b/dlls/wsdapi/msgparams.c
|
||||
index a7a2f0a73b3..47a77138709 100644
|
||||
--- a/dlls/wsdapi/msgparams.c
|
||||
+++ b/dlls/wsdapi/msgparams.c
|
||||
@@ -45,7 +45,7 @@ static inline IWSDMessageParametersImpl *impl_from_IWSDMessageParameters(IWSDMes
|
||||
|
||||
static inline IWSDUdpMessageParametersImpl *impl_from_IWSDUdpMessageParameters(IWSDUdpMessageParameters *iface)
|
||||
{
|
||||
- return CONTAINING_RECORD(iface, IWSDUdpMessageParametersImpl, base.IWSDMessageParameters_iface);
|
||||
+ return CONTAINING_RECORD((IWSDMessageParameters *)iface, IWSDUdpMessageParametersImpl, base.IWSDMessageParameters_iface);
|
||||
}
|
||||
|
||||
/* IWSDMessageParameters implementation */
|
||||
--
|
||||
2.13.1
|
||||
|
@@ -1 +1 @@
|
||||
Fixes: Add LsaLookupPrivilege[Display]Name stubs
|
||||
Fixes: [43316] Add LsaLookupPrivilege[Display]Name stubs
|
||||
|
@@ -1,4 +1,4 @@
|
||||
From 63082c3863d8be466ed14f532653ddf35e40328a Mon Sep 17 00:00:00 2001
|
||||
From 09d62cfc4fa999eacc89af2ad414810e22c910a9 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Fri, 5 May 2017 00:18:50 +0200
|
||||
Subject: advapi32/tests: Add basic tests for BuildSecurityDescriptor.
|
||||
@@ -8,11 +8,11 @@ Subject: advapi32/tests: Add basic tests for BuildSecurityDescriptor.
|
||||
1 file changed, 39 insertions(+)
|
||||
|
||||
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
|
||||
index d6ea3a19fad..c591f7b6e5f 100644
|
||||
index ca5edffae5..db5a0f934c 100644
|
||||
--- a/dlls/advapi32/tests/security.c
|
||||
+++ b/dlls/advapi32/tests/security.c
|
||||
@@ -7489,6 +7489,44 @@ static void test_child_token_sd(void)
|
||||
HeapFree(GetProcessHeap(), 0, sd);
|
||||
@@ -7217,6 +7217,44 @@ static void test_GetExplicitEntriesFromAclW(void)
|
||||
HeapFree(GetProcessHeap(), 0, old_acl);
|
||||
}
|
||||
|
||||
+static void test_BuildSecurityDescriptorW(void)
|
||||
@@ -56,14 +56,14 @@ index d6ea3a19fad..c591f7b6e5f 100644
|
||||
START_TEST(security)
|
||||
{
|
||||
init();
|
||||
@@ -7542,6 +7580,7 @@ START_TEST(security)
|
||||
test_pseudo_tokens();
|
||||
@@ -7271,6 +7309,7 @@ START_TEST(security)
|
||||
test_maximum_allowed();
|
||||
test_token_label();
|
||||
test_GetExplicitEntriesFromAclW();
|
||||
+ test_BuildSecurityDescriptorW();
|
||||
|
||||
/* must be the last test, modifies process token */
|
||||
/* Must be the last test, modifies process token */
|
||||
test_token_security_descriptor();
|
||||
--
|
||||
2.12.2
|
||||
2.13.1
|
||||
|
||||
|
@@ -1,2 +1,2 @@
|
||||
Fixes: Initial implementation of advapi32.BuildSecurityDescriptorW
|
||||
Depends: server-LABEL_SECURITY_INFORMATION
|
||||
Depends: advapi32-GetExplicitEntriesFromAclW
|
||||
|
@@ -1,4 +1,4 @@
|
||||
From b4469d7a12637ef2b57df3f6aebbe65c9b52ef57 Mon Sep 17 00:00:00 2001
|
||||
From 510d9f43f441bc3a9723aabfd2c1cdc8737d6dcc Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sun, 28 Aug 2016 21:56:41 +0200
|
||||
Subject: advapi32: Implement GetExplicitEntriesFromAclW.
|
||||
@@ -9,10 +9,10 @@ Subject: advapi32: Implement GetExplicitEntriesFromAclW.
|
||||
2 files changed, 221 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
|
||||
index 7e41c0a7361..ccd0bf64cab 100644
|
||||
index e36792cff4..b305947347 100644
|
||||
--- a/dlls/advapi32/security.c
|
||||
+++ b/dlls/advapi32/security.c
|
||||
@@ -4202,8 +4202,85 @@ DWORD WINAPI GetExplicitEntriesFromAclA( PACL pacl, PULONG pcCountOfExplicitEntr
|
||||
@@ -4205,8 +4205,85 @@ DWORD WINAPI GetExplicitEntriesFromAclA( PACL pacl, PULONG pcCountOfExplicitEntr
|
||||
DWORD WINAPI GetExplicitEntriesFromAclW( PACL pacl, PULONG pcCountOfExplicitEntries,
|
||||
PEXPLICIT_ACCESSW* pListOfExplicitEntries)
|
||||
{
|
||||
@@ -101,10 +101,10 @@ index 7e41c0a7361..ccd0bf64cab 100644
|
||||
|
||||
/******************************************************************************
|
||||
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
|
||||
index c31dfbeace3..23cbff58117 100644
|
||||
index 3c68205922..ca5edffae5 100644
|
||||
--- a/dlls/advapi32/tests/security.c
|
||||
+++ b/dlls/advapi32/tests/security.c
|
||||
@@ -133,6 +133,7 @@ static BOOL (WINAPI *pGetWindowsAccountDomainSid)(PSID,PSID,DWORD*);
|
||||
@@ -134,6 +134,7 @@ static BOOL (WINAPI *pGetWindowsAccountDomainSid)(PSID,PSID,DWORD*);
|
||||
static void (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ);
|
||||
static NTSTATUS (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING);
|
||||
static PSID_IDENTIFIER_AUTHORITY (WINAPI *pGetSidIdentifierAuthority)(PSID);
|
||||
@@ -112,16 +112,16 @@ index c31dfbeace3..23cbff58117 100644
|
||||
|
||||
static HMODULE hmod;
|
||||
static int myARGC;
|
||||
@@ -227,6 +228,7 @@ static void init(void)
|
||||
pGetAce = (void *)GetProcAddress(hmod, "GetAce");
|
||||
@@ -230,6 +231,7 @@ static void init(void)
|
||||
pGetWindowsAccountDomainSid = (void *)GetProcAddress(hmod, "GetWindowsAccountDomainSid");
|
||||
pGetSidIdentifierAuthority = (void *)GetProcAddress(hmod, "GetSidIdentifierAuthority");
|
||||
pDuplicateTokenEx = (void *)GetProcAddress(hmod, "DuplicateTokenEx");
|
||||
+ pGetExplicitEntriesFromAclW = (void *)GetProcAddress(hmod, "GetExplicitEntriesFromAclW");
|
||||
|
||||
myARGC = winetest_get_mainargs( &myARGV );
|
||||
}
|
||||
@@ -6451,6 +6453,145 @@ static void test_maximum_allowed(void)
|
||||
CloseHandle(handle);
|
||||
@@ -7076,6 +7078,145 @@ static void test_child_token_sd(void)
|
||||
HeapFree(GetProcessHeap(), 0, sd);
|
||||
}
|
||||
|
||||
+static void test_GetExplicitEntriesFromAclW(void)
|
||||
@@ -266,12 +266,14 @@ index c31dfbeace3..23cbff58117 100644
|
||||
START_TEST(security)
|
||||
{
|
||||
init();
|
||||
@@ -6499,4 +6640,5 @@ START_TEST(security)
|
||||
test_GetSidIdentifierAuthority();
|
||||
@@ -7129,6 +7270,7 @@ START_TEST(security)
|
||||
test_pseudo_tokens();
|
||||
test_maximum_allowed();
|
||||
test_token_label();
|
||||
+ test_GetExplicitEntriesFromAclW();
|
||||
}
|
||||
|
||||
/* Must be the last test, modifies process token */
|
||||
test_token_security_descriptor();
|
||||
--
|
||||
2.11.0
|
||||
2.13.1
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
From bfbe1cfd28797365a7341add7a330568b3846e89 Mon Sep 17 00:00:00 2001
|
||||
From 3981c1e27bd2b871761ad5a627c99e0fca17a8ac Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sun, 17 Jan 2016 17:07:35 +0100
|
||||
Subject: ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub for
|
||||
@@ -15,20 +15,20 @@ Subject: ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub for
|
||||
create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 670c2fc..8e44524 100644
|
||||
index 8bd76710a37..1f78aea5ce0 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3025,6 +3025,7 @@ WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-rgn-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dc-access-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0)
|
||||
@@ -3114,6 +3114,7 @@ WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-security-credui-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-security-cryptui-l1-1-0)
|
||||
+WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
|
||||
WINE_CONFIG_DLL(faultrep,,[implib])
|
||||
WINE_CONFIG_TEST(dlls/faultrep/tests)
|
||||
WINE_CONFIG_DLL(fltlib)
|
||||
diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in b/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in
|
||||
new file mode 100644
|
||||
index 0000000..6382d85
|
||||
index 00000000000..6382d85272b
|
||||
--- /dev/null
|
||||
+++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in
|
||||
@@ -0,0 +1,4 @@
|
||||
@@ -38,7 +38,7 @@ index 0000000..6382d85
|
||||
+ main.c
|
||||
diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec b/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec
|
||||
new file mode 100644
|
||||
index 0000000..c167f5e
|
||||
index 00000000000..c167f5e753e
|
||||
--- /dev/null
|
||||
+++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec
|
||||
@@ -0,0 +1,6 @@
|
||||
@@ -50,7 +50,7 @@ index 0000000..c167f5e
|
||||
+@ stub XamlPalUninitialize
|
||||
diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c b/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
|
||||
new file mode 100644
|
||||
index 0000000..3e28275
|
||||
index 00000000000..3e282758f41
|
||||
--- /dev/null
|
||||
+++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
|
||||
@@ -0,0 +1,35 @@
|
||||
@@ -90,5 +90,5 @@ index 0000000..3e28275
|
||||
+ return TRUE;
|
||||
+}
|
||||
--
|
||||
2.9.0
|
||||
2.13.1
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
From 703b9bd81221bd985ec79697e035e60a6fbcbc6d Mon Sep 17 00:00:00 2001
|
||||
From 1d6b09ecb94a11bef9142a975b1d2053696193c4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 23 Jan 2016 21:00:39 +0100
|
||||
Subject: ext-ms-win-ntuser-mouse-l1-1-0: Add dll.
|
||||
@@ -13,12 +13,12 @@ Subject: ext-ms-win-ntuser-mouse-l1-1-0: Add dll.
|
||||
create mode 100644 dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index c5d7a4e..377d146 100644
|
||||
index dd536e88742..6fa34f04129 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3020,6 +3020,7 @@ WINE_CONFIG_DLL(ext-ms-win-gdi-draw-l1-1-1)
|
||||
WINE_CONFIG_DLL(ext-ms-win-gdi-render-l1-1-0)
|
||||
@@ -3105,6 +3105,7 @@ WINE_CONFIG_DLL(ext-ms-win-gdi-render-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-kernel32-package-l1-1-1)
|
||||
WINE_CONFIG_DLL(ext-ms-win-ntuser-message-l1-1-1)
|
||||
+WINE_CONFIG_DLL(ext-ms-win-ntuser-mouse-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-ntuser-private-l1-1-1)
|
||||
@@ -26,14 +26,14 @@ index c5d7a4e..377d146 100644
|
||||
WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0)
|
||||
diff --git a/dlls/ext-ms-win-ntuser-mouse-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-mouse-l1-1-0/Makefile.in
|
||||
new file mode 100644
|
||||
index 0000000..c408dbb
|
||||
index 00000000000..c408dbbe052
|
||||
--- /dev/null
|
||||
+++ b/dlls/ext-ms-win-ntuser-mouse-l1-1-0/Makefile.in
|
||||
@@ -0,0 +1 @@
|
||||
+MODULE = ext-ms-win-ntuser-mouse-l1-1-0.dll
|
||||
diff --git a/dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec b/dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec
|
||||
new file mode 100644
|
||||
index 0000000..22128a2
|
||||
index 00000000000..22128a256f1
|
||||
--- /dev/null
|
||||
+++ b/dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec
|
||||
@@ -0,0 +1,5 @@
|
||||
@@ -43,10 +43,10 @@ index 0000000..22128a2
|
||||
+@ stdcall SetCapture(long) user32.SetCapture
|
||||
+@ stdcall TrackMouseEvent(ptr) user32.TrackMouseEvent
|
||||
diff --git a/tools/make_specfiles b/tools/make_specfiles
|
||||
index 45fa346..576dc5f 100755
|
||||
index c84686b111b..7e2a921ed18 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -286,6 +286,7 @@ my @dll_groups =
|
||||
@@ -330,6 +330,7 @@ my @dll_groups =
|
||||
"api-ms-win-ntuser-dc-access-l1-1-0",
|
||||
"api-ms-win-rtcore-ntuser-private-l1-1-0",
|
||||
"ext-ms-win-ntuser-message-l1-1-1",
|
||||
@@ -55,5 +55,5 @@ index 45fa346..576dc5f 100755
|
||||
"ext-ms-win-ntuser-rectangle-ext-l1-1-0",
|
||||
"ext-ms-win-ntuser-uicontext-ext-l1-1-0",
|
||||
--
|
||||
2.9.0
|
||||
2.13.1
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
From bc9d6818548e009b387d32677e19d56018a9f59c Mon Sep 17 00:00:00 2001
|
||||
From 8ac935e746234726007a479f7d351405a53b932d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 23 Jan 2016 21:02:52 +0100
|
||||
Subject: ext-ms-win-uxtheme-themes-l1-1-0: Add dll.
|
||||
@@ -13,27 +13,27 @@ Subject: ext-ms-win-uxtheme-themes-l1-1-0: Add dll.
|
||||
create mode 100644 dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 377d146..be65d14 100644
|
||||
index 6fa34f04129..fa7423fb29b 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3030,6 +3030,7 @@ WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-rgn-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dc-access-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0)
|
||||
@@ -3119,6 +3119,7 @@ WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-security-credui-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-security-cryptui-l1-1-0)
|
||||
+WINE_CONFIG_DLL(ext-ms-win-uxtheme-themes-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
|
||||
WINE_CONFIG_DLL(faultrep,,[implib])
|
||||
WINE_CONFIG_TEST(dlls/faultrep/tests)
|
||||
diff --git a/dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in b/dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in
|
||||
new file mode 100644
|
||||
index 0000000..576b6f6
|
||||
index 00000000000..576b6f69b41
|
||||
--- /dev/null
|
||||
+++ b/dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in
|
||||
@@ -0,0 +1 @@
|
||||
+MODULE = ext-ms-win-uxtheme-themes-l1-1-0.dll
|
||||
diff --git a/dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec b/dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec
|
||||
new file mode 100644
|
||||
index 0000000..0a96983
|
||||
index 00000000000..0a96983936d
|
||||
--- /dev/null
|
||||
+++ b/dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec
|
||||
@@ -0,0 +1,24 @@
|
||||
@@ -62,10 +62,10 @@ index 0000000..0a96983
|
||||
+@ stdcall OpenThemeDataEx(ptr wstr long) uxtheme.OpenThemeDataEx
|
||||
+@ stdcall SetWindowTheme(ptr wstr wstr) uxtheme.SetWindowTheme
|
||||
diff --git a/tools/make_specfiles b/tools/make_specfiles
|
||||
index 576dc5f..1dde434 100755
|
||||
index 7e2a921ed18..1bd5c68f4ec 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -329,6 +329,10 @@ my @dll_groups =
|
||||
@@ -382,6 +382,10 @@ my @dll_groups =
|
||||
"api-ms-win-core-winrt-string-l1-1-0",
|
||||
],
|
||||
[
|
||||
@@ -77,5 +77,5 @@ index 576dc5f..1dde434 100755
|
||||
"irprops.cpl",
|
||||
],
|
||||
--
|
||||
2.9.0
|
||||
2.13.1
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
From 6c31a75359f023d3152378144efdee5f34078147 Mon Sep 17 00:00:00 2001
|
||||
From 6ea995be80a3f9ed89f1aad8a246bdd7923c42f3 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 23 Jan 2016 21:06:59 +0100
|
||||
Subject: ext-ms-win-rtcore-ntuser-syscolors-l1-1-0: Add dll.
|
||||
@@ -13,37 +13,37 @@ Subject: ext-ms-win-rtcore-ntuser-syscolors-l1-1-0: Add dll.
|
||||
create mode 100644 dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index e865969..4e7869f 100644
|
||||
index 99ef34fdda5..cb28b8af0ce 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3030,6 +3030,7 @@ WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-object-l1-1-0)
|
||||
@@ -3117,6 +3117,7 @@ WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-object-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-rgn-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dc-access-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0)
|
||||
+WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-syscolors-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-uxtheme-themes-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-security-credui-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-security-cryptui-l1-1-0)
|
||||
diff --git a/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in b/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in
|
||||
new file mode 100644
|
||||
index 0000000..3e6b6e8
|
||||
index 00000000000..3e6b6e8f0e7
|
||||
--- /dev/null
|
||||
+++ b/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in
|
||||
@@ -0,0 +1 @@
|
||||
+MODULE = ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.dll
|
||||
diff --git a/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec b/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec
|
||||
new file mode 100644
|
||||
index 0000000..626c778
|
||||
index 00000000000..626c778c49f
|
||||
--- /dev/null
|
||||
+++ b/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec
|
||||
@@ -0,0 +1,2 @@
|
||||
+@ stdcall GetSysColor(long) user32.GetSysColor
|
||||
+@ stdcall SetSysColors(long ptr ptr) user32.SetSysColors
|
||||
diff --git a/tools/make_specfiles b/tools/make_specfiles
|
||||
index 40129d0..1230505 100755
|
||||
index 48d32b83629..556355234b3 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -294,6 +294,7 @@ my @dll_groups =
|
||||
@@ -339,6 +339,7 @@ my @dll_groups =
|
||||
"ext-ms-win-ntuser-window-l1-1-1",
|
||||
"ext-ms-win-rtcore-ntuser-dc-access-l1-1-0",
|
||||
"ext-ms-win-rtcore-ntuser-dpi-l1-1-0",
|
||||
@@ -52,5 +52,5 @@ index 40129d0..1230505 100755
|
||||
],
|
||||
[
|
||||
--
|
||||
2.9.0
|
||||
2.13.1
|
||||
|
||||
|
@@ -0,0 +1,81 @@
|
||||
From 848ac26c5b1e6551639fbef1a03e93ca14d934a2 Mon Sep 17 00:00:00 2001
|
||||
From: Kimmo Myllyvirta <kimmo.myllyvirta@gmail.com>
|
||||
Date: Fri, 7 Jul 2017 11:01:07 +0300
|
||||
Subject: d3d11: Implement GSSetShader for deferred contexts.
|
||||
|
||||
---
|
||||
dlls/d3d11/device.c | 29 ++++++++++++++++++++++++++++-
|
||||
1 file changed, 28 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
|
||||
index 8642bf50fb1..98aa5ef6a77 100644
|
||||
--- a/dlls/d3d11/device.c
|
||||
+++ b/dlls/d3d11/device.c
|
||||
@@ -42,6 +42,7 @@ enum deferred_cmd
|
||||
|
||||
DEFERRED_CSSETSHADER, /* cs_info */
|
||||
DEFERRED_DSSETSHADER, /* ds_info */
|
||||
+ DEFERRED_GSSETSHADER, /* gs_info */
|
||||
DEFERRED_HSSETSHADER, /* hs_info */
|
||||
DEFERRED_PSSETSHADER, /* ps_info */
|
||||
DEFERRED_VSSETSHADER, /* vs_info */
|
||||
@@ -138,6 +139,11 @@ struct deferred_call
|
||||
} ds_info;
|
||||
struct
|
||||
{
|
||||
+ ID3D11GeometryShader *shader;
|
||||
+ /* FIXME: add class instances */
|
||||
+ } gs_info;
|
||||
+ struct
|
||||
+ {
|
||||
ID3D11HullShader *shader;
|
||||
/* FIXME: add class instances */
|
||||
} hs_info;
|
||||
@@ -404,6 +410,12 @@ static void free_deferred_calls(struct list *commands)
|
||||
ID3D11DomainShader_Release(call->ds_info.shader);
|
||||
break;
|
||||
}
|
||||
+ case DEFERRED_GSSETSHADER:
|
||||
+ {
|
||||
+ if (call->gs_info.shader)
|
||||
+ ID3D11GeometryShader_Release(call->gs_info.shader);
|
||||
+ break;
|
||||
+ }
|
||||
case DEFERRED_HSSETSHADER:
|
||||
{
|
||||
if (call->hs_info.shader)
|
||||
@@ -577,6 +589,11 @@ static void exec_deferred_calls(ID3D11DeviceContext *iface, struct list *command
|
||||
ID3D11DeviceContext_DSSetShader(iface, call->ds_info.shader, NULL, 0);
|
||||
break;
|
||||
}
|
||||
+ case DEFERRED_GSSETSHADER:
|
||||
+ {
|
||||
+ ID3D11DeviceContext_GSSetShader(iface, call->gs_info.shader, NULL, 0);
|
||||
+ break;
|
||||
+ }
|
||||
case DEFERRED_HSSETSHADER:
|
||||
{
|
||||
ID3D11DeviceContext_HSSetShader(iface, call->hs_info.shader, NULL, 0);
|
||||
@@ -3875,8 +3892,18 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetConstantBuffers(ID3D11
|
||||
static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetShader(ID3D11DeviceContext *iface,
|
||||
ID3D11GeometryShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count)
|
||||
{
|
||||
- FIXME("iface %p, shader %p, class_instances %p, class_instance_count %u stub!\n",
|
||||
+ struct d3d11_deferred_context *context = impl_from_deferred_ID3D11DeviceContext(iface);
|
||||
+ struct deferred_call *call;
|
||||
+
|
||||
+ TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n",
|
||||
iface, shader, class_instances, class_instance_count);
|
||||
+
|
||||
+ if (!(call = add_deferred_call(context, 0)))
|
||||
+ return;
|
||||
+
|
||||
+ call->cmd = DEFERRED_GSSETSHADER;
|
||||
+ if (shader) ID3D11GeometryShader_AddRef(shader);
|
||||
+ call->gs_info.shader = shader;
|
||||
}
|
||||
|
||||
static void STDMETHODCALLTYPE d3d11_deferred_context_IASetPrimitiveTopology(ID3D11DeviceContext *iface,
|
||||
--
|
||||
2.13.1
|
||||
|
@@ -0,0 +1,70 @@
|
||||
From 4e7076c5cc9806ce0e0218588ea587cfe3db8951 Mon Sep 17 00:00:00 2001
|
||||
From: Kimmo Myllyvirta <kimmo.myllyvirta@gmail.com>
|
||||
Date: Fri, 7 Jul 2017 11:04:41 +0300
|
||||
Subject: d3d11: Implement GSSetConstantBuffers for deferred contexts.
|
||||
|
||||
---
|
||||
dlls/d3d11/device.c | 18 +++++++++++++++---
|
||||
1 file changed, 15 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
|
||||
index 98aa5ef6a77..014f39f74c1 100644
|
||||
--- a/dlls/d3d11/device.c
|
||||
+++ b/dlls/d3d11/device.c
|
||||
@@ -55,6 +55,7 @@ enum deferred_cmd
|
||||
|
||||
DEFERRED_CSSETCONSTANTBUFFERS, /* constant_buffers_info */
|
||||
DEFERRED_DSSETCONSTANTBUFFERS, /* constant_buffers_info */
|
||||
+ DEFERRED_GSSETCONSTANTBUFFERS, /* constant_buffers_info */
|
||||
DEFERRED_HSSETCONSTANTBUFFERS, /* constant_buffers_info */
|
||||
DEFERRED_PSSETCONSTANTBUFFERS, /* constant_buffers_info */
|
||||
DEFERRED_VSSETCONSTANTBUFFERS, /* constant_buffers_info */
|
||||
@@ -309,8 +310,8 @@ static void add_deferred_set_samplers(struct d3d11_deferred_context *context, en
|
||||
}
|
||||
}
|
||||
|
||||
-/* for DEFERRED_CSSETCONSTANTBUFFERS. DEFERRED_DSSETCONSTANTBUFFERS, DEFERRED_HSSETCONSTANTBUFFERS,
|
||||
- * DEFERRED_PSSETCONSTANTBUFFERS and DEFERRED_VSSETCONSTANTBUFFERS */
|
||||
+/* for DEFERRED_CSSETCONSTANTBUFFERS. DEFERRED_DSSETCONSTANTBUFFERS, DEFERRED_GSSETCONSTANTBUFFERS,
|
||||
+ * DEFERRED_HSSETCONSTANTBUFFERS, DEFERRED_PSSETCONSTANTBUFFERS and DEFERRED_VSSETCONSTANTBUFFERS */
|
||||
static void add_deferred_set_constant_buffers(struct d3d11_deferred_context *context, enum deferred_cmd cmd,
|
||||
UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers)
|
||||
{
|
||||
@@ -456,6 +457,7 @@ static void free_deferred_calls(struct list *commands)
|
||||
}
|
||||
case DEFERRED_CSSETCONSTANTBUFFERS:
|
||||
case DEFERRED_DSSETCONSTANTBUFFERS:
|
||||
+ case DEFERRED_GSSETCONSTANTBUFFERS:
|
||||
case DEFERRED_HSSETCONSTANTBUFFERS:
|
||||
case DEFERRED_PSSETCONSTANTBUFFERS:
|
||||
case DEFERRED_VSSETCONSTANTBUFFERS:
|
||||
@@ -645,6 +647,12 @@ static void exec_deferred_calls(ID3D11DeviceContext *iface, struct list *command
|
||||
call->constant_buffers_info.num_buffers, call->constant_buffers_info.buffers);
|
||||
break;
|
||||
}
|
||||
+ case DEFERRED_GSSETCONSTANTBUFFERS:
|
||||
+ {
|
||||
+ ID3D11DeviceContext_GSSetConstantBuffers(iface, call->constant_buffers_info.start_slot,
|
||||
+ call->constant_buffers_info.num_buffers, call->constant_buffers_info.buffers);
|
||||
+ break;
|
||||
+ }
|
||||
case DEFERRED_HSSETCONSTANTBUFFERS:
|
||||
{
|
||||
ID3D11DeviceContext_HSSetConstantBuffers(iface, call->constant_buffers_info.start_slot,
|
||||
@@ -3885,8 +3893,12 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_DrawInstanced(ID3D11DeviceC
|
||||
static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetConstantBuffers(ID3D11DeviceContext *iface,
|
||||
UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers)
|
||||
{
|
||||
- FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n",
|
||||
+ struct d3d11_deferred_context *context = impl_from_deferred_ID3D11DeviceContext(iface);
|
||||
+
|
||||
+ TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n",
|
||||
iface, start_slot, buffer_count, buffers);
|
||||
+
|
||||
+ add_deferred_set_constant_buffers(context, DEFERRED_GSSETCONSTANTBUFFERS, start_slot, buffer_count, buffers);
|
||||
}
|
||||
|
||||
static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetShader(ID3D11DeviceContext *iface,
|
||||
--
|
||||
2.13.1
|
||||
|
@@ -0,0 +1,68 @@
|
||||
From bde4fe1e674ff4dc32e9417b3ef020eb96cf6700 Mon Sep 17 00:00:00 2001
|
||||
From: Kimmo Myllyvirta <kimmo.myllyvirta@gmail.com>
|
||||
Date: Fri, 7 Jul 2017 11:07:15 +0300
|
||||
Subject: d3d11: Implement CSSetShaderResources for deferred contexts.
|
||||
|
||||
---
|
||||
dlls/d3d11/device.c | 16 ++++++++++++++--
|
||||
1 file changed, 14 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
|
||||
index 014f39f74c1..ae92b190de5 100644
|
||||
--- a/dlls/d3d11/device.c
|
||||
+++ b/dlls/d3d11/device.c
|
||||
@@ -47,6 +47,7 @@ enum deferred_cmd
|
||||
DEFERRED_PSSETSHADER, /* ps_info */
|
||||
DEFERRED_VSSETSHADER, /* vs_info */
|
||||
|
||||
+ DEFERRED_CSSETSHADERRESOURCES, /* res_info */
|
||||
DEFERRED_DSSETSHADERRESOURCES, /* res_info */
|
||||
DEFERRED_PSSETSHADERRESOURCES, /* res_info */
|
||||
|
||||
@@ -268,7 +269,7 @@ static struct deferred_call *add_deferred_call(struct d3d11_deferred_context *co
|
||||
return call;
|
||||
}
|
||||
|
||||
-/* for DEFERRED_DSSETSHADERRESOURCES and DEFERRED_PSSETSHADERRESOURCES */
|
||||
+/* for DEFERRED_CSSETSHADERRESOURCES, DEFERRED_DSSETSHADERRESOURCES and DEFERRED_PSSETSHADERRESOURCES */
|
||||
static void add_deferred_set_shader_resources(struct d3d11_deferred_context *context, enum deferred_cmd cmd,
|
||||
UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views)
|
||||
{
|
||||
@@ -435,6 +436,7 @@ static void free_deferred_calls(struct list *commands)
|
||||
ID3D11VertexShader_Release(call->vs_info.shader);
|
||||
break;
|
||||
}
|
||||
+ case DEFERRED_CSSETSHADERRESOURCES:
|
||||
case DEFERRED_DSSETSHADERRESOURCES:
|
||||
case DEFERRED_PSSETSHADERRESOURCES:
|
||||
{
|
||||
@@ -611,6 +613,12 @@ static void exec_deferred_calls(ID3D11DeviceContext *iface, struct list *command
|
||||
ID3D11DeviceContext_VSSetShader(iface, call->vs_info.shader, NULL, 0);
|
||||
break;
|
||||
}
|
||||
+ case DEFERRED_CSSETSHADERRESOURCES:
|
||||
+ {
|
||||
+ ID3D11DeviceContext_CSSetShaderResources(iface, call->res_info.start_slot,
|
||||
+ call->res_info.num_views, call->res_info.views);
|
||||
+ break;
|
||||
+ }
|
||||
case DEFERRED_DSSETSHADERRESOURCES:
|
||||
{
|
||||
ID3D11DeviceContext_DSSetShaderResources(iface, call->res_info.start_slot,
|
||||
@@ -4374,8 +4382,12 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_DSSetConstantBuffers(ID3D11
|
||||
static void STDMETHODCALLTYPE d3d11_deferred_context_CSSetShaderResources(ID3D11DeviceContext *iface,
|
||||
UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views)
|
||||
{
|
||||
- FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n",
|
||||
+ struct d3d11_deferred_context *context = impl_from_deferred_ID3D11DeviceContext(iface);
|
||||
+
|
||||
+ TRACE("iface %p, start_slot %u, view_count %u, views %p.\n",
|
||||
iface, start_slot, view_count, views);
|
||||
+
|
||||
+ add_deferred_set_shader_resources(context, DEFERRED_CSSETSHADERRESOURCES, start_slot, view_count, views);
|
||||
}
|
||||
|
||||
static void STDMETHODCALLTYPE d3d11_deferred_context_CSSetUnorderedAccessViews(ID3D11DeviceContext *iface,
|
||||
--
|
||||
2.13.1
|
||||
|
@@ -0,0 +1,69 @@
|
||||
From d55adbf05b349aa1cd3b6134cd5d9b4c211ff6db Mon Sep 17 00:00:00 2001
|
||||
From: Kimmo Myllyvirta <kimmo.myllyvirta@gmail.com>
|
||||
Date: Fri, 7 Jul 2017 11:09:57 +0300
|
||||
Subject: d3d11: Implement GSSetShaderResources for deferred contexts.
|
||||
|
||||
---
|
||||
dlls/d3d11/device.c | 18 ++++++++++++++++--
|
||||
1 file changed, 16 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
|
||||
index ae92b190de5..917101d055c 100644
|
||||
--- a/dlls/d3d11/device.c
|
||||
+++ b/dlls/d3d11/device.c
|
||||
@@ -49,6 +49,7 @@ enum deferred_cmd
|
||||
|
||||
DEFERRED_CSSETSHADERRESOURCES, /* res_info */
|
||||
DEFERRED_DSSETSHADERRESOURCES, /* res_info */
|
||||
+ DEFERRED_GSSETSHADERRESOURCES, /* res_info */
|
||||
DEFERRED_PSSETSHADERRESOURCES, /* res_info */
|
||||
|
||||
DEFERRED_DSSETSAMPLERS, /* samplers_info */
|
||||
@@ -269,7 +270,8 @@ static struct deferred_call *add_deferred_call(struct d3d11_deferred_context *co
|
||||
return call;
|
||||
}
|
||||
|
||||
-/* for DEFERRED_CSSETSHADERRESOURCES, DEFERRED_DSSETSHADERRESOURCES and DEFERRED_PSSETSHADERRESOURCES */
|
||||
+/* for DEFERRED_CSSETSHADERRESOURCES, DEFERRED_DSSETSHADERRESOURCES, DEFERRED_GSSETSHADERRESOURCES,
|
||||
+ * and DEFERRED_PSSETSHADERRESOURCES */
|
||||
static void add_deferred_set_shader_resources(struct d3d11_deferred_context *context, enum deferred_cmd cmd,
|
||||
UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views)
|
||||
{
|
||||
@@ -438,6 +440,7 @@ static void free_deferred_calls(struct list *commands)
|
||||
}
|
||||
case DEFERRED_CSSETSHADERRESOURCES:
|
||||
case DEFERRED_DSSETSHADERRESOURCES:
|
||||
+ case DEFERRED_GSSETSHADERRESOURCES:
|
||||
case DEFERRED_PSSETSHADERRESOURCES:
|
||||
{
|
||||
for (i = 0; i < call->res_info.num_views; i++)
|
||||
@@ -625,6 +628,12 @@ static void exec_deferred_calls(ID3D11DeviceContext *iface, struct list *command
|
||||
call->res_info.num_views, call->res_info.views);
|
||||
break;
|
||||
}
|
||||
+ case DEFERRED_GSSETSHADERRESOURCES:
|
||||
+ {
|
||||
+ ID3D11DeviceContext_GSSetShaderResources(iface, call->res_info.start_slot,
|
||||
+ call->res_info.num_views, call->res_info.views);
|
||||
+ break;
|
||||
+ }
|
||||
case DEFERRED_PSSETSHADERRESOURCES:
|
||||
{
|
||||
ID3D11DeviceContext_PSSetShaderResources(iface, call->res_info.start_slot,
|
||||
@@ -3984,7 +3993,12 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_SetPredication(ID3D11Device
|
||||
static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetShaderResources(ID3D11DeviceContext *iface,
|
||||
UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views)
|
||||
{
|
||||
- FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", iface, start_slot, view_count, views);
|
||||
+ struct d3d11_deferred_context *context = impl_from_deferred_ID3D11DeviceContext(iface);
|
||||
+
|
||||
+ TRACE("iface %p, start_slot %u, view_count %u, views %p.\n",
|
||||
+ iface, start_slot, view_count, views);
|
||||
+
|
||||
+ add_deferred_set_shader_resources(context, DEFERRED_GSSETSHADERRESOURCES, start_slot, view_count, views);
|
||||
}
|
||||
|
||||
static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetSamplers(ID3D11DeviceContext *iface,
|
||||
--
|
||||
2.13.1
|
||||
|
@@ -0,0 +1,68 @@
|
||||
From 47adec4e3c5117ac8c2a9c5c48659298aff77003 Mon Sep 17 00:00:00 2001
|
||||
From: Kimmo Myllyvirta <kimmo.myllyvirta@gmail.com>
|
||||
Date: Fri, 7 Jul 2017 11:11:41 +0300
|
||||
Subject: d3d11: Implement HSSetShaderResources for deferred contexts.
|
||||
|
||||
---
|
||||
dlls/d3d11/device.c | 16 ++++++++++++++--
|
||||
1 file changed, 14 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
|
||||
index 917101d055c..f2ed01bf532 100644
|
||||
--- a/dlls/d3d11/device.c
|
||||
+++ b/dlls/d3d11/device.c
|
||||
@@ -50,6 +50,7 @@ enum deferred_cmd
|
||||
DEFERRED_CSSETSHADERRESOURCES, /* res_info */
|
||||
DEFERRED_DSSETSHADERRESOURCES, /* res_info */
|
||||
DEFERRED_GSSETSHADERRESOURCES, /* res_info */
|
||||
+ DEFERRED_HSSETSHADERRESOURCES, /* res_info */
|
||||
DEFERRED_PSSETSHADERRESOURCES, /* res_info */
|
||||
|
||||
DEFERRED_DSSETSAMPLERS, /* samplers_info */
|
||||
@@ -271,7 +272,7 @@ static struct deferred_call *add_deferred_call(struct d3d11_deferred_context *co
|
||||
}
|
||||
|
||||
/* for DEFERRED_CSSETSHADERRESOURCES, DEFERRED_DSSETSHADERRESOURCES, DEFERRED_GSSETSHADERRESOURCES,
|
||||
- * and DEFERRED_PSSETSHADERRESOURCES */
|
||||
+ * DEFERRED_HSSETSHADERRESOURCES and DEFERRED_PSSETSHADERRESOURCES */
|
||||
static void add_deferred_set_shader_resources(struct d3d11_deferred_context *context, enum deferred_cmd cmd,
|
||||
UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views)
|
||||
{
|
||||
@@ -441,6 +442,7 @@ static void free_deferred_calls(struct list *commands)
|
||||
case DEFERRED_CSSETSHADERRESOURCES:
|
||||
case DEFERRED_DSSETSHADERRESOURCES:
|
||||
case DEFERRED_GSSETSHADERRESOURCES:
|
||||
+ case DEFERRED_HSSETSHADERRESOURCES:
|
||||
case DEFERRED_PSSETSHADERRESOURCES:
|
||||
{
|
||||
for (i = 0; i < call->res_info.num_views; i++)
|
||||
@@ -634,6 +636,12 @@ static void exec_deferred_calls(ID3D11DeviceContext *iface, struct list *command
|
||||
call->res_info.num_views, call->res_info.views);
|
||||
break;
|
||||
}
|
||||
+ case DEFERRED_HSSETSHADERRESOURCES:
|
||||
+ {
|
||||
+ ID3D11DeviceContext_HSSetShaderResources(iface, call->res_info.start_slot,
|
||||
+ call->res_info.num_views, call->res_info.views);
|
||||
+ break;
|
||||
+ }
|
||||
case DEFERRED_PSSETSHADERRESOURCES:
|
||||
{
|
||||
ID3D11DeviceContext_PSSetShaderResources(iface, call->res_info.start_slot,
|
||||
@@ -4304,8 +4312,12 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_ExecuteCommandList(ID3D11De
|
||||
static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetShaderResources(ID3D11DeviceContext *iface,
|
||||
UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views)
|
||||
{
|
||||
- FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n",
|
||||
+ struct d3d11_deferred_context *context = impl_from_deferred_ID3D11DeviceContext(iface);
|
||||
+
|
||||
+ TRACE("iface %p, start_slot %u, view_count %u, views %p.\n",
|
||||
iface, start_slot, view_count, views);
|
||||
+
|
||||
+ add_deferred_set_shader_resources(context, DEFERRED_HSSETSHADERRESOURCES, start_slot, view_count, views);
|
||||
}
|
||||
|
||||
static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetShader(ID3D11DeviceContext *iface,
|
||||
--
|
||||
2.13.1
|
||||
|
@@ -0,0 +1,68 @@
|
||||
From 5fb7380f08a868c176d6c369e9390ff64274aa6e Mon Sep 17 00:00:00 2001
|
||||
From: Kimmo Myllyvirta <kimmo.myllyvirta@gmail.com>
|
||||
Date: Fri, 7 Jul 2017 11:13:47 +0300
|
||||
Subject: d3d11: Implement VSSetShaderResources for deferred contexts.
|
||||
|
||||
---
|
||||
dlls/d3d11/device.c | 17 +++++++++++++++--
|
||||
1 file changed, 15 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
|
||||
index f2ed01bf532..c4cef99ba26 100644
|
||||
--- a/dlls/d3d11/device.c
|
||||
+++ b/dlls/d3d11/device.c
|
||||
@@ -52,6 +52,7 @@ enum deferred_cmd
|
||||
DEFERRED_GSSETSHADERRESOURCES, /* res_info */
|
||||
DEFERRED_HSSETSHADERRESOURCES, /* res_info */
|
||||
DEFERRED_PSSETSHADERRESOURCES, /* res_info */
|
||||
+ DEFERRED_VSSETSHADERRESOURCES, /* res_info */
|
||||
|
||||
DEFERRED_DSSETSAMPLERS, /* samplers_info */
|
||||
DEFERRED_PSSETSAMPLERS, /* samplers_info */
|
||||
@@ -272,7 +273,7 @@ static struct deferred_call *add_deferred_call(struct d3d11_deferred_context *co
|
||||
}
|
||||
|
||||
/* for DEFERRED_CSSETSHADERRESOURCES, DEFERRED_DSSETSHADERRESOURCES, DEFERRED_GSSETSHADERRESOURCES,
|
||||
- * DEFERRED_HSSETSHADERRESOURCES and DEFERRED_PSSETSHADERRESOURCES */
|
||||
+ * DEFERRED_HSSETSHADERRESOURCES, DEFERRED_PSSETSHADERRESOURCES and DEFERRED_VSSETSHADERRESOURCES */
|
||||
static void add_deferred_set_shader_resources(struct d3d11_deferred_context *context, enum deferred_cmd cmd,
|
||||
UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views)
|
||||
{
|
||||
@@ -444,6 +445,7 @@ static void free_deferred_calls(struct list *commands)
|
||||
case DEFERRED_GSSETSHADERRESOURCES:
|
||||
case DEFERRED_HSSETSHADERRESOURCES:
|
||||
case DEFERRED_PSSETSHADERRESOURCES:
|
||||
+ case DEFERRED_VSSETSHADERRESOURCES:
|
||||
{
|
||||
for (i = 0; i < call->res_info.num_views; i++)
|
||||
{
|
||||
@@ -648,6 +650,12 @@ static void exec_deferred_calls(ID3D11DeviceContext *iface, struct list *command
|
||||
call->res_info.num_views, call->res_info.views);
|
||||
break;
|
||||
}
|
||||
+ case DEFERRED_VSSETSHADERRESOURCES:
|
||||
+ {
|
||||
+ ID3D11DeviceContext_VSSetShaderResources(iface, call->res_info.start_slot,
|
||||
+ call->res_info.num_views, call->res_info.views);
|
||||
+ break;
|
||||
+ }
|
||||
case DEFERRED_DSSETSAMPLERS:
|
||||
{
|
||||
ID3D11DeviceContext_DSSetSamplers(iface, call->samplers_info.start_slot,
|
||||
@@ -3961,7 +3969,12 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_IASetPrimitiveTopology(ID3D
|
||||
static void STDMETHODCALLTYPE d3d11_deferred_context_VSSetShaderResources(ID3D11DeviceContext *iface,
|
||||
UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views)
|
||||
{
|
||||
- FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", iface, start_slot, view_count, views);
|
||||
+ struct d3d11_deferred_context *context = impl_from_deferred_ID3D11DeviceContext(iface);
|
||||
+
|
||||
+ TRACE("iface %p, start_slot %u, view_count %u, views %p.\n",
|
||||
+ iface, start_slot, view_count, views);
|
||||
+
|
||||
+ add_deferred_set_shader_resources(context, DEFERRED_VSSETSHADERRESOURCES, start_slot, view_count, views);
|
||||
}
|
||||
|
||||
static void STDMETHODCALLTYPE d3d11_deferred_context_VSSetSamplers(ID3D11DeviceContext *iface,
|
||||
--
|
||||
2.13.1
|
||||
|
@@ -0,0 +1,68 @@
|
||||
From ebe0004e3acb6b89d649756bc27b32b92ee3d540 Mon Sep 17 00:00:00 2001
|
||||
From: Kimmo Myllyvirta <kimmo.myllyvirta@gmail.com>
|
||||
Date: Fri, 7 Jul 2017 11:15:31 +0300
|
||||
Subject: d3d11: Implement CSSetSamplers for deferred contexts.
|
||||
|
||||
---
|
||||
dlls/d3d11/device.c | 16 ++++++++++++++--
|
||||
1 file changed, 14 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
|
||||
index c4cef99ba26..1fe04efa5c3 100644
|
||||
--- a/dlls/d3d11/device.c
|
||||
+++ b/dlls/d3d11/device.c
|
||||
@@ -54,6 +54,7 @@ enum deferred_cmd
|
||||
DEFERRED_PSSETSHADERRESOURCES, /* res_info */
|
||||
DEFERRED_VSSETSHADERRESOURCES, /* res_info */
|
||||
|
||||
+ DEFERRED_CSSETSAMPLERS, /* samplers_info */
|
||||
DEFERRED_DSSETSAMPLERS, /* samplers_info */
|
||||
DEFERRED_PSSETSAMPLERS, /* samplers_info */
|
||||
|
||||
@@ -294,7 +295,7 @@ static void add_deferred_set_shader_resources(struct d3d11_deferred_context *con
|
||||
}
|
||||
}
|
||||
|
||||
-/* for DEFERRED_DSSETSAMPLERS and DEFERRED_PSSETSAMPLERS */
|
||||
+/* for DEFERRED_CSSETSAMPLERS, DEFERRED_DSSETSAMPLERS and DEFERRED_PSSETSAMPLERS */
|
||||
static void add_deferred_set_samplers(struct d3d11_deferred_context *context, enum deferred_cmd cmd,
|
||||
UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers)
|
||||
{
|
||||
@@ -454,6 +455,7 @@ static void free_deferred_calls(struct list *commands)
|
||||
}
|
||||
break;
|
||||
}
|
||||
+ case DEFERRED_CSSETSAMPLERS:
|
||||
case DEFERRED_DSSETSAMPLERS:
|
||||
case DEFERRED_PSSETSAMPLERS:
|
||||
{
|
||||
@@ -656,6 +658,12 @@ static void exec_deferred_calls(ID3D11DeviceContext *iface, struct list *command
|
||||
call->res_info.num_views, call->res_info.views);
|
||||
break;
|
||||
}
|
||||
+ case DEFERRED_CSSETSAMPLERS:
|
||||
+ {
|
||||
+ ID3D11DeviceContext_CSSetSamplers(iface, call->samplers_info.start_slot,
|
||||
+ call->samplers_info.num_samplers, call->samplers_info.samplers);
|
||||
+ break;
|
||||
+ }
|
||||
case DEFERRED_DSSETSAMPLERS:
|
||||
{
|
||||
ID3D11DeviceContext_DSSetSamplers(iface, call->samplers_info.start_slot,
|
||||
@@ -4475,8 +4483,12 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_CSSetShader(ID3D11DeviceCon
|
||||
static void STDMETHODCALLTYPE d3d11_deferred_context_CSSetSamplers(ID3D11DeviceContext *iface,
|
||||
UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers)
|
||||
{
|
||||
- FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n",
|
||||
+ struct d3d11_deferred_context *context = impl_from_deferred_ID3D11DeviceContext(iface);
|
||||
+
|
||||
+ TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n",
|
||||
iface, start_slot, sampler_count, samplers);
|
||||
+
|
||||
+ add_deferred_set_samplers(context, DEFERRED_CSSETSAMPLERS, start_slot, sampler_count, samplers);
|
||||
}
|
||||
|
||||
static void STDMETHODCALLTYPE d3d11_deferred_context_CSSetConstantBuffers(ID3D11DeviceContext *iface,
|
||||
--
|
||||
2.13.1
|
||||
|
@@ -0,0 +1,69 @@
|
||||
From 68c90b8a153575c328197c9d18dfee3a8f88fb37 Mon Sep 17 00:00:00 2001
|
||||
From: Kimmo Myllyvirta <kimmo.myllyvirta@gmail.com>
|
||||
Date: Fri, 7 Jul 2017 11:19:27 +0300
|
||||
Subject: d3d11: Implement GSSetSamplers for deferred contexts.
|
||||
|
||||
---
|
||||
dlls/d3d11/device.c | 17 +++++++++++++++--
|
||||
1 file changed, 15 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
|
||||
index 1fe04efa5c3..1af93c4a99a 100644
|
||||
--- a/dlls/d3d11/device.c
|
||||
+++ b/dlls/d3d11/device.c
|
||||
@@ -56,6 +56,7 @@ enum deferred_cmd
|
||||
|
||||
DEFERRED_CSSETSAMPLERS, /* samplers_info */
|
||||
DEFERRED_DSSETSAMPLERS, /* samplers_info */
|
||||
+ DEFERRED_GSSETSAMPLERS, /* samplers_info */
|
||||
DEFERRED_PSSETSAMPLERS, /* samplers_info */
|
||||
|
||||
DEFERRED_CSSETCONSTANTBUFFERS, /* constant_buffers_info */
|
||||
@@ -295,7 +296,8 @@ static void add_deferred_set_shader_resources(struct d3d11_deferred_context *con
|
||||
}
|
||||
}
|
||||
|
||||
-/* for DEFERRED_CSSETSAMPLERS, DEFERRED_DSSETSAMPLERS and DEFERRED_PSSETSAMPLERS */
|
||||
+/* for DEFERRED_CSSETSAMPLERS, DEFERRED_DSSETSAMPLERS, DEFERRED_GSSETSAMPLERS and
|
||||
+ * DEFERRED_PSSETSAMPLERS */
|
||||
static void add_deferred_set_samplers(struct d3d11_deferred_context *context, enum deferred_cmd cmd,
|
||||
UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers)
|
||||
{
|
||||
@@ -457,6 +459,7 @@ static void free_deferred_calls(struct list *commands)
|
||||
}
|
||||
case DEFERRED_CSSETSAMPLERS:
|
||||
case DEFERRED_DSSETSAMPLERS:
|
||||
+ case DEFERRED_GSSETSAMPLERS:
|
||||
case DEFERRED_PSSETSAMPLERS:
|
||||
{
|
||||
for (i = 0; i < call->samplers_info.num_samplers; i++)
|
||||
@@ -670,6 +673,12 @@ static void exec_deferred_calls(ID3D11DeviceContext *iface, struct list *command
|
||||
call->samplers_info.num_samplers, call->samplers_info.samplers);
|
||||
break;
|
||||
}
|
||||
+ case DEFERRED_GSSETSAMPLERS:
|
||||
+ {
|
||||
+ ID3D11DeviceContext_GSSetSamplers(iface, call->samplers_info.start_slot,
|
||||
+ call->samplers_info.num_samplers, call->samplers_info.samplers);
|
||||
+ break;
|
||||
+ }
|
||||
case DEFERRED_PSSETSAMPLERS:
|
||||
{
|
||||
ID3D11DeviceContext_PSSetSamplers(iface, call->samplers_info.start_slot,
|
||||
@@ -4033,8 +4042,12 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetShaderResources(ID3D11
|
||||
static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetSamplers(ID3D11DeviceContext *iface,
|
||||
UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers)
|
||||
{
|
||||
- FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n",
|
||||
+ struct d3d11_deferred_context *context = impl_from_deferred_ID3D11DeviceContext(iface);
|
||||
+
|
||||
+ TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n",
|
||||
iface, start_slot, sampler_count, samplers);
|
||||
+
|
||||
+ add_deferred_set_samplers(context, DEFERRED_GSSETSAMPLERS, start_slot, sampler_count, samplers);
|
||||
}
|
||||
|
||||
static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargets(ID3D11DeviceContext *iface,
|
||||
--
|
||||
2.13.1
|
||||
|
@@ -0,0 +1,70 @@
|
||||
From 31741559091edb33262d99539c25c8083ec9da7a Mon Sep 17 00:00:00 2001
|
||||
From: Kimmo Myllyvirta <kimmo.myllyvirta@gmail.com>
|
||||
Date: Fri, 7 Jul 2017 11:21:32 +0300
|
||||
Subject: d3d11: Implement HSSetSamplers for deferred contexts.
|
||||
|
||||
---
|
||||
dlls/d3d11/device.c | 18 +++++++++++++++---
|
||||
1 file changed, 15 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
|
||||
index 1af93c4a99a..1408cf9450b 100644
|
||||
--- a/dlls/d3d11/device.c
|
||||
+++ b/dlls/d3d11/device.c
|
||||
@@ -57,6 +57,7 @@ enum deferred_cmd
|
||||
DEFERRED_CSSETSAMPLERS, /* samplers_info */
|
||||
DEFERRED_DSSETSAMPLERS, /* samplers_info */
|
||||
DEFERRED_GSSETSAMPLERS, /* samplers_info */
|
||||
+ DEFERRED_HSSETSAMPLERS, /* samplers_info */
|
||||
DEFERRED_PSSETSAMPLERS, /* samplers_info */
|
||||
|
||||
DEFERRED_CSSETCONSTANTBUFFERS, /* constant_buffers_info */
|
||||
@@ -296,8 +297,8 @@ static void add_deferred_set_shader_resources(struct d3d11_deferred_context *con
|
||||
}
|
||||
}
|
||||
|
||||
-/* for DEFERRED_CSSETSAMPLERS, DEFERRED_DSSETSAMPLERS, DEFERRED_GSSETSAMPLERS and
|
||||
- * DEFERRED_PSSETSAMPLERS */
|
||||
+/* for DEFERRED_CSSETSAMPLERS, DEFERRED_DSSETSAMPLERS, DEFERRED_GSSETSAMPLERS,
|
||||
+ * DEFERRED_HSSETSAMPLERS and DEFERRED_PSSETSAMPLERS */
|
||||
static void add_deferred_set_samplers(struct d3d11_deferred_context *context, enum deferred_cmd cmd,
|
||||
UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers)
|
||||
{
|
||||
@@ -460,6 +461,7 @@ static void free_deferred_calls(struct list *commands)
|
||||
case DEFERRED_CSSETSAMPLERS:
|
||||
case DEFERRED_DSSETSAMPLERS:
|
||||
case DEFERRED_GSSETSAMPLERS:
|
||||
+ case DEFERRED_HSSETSAMPLERS:
|
||||
case DEFERRED_PSSETSAMPLERS:
|
||||
{
|
||||
for (i = 0; i < call->samplers_info.num_samplers; i++)
|
||||
@@ -679,6 +681,12 @@ static void exec_deferred_calls(ID3D11DeviceContext *iface, struct list *command
|
||||
call->samplers_info.num_samplers, call->samplers_info.samplers);
|
||||
break;
|
||||
}
|
||||
+ case DEFERRED_HSSETSAMPLERS:
|
||||
+ {
|
||||
+ ID3D11DeviceContext_HSSetSamplers(iface, call->samplers_info.start_slot,
|
||||
+ call->samplers_info.num_samplers, call->samplers_info.samplers);
|
||||
+ break;
|
||||
+ }
|
||||
case DEFERRED_PSSETSAMPLERS:
|
||||
{
|
||||
ID3D11DeviceContext_PSSetSamplers(iface, call->samplers_info.start_slot,
|
||||
@@ -4374,8 +4382,12 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetShader(ID3D11DeviceCon
|
||||
static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetSamplers(ID3D11DeviceContext *iface,
|
||||
UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers)
|
||||
{
|
||||
- FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n",
|
||||
+ struct d3d11_deferred_context *context = impl_from_deferred_ID3D11DeviceContext(iface);
|
||||
+
|
||||
+ TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n",
|
||||
iface, start_slot, sampler_count, samplers);
|
||||
+
|
||||
+ add_deferred_set_samplers(context, DEFERRED_HSSETSAMPLERS, start_slot, sampler_count, samplers);
|
||||
}
|
||||
|
||||
static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetConstantBuffers(ID3D11DeviceContext *iface,
|
||||
--
|
||||
2.13.1
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user