Compare commits

...

63 Commits
v2.11 ... v2.13

Author SHA1 Message Date
Sebastian Lackner
d943e0bd51 Release 2.13. 2017-07-25 05:51:25 +02:00
Sebastian Lackner
67ebee7f44 Fix typo in a patch directory. 2017-07-25 05:50:36 +02:00
Sebastian Lackner
91424695c4 winedevice-Default_Drivers: Synchronize spec file. 2017-07-25 03:54:15 +02:00
Sebastian Lackner
7b07cb08f5 Added patch to reduce the cursor height if it also includes the mask. 2017-07-24 23:55:24 +02:00
Sebastian Lackner
4d2afbf14b Added patch to implement support for indirect drawing / compute shader dispatching. 2017-07-24 20:41:34 +02:00
Sebastian Lackner
f47fa538c5 Added patch to fix context backup window handling. 2017-07-24 18:58:35 +02:00
Sebastian Lackner
e866c7f3e1 server-Debug_Registers: Don't abort thread creation when set_thread_context fails. 2017-07-24 17:41:20 +02:00
Sebastian Lackner
b539f0f369 Added patch to implement copying structure count of UAV. 2017-07-24 16:22:58 +02:00
Sebastian Lackner
f5e96b9a37 Added patch to implement support for all d3d11 color write masks in wined3d. 2017-07-24 00:41:59 +02:00
Sebastian Lackner
7a242b50e4 Added patch with stub implementation for DXGI_PRESENT_TEST. 2017-07-23 21:41:02 +02:00
Sebastian Lackner
9921dc7846 Improve formatting in CONTRIBUTING.md. 2017-07-23 21:35:49 +02:00
Sebastian Lackner
1a4ebb027f wined3d-Copy_Resource_Typeless: Add reference to bug report. 2017-07-23 21:33:18 +02:00
Sebastian Lackner
3bf7fe4763 Added patch to improve heap allocation performance. 2017-07-23 20:49:44 +02:00
Sebastian Lackner
eeb6529b09 d3dx9_36-D3DXOptimizeVertices: Merge some style improvements. 2017-07-23 20:42:10 +02:00
Sebastian Lackner
2cb3198298 Added patch to implement support for conservative depth access in SM4 shaders. 2017-07-23 04:26:33 +02:00
Sebastian Lackner
69e273a07f Added patch to implement stub for several setsockopt options. 2017-07-22 05:25:14 +02:00
Sebastian Lackner
60870e076f Added patch to implement LdrRegisterDllNotification/LdrUnregisterDllNotification. 2017-07-22 05:03:41 +02:00
Sebastian Lackner
c8a8ef48e5 Add a separate CONTRIBUTING.md. 2017-07-22 04:07:01 +02:00
Constantine Kharlamov
be9feb4570 advapi-LsaLookupPrivilegeName: check for pointer in WellKnownPrivNames.
Fixes a crash in Dead Space

Signed-off-by: Constantine Kharlamov <Hi-Angel@yandex.ru>
2017-07-22 02:57:42 +02:00
Sebastian Lackner
62ae507b36 Rebase against 7d3c068c3beeac8691cfa96f0dce6b5583072eaa. 2017-07-22 01:14:10 +02:00
Sebastian Lackner
5ec57827af d3dx9_36-D3DXOptimizeVertices: Add a missing test-only patch. 2017-07-21 04:24:04 +02:00
Sebastian Lackner
d0dccc7b7e Added patch to recognize SM4 nop opcode. 2017-07-21 04:01:19 +02:00
Sebastian Lackner
4e031ef171 Added patch to hold CS while iterating through rpcrt4 protseqs list. 2017-07-21 03:18:46 +02:00
Sebastian Lackner
60d4b6fe21 wined3d-Copy_Resource_Typeless: Add dependency on wined3d-1DTextures. 2017-07-21 02:55:02 +02:00
Sebastian Lackner
8706a334ad Added patch to implement support for start instance in draw_primitive_arrays. 2017-07-20 15:24:23 +02:00
Sebastian Lackner
43f5b05fd5 Rebase against 5a61913e90e3725d08c0e1fd06ccfe936434cbcc. 2017-07-20 03:09:05 +02:00
Sebastian Lackner
a05970ca53 Rebase against 9118512135a1aac6969bf575a0656855ba84ef11. 2017-07-19 13:21:54 +02:00
Sebastian Lackner
d9d149f369 Rebase against a8b5fdda3214e4fd52682aefaa093cd45766580e. 2017-07-18 11:29:09 +02:00
Sebastian Lackner
e2dbf3ab7e Added patch to fix regression related to interface bind handling. 2017-07-18 11:27:34 +02:00
Sebastian Lackner
fe97269c92 Added patch to implement semi-stub for D3DXOptimizeVertices. 2017-07-17 15:24:11 +02:00
Sebastian Lackner
c99cdb85d7 Added patch to prevent a possible nullptr dereference in SHGetFileInfoW. 2017-07-17 15:10:03 +02:00
Sebastian Lackner
020888539d Added patch to use assembly wrapper to call OnVoiceProcessingPassStart callback. 2017-07-15 23:17:29 +02:00
Sebastian Lackner
b8ffc62855 kernel32-UmsStubs: Add a reference to a bug report. 2017-07-15 21:34:07 +02:00
Sebastian Lackner
dc531c457c Added patch to implement FreePhysicalMemory in Win32_OperatingSystem wbemprox class. 2017-07-15 20:38:36 +02:00
Sebastian Lackner
08cd599f17 Added patch to avoid possible deadlock in dinput when CS are acquired in different order. 2017-07-15 20:14:50 +02:00
Sebastian Lackner
bfef128732 Added patch for nvapi d3d11 CreateDevice/CreateDeviceAndSwapChain implementation. 2017-07-14 22:39:13 +02:00
Sebastian Lackner
201e62615e Rebase against ab313dd3beb7e495b36f8320ffc2354b9c854d51. 2017-07-14 08:09:51 +02:00
Sebastian Lackner
c852826507 Rebase against 989a9dc91778c94d0cf0c769709f10dcc92a5ead. 2017-07-13 01:42:44 +02:00
Sebastian Lackner
c1b18bc491 wined3d-Copy_Resource_Typeless: Add reference to bug report. 2017-07-12 22:27:09 +02:00
Sebastian Lackner
edcc6684ad dwmapi-DwmSetIcon: Add reference to bug report. 2017-07-12 22:23:39 +02:00
Sebastian Lackner
96a77f3ae2 Rebase against 437c6674b06663908472d31ed68fcab6e2fdd5f7. 2017-07-12 12:56:45 +02:00
Sebastian Lackner
4c1a8684a0 Rebase against 35f82ba444930b770684f0bd623c505d52c7b58f. 2017-07-12 12:22:15 +02:00
Sebastian Lackner
3ebda6fa93 Release 2.12. 2017-07-12 00:37:59 +02:00
Sebastian Lackner
8d2edd8de8 Added patch to implement stubs for DwmSetIconicLivePreviewBitmap and DwmSetIconicThumbnail. 2017-07-12 00:11:18 +02:00
Sebastian Lackner
e3b7fd770e Added patch to emulate textureLod(samplerCubeShadow, ...) in wined3d using shadowCubeGrad. 2017-07-11 22:21:35 +02:00
Sebastian Lackner
e2a70628df Added patch to implement copying resources between compatible formats. 2017-07-11 19:26:35 +02:00
Sebastian Lackner
a5daeb1e36 advapi-LsaLookupPrivilegeName: Add reference to bug report. 2017-07-11 17:39:07 +02:00
Sebastian Lackner
eed8160b22 Added patch to use OpenGL core context for D3D10/11 when necessary. 2017-07-11 17:36:27 +02:00
Sebastian Lackner
996d9ab307 Added patch to set return size when calling WSAIoctl with WS_SIO_GET_EXTENSION_FUNCTION_POINTER. 2017-07-11 16:16:42 +02:00
Sebastian Lackner
325f3758f8 Added patch to implement support for more d3d11 depth options in RSSetState. 2017-07-11 16:05:19 +02:00
Sebastian Lackner
ad2d0fdc3a Added patch to fix race condition in d3d11 state_init functions. 2017-07-11 15:06:31 +02:00
Sebastian Lackner
5e62fbb2d0 Added patch to implement NvAPI_D3D11_SetDepthBoundsTest. 2017-07-11 15:06:31 +02:00
Sebastian Lackner
0211a4935e Added patches to implement various deferred context methods. 2017-07-09 16:44:56 +02:00
Sebastian Lackner
a59a69804a Revert upstream patch which broke in-game audio in multiple games. 2017-07-09 16:11:14 +02:00
Sebastian Lackner
55b5c61703 Added patch to avoid calling RegCloseKey on uninitialized memory. 2017-07-09 16:01:31 +02:00
Sebastian Lackner
8b3a73a4df Rebase against a94938819280aa52fbc545911ca70a6c3a83ab49. 2017-07-09 05:59:05 +02:00
Sebastian Lackner
f9ad524910 Rebase against 9f16e42e209f1afb6918ee8821a42f0438cf9c3b. 2017-07-09 05:47:38 +02:00
Sebastian Lackner
68d0ea3a19 Rebase against 4e2c0444121d341bac9bc841ab6662fceeb42c1a. 2017-07-08 23:09:53 +02:00
Sebastian Lackner
00969f9cd8 Rebase against 287be7c5ee5ed4d070d93209c6cd355be6ed46da. 2017-07-08 22:37:18 +02:00
Sebastian Lackner
de4694c81b Rebase against 7e1522cdd69587b59f97a3b3c755cef40a52070e. 2017-07-08 16:11:26 +02:00
Sebastian Lackner
b888a45d12 Rebase against 0e0834ae92291e9857ed01f3cb116240abda642b. 2017-07-03 04:22:05 +02:00
Sebastian Lackner
46514b9952 Rebase against 08df007e802dfa2845a5b4f33bbf8a04202258bb. 2017-07-03 00:08:58 +02:00
Sebastian Lackner
de09d74c97 Rebase against 73af2479c7107f6157cabdd24dc1e0fe47fbbb1e. 2017-07-03 00:00:08 +02:00
121 changed files with 8413 additions and 1897 deletions

30
CONTRIBUTING.md Normal file
View File

@@ -0,0 +1,30 @@
Contributing to Wine Staging
----------------------------
First of all, thank you for taking the time to contribute to this project.
### Reporting bugs
Since WineConf 2015 Wine Staging is an official part of WineHQ, which means you
can report problems directly at [bugs.winehq.org](https://bugs.winehq.org/).
Most of the time bugs found in Wine Staging also turn out to be present in the
development branch, so its recommended to open your bug in the "Wine" product,
unless you are sure its really "Wine Staging" specific. For bugs related to our
binary packages, please open a bug report in the "Packaging" product.
### Submitting patches
**IMPORTANT:** Please use [dev.wine-staging.com](https://dev.wine-staging.com/patches)
for patch submissions, we currently do not accept Pull requests on GitHub.
Wine Staging mainly concentrates on experimental features and patches which are
difficult to get into the development branch. If you have a very simple bug fix
including tests, there is usually no need to send it to Wine Staging. You can
directly contribute it to the
[development branch](http://wiki.winehq.org/SubmittingPatches). However, if you
already tried that without success, or are working on such a complex area that
you do not really think its ready for inclusion, you might want to submit it to
our Staging tree. Please open a patch submission request on
[dev.wine-staging.com](https://dev.wine-staging.com/patches) including the patch.
More information is also available in our
[Wiki](https://wiki.winehq.org/Wine-Staging_Patches).

View File

@@ -24,16 +24,6 @@ other wine-specific programs like `winecfg`. To learn more about how to use
Wine Staging, please take a look at the
[usage instructions](https://github.com/wine-compholio/wine-staging/wiki/Usage).
Reporting bugs
--------------
Since WineConf 2015 Wine Staging is an official part of WineHQ, which means you
can report problems directly at https://bugs.winehq.org/. Most of the time bugs
found in Wine Staging also turn out to be present in the development branch, so
its recommended to open your bug in the "Wine" product, unless you are sure its
really "Wine Staging" specific. For problems with our binary packages, please
also open a bug report there.
Building
--------
@@ -88,14 +78,5 @@ in our [Wiki](https://github.com/wine-compholio/wine-staging/wiki/Packaging).
Contributing
------------
Wine Staging mainly concentrates on experimental features and patches which are
difficult to get into the development branch. If you have a very simple bug fix
including tests, there is usually no need to send it to Wine Staging. You can
directly contribute it to the
[development branch](http://wiki.winehq.org/SubmittingPatches). However, if you
already tried that without success, or are working on such a complex area that
you do not really think its ready for inclusion, you might want to submit it to
our Staging tree. Please open a patch submission request on
[bugs.wine-staging.com](https://bugs.wine-staging.com/) including the patch.
More information is also available in our
[Wiki](https://github.com/wine-compholio/wine-staging/wiki/Contributing).
Please see CONTRIBUTING.md for more information about contributing to Wine
Staging.

View File

@@ -1,15 +1,14 @@
From b6b1e5da04ed867251253410e37d412109a4cec2 Mon Sep 17 00:00:00 2001
From cd34de81164087b3593d0ec9416e2f157a5df40d Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Fri, 8 Aug 2014 19:33:14 -0600
Subject: Appease the blessed version of gcc (4.5) when -Werror is enabled.
---
dlls/d3d9/tests/visual.c | 2 +-
dlls/netapi32/netapi32.c | 2 +-
dlls/winealsa.drv/mmdevdrv.c | 2 +-
dlls/wined3d/glsl_shader.c | 2 +-
tools/makedep.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
dlls/d3d9/tests/visual.c | 2 +-
dlls/netapi32/netapi32.c | 2 +-
dlls/wined3d/glsl_shader.c | 2 +-
tools/makedep.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index c8a6a1fa5a8..0261d3708e6 100644
@@ -37,24 +36,11 @@ index 278d4528b01..1c5f110b828 100644
NET_API_STATUS status;
if (servername && !(server = strdup_unixcp( servername ))) return ERROR_OUTOFMEMORY;
diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c
index 2ecb111e218..b285705509c 100644
--- a/dlls/winealsa.drv/mmdevdrv.c
+++ b/dlls/winealsa.drv/mmdevdrv.c
@@ -359,7 +359,7 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha
{
WCHAR *ret;
const WCHAR *prefix;
- DWORD len_wchars = 0, chunk1_len, copied = 0, prefix_len;
+ DWORD len_wchars = 0, chunk1_len = 0, copied = 0, prefix_len;
static const WCHAR dashW[] = {' ','-',' ',0};
static const size_t dashW_len = (sizeof(dashW) / sizeof(*dashW)) - 1;
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index ce960853362..f4275d8dd48 100644
index f96f48d97d1..8fe3318cd78 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -9316,7 +9316,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
@@ -9721,7 +9721,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
GLuint ds_id = 0;
GLuint gs_id = 0;
GLuint ps_id = 0;
@@ -64,7 +50,7 @@ index ce960853362..f4275d8dd48 100644
struct wined3d_string_buffer *tmp_name;
diff --git a/tools/makedep.c b/tools/makedep.c
index add722f80a9..24b06bbfcb2 100644
index 296356b0a57..5a2873b56f1 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -1608,7 +1608,7 @@ static const char *get_make_variable( const struct makefile *make, const char *n
@@ -77,5 +63,5 @@ index add722f80a9..24b06bbfcb2 100644
var = get_make_variable( make, name );
if (!var) return NULL;
--
2.12.2
2.13.1

View File

@@ -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

View File

@@ -1,4 +1,4 @@
From bee5e0baac722c66ad8c1034a65a2cecfe74716e Mon Sep 17 00:00:00 2001
From fcefc5661656de44d02fed0431b4a61fa618b663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 5 Mar 2017 23:50:06 +0100
Subject: advapi32: Implement LsaLookupPrivilegeName.
@@ -6,13 +6,13 @@ Subject: advapi32: Implement LsaLookupPrivilegeName.
---
dlls/advapi32/advapi32.spec | 2 +-
dlls/advapi32/advapi32_misc.h | 2 ++
dlls/advapi32/lsa.c | 38 ++++++++++++++++++++++++++++++++++++++
dlls/advapi32/lsa.c | 39 +++++++++++++++++++++++++++++++++++++++
dlls/advapi32/security.c | 27 ++++++++++++++++++---------
include/ntsecapi.h | 1 +
5 files changed, 60 insertions(+), 10 deletions(-)
5 files changed, 61 insertions(+), 10 deletions(-)
diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
index 078bb8fc25..124f527282 100644
index d5503490a0..709a385967 100644
--- a/dlls/advapi32/advapi32.spec
+++ b/dlls/advapi32/advapi32.spec
@@ -469,7 +469,7 @@
@@ -36,10 +36,10 @@ index d116ecb836..ecb07f635a 100644
+
#endif /* __WINE_ADVAPI32MISC_H */
diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
index 479201bfc1..ceb3b05c05 100644
index 3da6d19b82..af5f9dd46d 100644
--- a/dlls/advapi32/lsa.c
+++ b/dlls/advapi32/lsa.c
@@ -973,3 +973,41 @@ NTSTATUS WINAPI LsaUnregisterPolicyChangeNotification(
@@ -973,3 +973,42 @@ NTSTATUS WINAPI LsaUnregisterPolicyChangeNotification(
FIXME("(%d,%p) stub\n", class, event);
return STATUS_SUCCESS;
}
@@ -67,7 +67,8 @@ index 479201bfc1..ceb3b05c05 100644
+
+ if (lpLuid->HighPart ||
+ (lpLuid->LowPart < SE_MIN_WELL_KNOWN_PRIVILEGE ||
+ lpLuid->LowPart > SE_MAX_WELL_KNOWN_PRIVILEGE))
+ lpLuid->LowPart > SE_MAX_WELL_KNOWN_PRIVILEGE ||
+ !WellKnownPrivNames[lpLuid->LowPart]))
+ return STATUS_NO_SUCH_PRIVILEGE;
+
+ priv_size = (strlenW(WellKnownPrivNames[lpLuid->LowPart]) + 1) * sizeof(WCHAR);
@@ -158,5 +159,5 @@ index 2bb3d312e4..0bf0eca43e 100644
ULONG WINAPI LsaNtStatusToWinError(NTSTATUS);
NTSTATUS WINAPI LsaOpenPolicy(PLSA_UNICODE_STRING,PLSA_OBJECT_ATTRIBUTES,ACCESS_MASK,PLSA_HANDLE);
--
2.11.0
2.13.1

View File

@@ -1 +1 @@
Fixes: Add LsaLookupPrivilege[Display]Name stubs
Fixes: [43316] Add LsaLookupPrivilege[Display]Name stubs

View File

@@ -1,4 +1,4 @@
From 13a60cc5ea59cc2f18ac19888fe51628f9f0774a Mon Sep 17 00:00:00 2001
From 393f8906d8b26414fb4fc89c692cb5247be6b4c2 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Fri, 16 Dec 2016 13:23:15 +0800
Subject: advapi32/tests: Add a test that compares a well-known SID to a SID
@@ -9,7 +9,7 @@ Subject: advapi32/tests: Add a test that compares a well-known SID to a SID
1 file changed, 92 insertions(+), 38 deletions(-)
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 18f4e04..4e1f53b 100644
index dfe2f871d42..808547ddbc0 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -2,7 +2,7 @@
@@ -36,7 +36,7 @@ index 18f4e04..4e1f53b 100644
#define SID_SLOTS 4
static char debugsid_str[SID_SLOTS][256];
static int debugsid_index = 0;
@@ -175,12 +167,6 @@ static const char* debugstr_sid(PSID sid)
@@ -174,12 +166,6 @@ static const char* debugstr_sid(PSID sid)
return res;
}
@@ -135,7 +135,7 @@ index 18f4e04..4e1f53b 100644
- LPSTR str = NULL;
+ LPSTR str;
if( !pConvertSidToStringSidA || !pConvertStringSidToSidA )
if( !pConvertStringSidToSidA )
{
@@ -402,7 +428,7 @@ static void test_sid(void)
}
@@ -167,7 +167,7 @@ index 18f4e04..4e1f53b 100644
if (r)
{
- if ((winetest_debug > 1) && (pConvertSidToStringSidA(psid, &temp)))
- if ((winetest_debug > 1) && (ConvertSidToStringSidA(psid, &temp)))
+ char buf[SECURITY_MAX_SID_SIZE];
+ char *sid_string, *well_known_sid_string;
+ DWORD n, size;
@@ -182,7 +182,7 @@ index 18f4e04..4e1f53b 100644
+ *GetSidSubAuthority(psid, n) = 0;
}
+
+ r = pConvertSidToStringSidA(psid, &sid_string);
+ r = ConvertSidToStringSidA(psid, &sid_string);
+ ok(r, "%s: ConvertSidToStringSid error %u\n", strsid_table[i].str, GetLastError());
+ if (winetest_debug > 1)
+ trace("%s => %s\n", strsid_table[i].str, sid_string);
@@ -191,7 +191,7 @@ index 18f4e04..4e1f53b 100644
+ r = pCreateWellKnownSid(strsid_table[i].sid_type, domain_sid, buf, &size);
+ ok(r, "%u: CreateWellKnownSid(%u) error %u\n", i, strsid_table[i].sid_type, GetLastError());
+
+ r = pConvertSidToStringSidA(buf, &well_known_sid_string);
+ r = ConvertSidToStringSidA(buf, &well_known_sid_string);
+ ok(r, "%u: ConvertSidToStringSi(%u) error %u\n", i, strsid_table[i].sid_type, GetLastError());
+ if (winetest_debug > 1)
+ trace("%u => %s\n", strsid_table[i].sid_type, well_known_sid_string);
@@ -214,7 +214,7 @@ index 18f4e04..4e1f53b 100644
static void test_trustee(void)
@@ -2288,7 +2342,7 @@ static void test_LookupAccountSid(void)
if (pCreateWellKnownSid && pConvertSidToStringSidA)
if (pCreateWellKnownSid)
{
trace("Well Known SIDs:\n");
- for (i = 0; i <= 60; i++)
@@ -223,5 +223,5 @@ index 18f4e04..4e1f53b 100644
size = SECURITY_MAX_SID_SIZE;
if (pCreateWellKnownSid(i, NULL, &max_sid.sid, &size))
--
2.9.0
2.13.1

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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