November 2021 - Wine-commits

Thomas Faber : dbghelp: Use . instead of concrete path for search path.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: bb2802984dac940b0b8f91f64e67d3f4bf2b78e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb2802984dac940b0b8f91f6… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Nov 12 18:17:53 2021 -0500 dbghelp: Use . instead of concrete path for search path. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 45 +++++++++++++++++++++++++------------------- dlls/dbghelp/tests/dbghelp.c | 4 ---- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 428ea10e2d3..063fe4cdc6d 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -178,29 +178,36 @@ struct cpu* cpu_find(DWORD machine) static WCHAR* make_default_search_path(void) { WCHAR* search_path; - unsigned size; - unsigned len; - - search_path = HeapAlloc(GetProcessHeap(), 0, (len = MAX_PATH) * sizeof(WCHAR)); - while ((size = GetCurrentDirectoryW(len, search_path)) >= len) - search_path = HeapReAlloc(GetProcessHeap(), 0, search_path, (len *= 2) * sizeof(WCHAR)); - search_path = HeapReAlloc(GetProcessHeap(), 0, search_path, (size + 1) * sizeof(WCHAR)); - - len = GetEnvironmentVariableW(L"_NT_SYMBOL_PATH", NULL, 0); - if (len) + WCHAR* p; + unsigned sym_path_len; + unsigned alt_sym_path_len; + + sym_path_len = GetEnvironmentVariableW(L"_NT_SYMBOL_PATH", NULL, 0); + alt_sym_path_len = GetEnvironmentVariableW(L"_NT_ALTERNATE_SYMBOL_PATH", NULL, 0); + + /* The default symbol path is ".[;%_NT_SYMBOL_PATH%][;%_NT_ALTERNATE_SYMBOL_PATH%]". + * If the variables exist, the lengths include a null-terminator. We use that + * space for the semicolons, and only add the initial dot and the final null. */ + search_path = HeapAlloc(GetProcessHeap(), 0, + (1 + sym_path_len + alt_sym_path_len + 1) * sizeof(WCHAR)); + if (!search_path) return NULL; + + p = search_path; + *p++ = L'.'; + if (sym_path_len) { - search_path = HeapReAlloc(GetProcessHeap(), 0, search_path, (size + 1 + len + 1) * sizeof(WCHAR)); - search_path[size] = ';'; - GetEnvironmentVariableW(L"_NT_SYMBOL_PATH", search_path + size + 1, len); - size += 1 + len; + *p++ = L';'; + GetEnvironmentVariableW(L"_NT_SYMBOL_PATH", p, sym_path_len); + p += sym_path_len - 1; } - len = GetEnvironmentVariableW(L"_NT_ALTERNATE_SYMBOL_PATH", NULL, 0); - if (len) + + if (alt_sym_path_len) { - search_path = HeapReAlloc(GetProcessHeap(), 0, search_path, (size + 1 + len + 1) * sizeof(WCHAR)); - search_path[size] = ';'; - GetEnvironmentVariableW(L"_NT_ALTERNATE_SYMBOL_PATH", search_path + size + 1, len); + *p++ = L';'; + GetEnvironmentVariableW(L"_NT_ALTERNATE_SYMBOL_PATH", p, alt_sym_path_len); + p += alt_sym_path_len - 1; } + *p = L'\0'; return search_path; } diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 06c21ec288c..a42e83aa2c8 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -141,7 +141,6 @@ static void test_search_path(void) * We unset both variables earlier so should simply get "." */ ret = SymGetSearchPath(GetCurrentProcess(), search_path, ARRAY_SIZE(search_path)); ok(ret == TRUE, "ret = %d\n", ret); - todo_wine ok(!strcmp(search_path, "."), "Got search path '%s', expected '.'\n", search_path); /* Set an arbitrary search path */ @@ -156,7 +155,6 @@ static void test_search_path(void) ok(ret == TRUE, "ret = %d\n", ret); ret = SymGetSearchPath(GetCurrentProcess(), search_path, ARRAY_SIZE(search_path)); ok(ret == TRUE, "ret = %d\n", ret); - todo_wine ok(!strcmp(search_path, "."), "Got search path '%s', expected '.'\n", search_path); /* With _NT_SYMBOL_PATH */ @@ -165,7 +163,6 @@ static void test_search_path(void) ok(ret == TRUE, "ret = %d\n", ret); ret = SymGetSearchPath(GetCurrentProcess(), search_path, ARRAY_SIZE(search_path)); ok(ret == TRUE, "ret = %d\n", ret); - todo_wine ok(!strcmp(search_path, ".;X:\\"), "Got search path '%s', expected '.;X:\\'\n", search_path); /* With both _NT_SYMBOL_PATH and _NT_ALT_SYMBOL_PATH */ @@ -192,7 +189,6 @@ static void test_search_path(void) ok(ret == TRUE, "ret = %d\n", ret); ret = SymGetSearchPath(GetCurrentProcess(), search_path, ARRAY_SIZE(search_path)); ok(ret == TRUE, "ret = %d\n", ret); - todo_wine ok(!strcmp(search_path, "."), "Got search path '%s', expected '.'\n", search_path); }

1 0

Thomas Faber : dbghelp: Use _NT_ALT_SYMBOL_PATH.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: 40dfd9b8b140490604eaae1ccb3abcb14ce12db3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40dfd9b8b140490604eaae1c… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Nov 12 20:17:01 2021 -0500 dbghelp: Use _NT_ALT_SYMBOL_PATH. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 6 +++--- dlls/dbghelp/tests/dbghelp.c | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 063fe4cdc6d..d854f6287a0 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -183,9 +183,9 @@ static WCHAR* make_default_search_path(void) unsigned alt_sym_path_len; sym_path_len = GetEnvironmentVariableW(L"_NT_SYMBOL_PATH", NULL, 0); - alt_sym_path_len = GetEnvironmentVariableW(L"_NT_ALTERNATE_SYMBOL_PATH", NULL, 0); + alt_sym_path_len = GetEnvironmentVariableW(L"_NT_ALT_SYMBOL_PATH", NULL, 0); - /* The default symbol path is ".[;%_NT_SYMBOL_PATH%][;%_NT_ALTERNATE_SYMBOL_PATH%]". + /* The default symbol path is ".[;%_NT_SYMBOL_PATH%][;%_NT_ALT_SYMBOL_PATH%]". * If the variables exist, the lengths include a null-terminator. We use that * space for the semicolons, and only add the initial dot and the final null. */ search_path = HeapAlloc(GetProcessHeap(), 0, @@ -204,7 +204,7 @@ static WCHAR* make_default_search_path(void) if (alt_sym_path_len) { *p++ = L';'; - GetEnvironmentVariableW(L"_NT_ALTERNATE_SYMBOL_PATH", p, alt_sym_path_len); + GetEnvironmentVariableW(L"_NT_ALT_SYMBOL_PATH", p, alt_sym_path_len); p += alt_sym_path_len - 1; } *p = L'\0'; diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index a42e83aa2c8..b7e828281cd 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -171,7 +171,6 @@ static void test_search_path(void) ok(ret == TRUE, "ret = %d\n", ret); ret = SymGetSearchPath(GetCurrentProcess(), search_path, ARRAY_SIZE(search_path)); ok(ret == TRUE, "ret = %d\n", ret); - todo_wine ok(!strcmp(search_path, ".;X:\\;Y:\\"), "Got search path '%s', expected '.;X:\\;Y:\\'\n", search_path); /* With just _NT_ALT_SYMBOL_PATH */ @@ -180,7 +179,6 @@ static void test_search_path(void) ok(ret == TRUE, "ret = %d\n", ret); ret = SymGetSearchPath(GetCurrentProcess(), search_path, ARRAY_SIZE(search_path)); ok(ret == TRUE, "ret = %d\n", ret); - todo_wine ok(!strcmp(search_path, ".;Y:\\"), "Got search path '%s', expected '.;Y:\\'\n", search_path); /* Restore original search path */

1 0

Nikolay Sivov : d3d10/effect: Add initial support for indexing expressions.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: a4fe643920f3f66602fff75cd0887e360c460c49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4fe643920f3f66602fff75c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 9 14:39:41 2021 +0300 d3d10/effect: Add initial support for indexing expressions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 595 +++++++++++++++++++++++++++++++++++++++++++++- dlls/d3d10/tests/effect.c | 147 ++++++++++++ 2 files changed, 734 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a4fe643920f3f66602ff…

1 0

Hugh McMaster : kernel32/tests: Add tests for the current console font size.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: e4f3d787764316d23c47bd8b4fcd1373c79d0ab2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4f3d787764316d23c47bd8b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Nov 15 22:18:23 2021 +1100 kernel32/tests: Add tests for the current console font size. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 0bce88716d0..7c74ddf195a 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3437,6 +3437,7 @@ static void test_GetCurrentConsoleFontEx(HANDLE std_output) BOOL ret; HANDLE std_input = GetStdHandle(STD_INPUT_HANDLE); HANDLE pipe1, pipe2; + COORD c; hmod = GetModuleHandleA("kernel32.dll"); pGetCurrentConsoleFontEx = (void *)GetProcAddress(hmod, "GetCurrentConsoleFontEx"); @@ -3521,6 +3522,21 @@ static void test_GetCurrentConsoleFontEx(HANDLE std_output) ok(cfix.dwFontSize.X == cfi.dwFontSize.X, "expected values to match\n"); ok(cfix.dwFontSize.Y == cfi.dwFontSize.Y, "expected values to match\n"); + SetLastError(0xdeadbeef); + c = GetConsoleFontSize(std_output, cfix.nFont); + ok(c.X && c.Y, "GetConsoleFontSize failed; err = %u\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + todo_wine ok(cfix.dwFontSize.X == c.X, "Font width doesn't match; got %u, expected %u\n", + cfix.dwFontSize.X, c.X); + todo_wine ok(cfix.dwFontSize.Y == c.Y, "Font height doesn't match; got %u, expected %u\n", + cfix.dwFontSize.Y, c.Y); + + todo_wine ok(cfi.dwFontSize.X == c.X, "Font width doesn't match; got %u, expected %u\n", + cfi.dwFontSize.X, c.X); + todo_wine ok(cfi.dwFontSize.Y == c.Y, "Font height doesn't match; got %u, expected %u\n", + cfi.dwFontSize.Y, c.Y); + SetLastError(0xdeadbeef); ret = pGetCurrentConsoleFontEx(std_output, TRUE, &cfix); ok(ret, "got %d, expected non-zero\n", ret);

1 0

Alistair Leslie-Hughes : msdasql: Implement IRowsetInfo GetSpecification.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: 26c4a1edc78d6822c709aa755e5b938454336e18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26c4a1edc78d6822c709aa75… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Nov 14 17:12:34 2021 +1100 msdasql: Implement IRowsetInfo GetSpecification. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 18 ++++++++++++++++-- dlls/msdasql/tests/provider.c | 16 ++++++++++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 6e9c4b680e9..82693115b8a 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -426,6 +426,7 @@ struct msdasql_rowset IColumnsInfo IColumnsInfo_iface; IAccessor IAccessor_iface; IColumnsRowset IColumnsRowset_iface; + IUnknown *caller; LONG refs; }; @@ -524,6 +525,10 @@ static ULONG WINAPI msdasql_rowset_Release(IRowset *iface) if (!refs) { TRACE( "destroying %p\n", rowset ); + + if (rowset->caller) + IUnknown_Release(rowset->caller); + heap_free( rowset ); } return refs; @@ -618,8 +623,16 @@ static HRESULT WINAPI rowset_info_GetSpecification(IRowsetInfo *iface, REFIID ri IUnknown **specification) { struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); - FIXME("%p, %s, %p\n", rowset, debugstr_guid(riid), specification); - return E_NOTIMPL; + + TRACE("%p, %s, %p\n", rowset, debugstr_guid(riid), specification); + + if (!specification) + return E_INVALIDARG; + + if (!rowset->caller) + return S_FALSE; + + return IUnknown_QueryInterface(rowset->caller, riid, (void**)specification); } struct IRowsetInfoVtbl rowset_info_vtbl = @@ -798,6 +811,7 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI msrowset->IAccessor_iface.lpVtbl = &accessor_vtbl; msrowset->IColumnsRowset_iface.lpVtbl = &columnrs_rs_vtbl; msrowset->refs = 1; + ICommandText_QueryInterface(iface, &IID_IUnknown, (void**)&msrowset->caller); if (affected) *affected = 0; /* FIXME */ diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 353e2ec58c8..b0e13b72589 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -293,17 +293,29 @@ static void test_command_dbsession(IUnknown *cmd, IUnknown *session) ICommandText_Release(comand_text); } -static void test_rowset_interfaces(IRowset *rowset) +static void test_rowset_interfaces(IRowset *rowset, ICommandText *commandtext) { IRowsetInfo *info; IColumnsInfo *col_info; IColumnsRowset *col_rs; IAccessor *accessor; + ICommandText *specification = NULL; IUnknown *unk; HRESULT hr; hr = IRowset_QueryInterface(rowset, &IID_IRowsetInfo, (void**)&info); ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IRowsetInfo_GetSpecification(info, &IID_ICommandText, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IRowsetInfo_GetSpecification(info, &IID_ICommandText, (IUnknown**)&specification); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (specification) + { + ok(commandtext == specification, "got 0x%08x\n", hr); + ICommandText_Release(specification); + } IRowsetInfo_Release(info); hr = IRowset_QueryInterface(rowset, &IID_IColumnsInfo, (void**)&col_info); @@ -364,7 +376,7 @@ static void test_command_rowset(IUnknown *cmd) hr = IUnknown_QueryInterface(unk, &IID_IRowset, (void**)&rowset); ok(hr == S_OK, "got 0x%08x\n", hr); - test_rowset_interfaces(rowset); + test_rowset_interfaces(rowset, comand_text); IRowset_Release(rowset); IUnknown_Release(unk);

1 0

Esme Povirk : mfplat: Allow deleting open files.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: 3a7830615a94c324832dd36a70917d9867b8e355 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a7830615a94c324832dd36a… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Nov 13 15:36:43 2021 -0600 mfplat: Allow deleting open files. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 2 +- dlls/mfplat/tests/mfplat.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 37a66798b2f..c36a2069bd8 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -4407,7 +4407,7 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open { DWORD capabilities = MFBYTESTREAM_IS_SEEKABLE | MFBYTESTREAM_DOES_NOT_USE_NETWORK; DWORD filecreation_disposition = 0, fileaccessmode = 0, fileattributes = 0; - DWORD filesharemode = FILE_SHARE_READ; + DWORD filesharemode = FILE_SHARE_READ | FILE_SHARE_DELETE; struct bytestream *object; FILETIME writetime; HANDLE file; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 541459c715b..0f928284534 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2077,10 +2077,14 @@ static void test_file_stream(void) hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, pathW, &bytestream); ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(DeleteFileW(filename), "failed to delete file\n"); + IMFByteStream_Release(bytestream); + hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); - DeleteFileW(filename); DeleteFileW(newfilename); }

1 0

Jan Sikorski : wined3d: Acquire references to blend states in deferred contexts.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: 2228c356e3bae97b9bf1b99169d6b12b76e62a0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2228c356e3bae97b9bf1b991… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Nov 12 14:56:31 2021 +0100 wined3d: Acquire references to blend states in deferred contexts. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 48 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 49 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index f161b63be3c..063e8bd0a04 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -64,6 +64,9 @@ struct wined3d_command_list SIZE_T query_count; struct wined3d_deferred_query_issue *queries; + + SIZE_T blend_state_count; + struct wined3d_blend_state **blend_states; }; static void wined3d_command_list_destroy_object(void *object) @@ -107,6 +110,8 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) wined3d_resource_decref(list->uploads[i].resource); for (i = 0; i < list->query_count; ++i) wined3d_query_decref(list->queries[i].query); + for (i = 0; i < list->blend_state_count; ++i) + wined3d_blend_state_decref(list->blend_states[i]); wined3d_mutex_lock(); wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); @@ -589,6 +594,12 @@ static inline void wined3d_device_context_acquire_resource(struct wined3d_device context->ops->acquire_resource(context, resource); } +static inline void wined3d_device_context_acquire_blend_state(struct wined3d_device_context *context, + struct wined3d_blend_state *blend_state) +{ + context->ops->acquire_blend_state(context, blend_state); +} + static struct wined3d_cs *wined3d_cs_from_context(struct wined3d_device_context *context) { return CONTAINING_RECORD(context, struct wined3d_cs, c); @@ -1831,6 +1842,8 @@ void wined3d_device_context_emit_set_blend_state(struct wined3d_device_context * op->factor = *blend_factor; op->sample_mask = sample_mask; + if (state) + wined3d_device_context_acquire_blend_state(context, state); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2957,6 +2970,11 @@ static void wined3d_cs_acquire_resource(struct wined3d_device_context *context, wined3d_resource_acquire(resource); } +static void wined3d_cs_acquire_blend_state(struct wined3d_device_context *context, + struct wined3d_blend_state *blend_state) +{ +} + static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const void *data); static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = @@ -3196,6 +3214,7 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_flush, wined3d_cs_acquire_resource, wined3d_cs_acquire_command_list, + wined3d_cs_acquire_blend_state, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -3323,6 +3342,7 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_flush, wined3d_cs_acquire_resource, wined3d_cs_acquire_command_list, + wined3d_cs_acquire_blend_state, }; static void poll_queries(struct wined3d_cs *cs) @@ -3549,6 +3569,9 @@ struct wined3d_deferred_context SIZE_T query_count, queries_capacity; struct wined3d_deferred_query_issue *queries; + + SIZE_T blend_state_count, blend_states_capacity; + struct wined3d_blend_state **blend_states; }; static struct wined3d_deferred_context *wined3d_deferred_context_from_context(struct wined3d_device_context *context) @@ -3747,6 +3770,18 @@ static void wined3d_deferred_context_acquire_command_list(struct wined3d_device_ wined3d_command_list_incref(deferred->command_lists[deferred->command_list_count++] = list); } +static void wined3d_deferred_context_acquire_blend_state(struct wined3d_device_context *context, + struct wined3d_blend_state *blend_state) +{ + struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); + if (!wined3d_array_reserve((void **)&deferred->blend_states, &deferred->blend_states_capacity, + deferred->blend_state_count + 1, sizeof(*deferred->blend_states))) + return; + + deferred->blend_states[deferred->blend_state_count++] = blend_state; + wined3d_blend_state_incref(blend_state); +} + static const struct wined3d_device_context_ops wined3d_deferred_context_ops = { wined3d_deferred_context_require_space, @@ -3759,6 +3794,7 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_flush, wined3d_deferred_context_acquire_resource, wined3d_deferred_context_acquire_command_list, + wined3d_deferred_context_acquire_blend_state, }; HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, struct wined3d_device_context **context) @@ -3816,6 +3852,10 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_query_decref(deferred->queries[i].query); heap_free(deferred->queries); + for (i = 0; i < deferred->blend_state_count; ++i) + wined3d_blend_state_decref(deferred->blend_states[i]); + heap_free(deferred->blend_states); + wined3d_state_destroy(deferred->c.state); heap_free(deferred->data); heap_free(deferred); @@ -3835,6 +3875,7 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device + deferred->upload_count * sizeof(*object->uploads) + deferred->command_list_count * sizeof(*object->command_lists) + deferred->query_count * sizeof(*object->queries) + + deferred->blend_state_count * sizeof(*object->blend_states) + deferred->data_size); if (!memory) @@ -3874,6 +3915,12 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device memcpy(object->queries, deferred->queries, deferred->query_count * sizeof(*object->queries)); /* Transfer our references to the queries to the command list. */ + object->blend_states = memory; + memory = &object->blend_states[deferred->blend_state_count]; + object->blend_state_count = deferred->blend_state_count; + memcpy(object->blend_states, deferred->blend_states, deferred->blend_state_count * sizeof(*object->blend_states)); + /* Transfer our references to the blend states to the command list. */ + object->data = memory; object->data_size = deferred->data_size; memcpy(object->data, deferred->data, deferred->data_size); @@ -3883,6 +3930,7 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->upload_count = 0; deferred->command_list_count = 0; deferred->query_count = 0; + deferred->blend_state_count = 0; /* This is in fact recorded into a subsequent command list. */ if (restore) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0c5f7dda228..3a4df301dcb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4847,6 +4847,7 @@ struct wined3d_device_context_ops void (*flush)(struct wined3d_device_context *context); void (*acquire_resource)(struct wined3d_device_context *context, struct wined3d_resource *resource); void (*acquire_command_list)(struct wined3d_device_context *context, struct wined3d_command_list *list); + void (*acquire_blend_state)(struct wined3d_device_context *context, struct wined3d_blend_state *blend_state); }; struct wined3d_device_context

1 0

Jan Sikorski : wined3d: Acquire references to rasterizer states in deferred contexts.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: a313f6bc5ce8616efdf50848fc8527f16dfc9eea URL: https://source.winehq.org/git/wine.git/?a=commit;h=a313f6bc5ce8616efdf50848… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Nov 12 14:56:32 2021 +0100 wined3d: Acquire references to rasterizer states in deferred contexts. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 49 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 51 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 063e8bd0a04..1c41194eff6 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -67,6 +67,9 @@ struct wined3d_command_list SIZE_T blend_state_count; struct wined3d_blend_state **blend_states; + + SIZE_T rasterizer_state_count; + struct wined3d_rasterizer_state **rasterizer_states; }; static void wined3d_command_list_destroy_object(void *object) @@ -112,6 +115,8 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) wined3d_query_decref(list->queries[i].query); for (i = 0; i < list->blend_state_count; ++i) wined3d_blend_state_decref(list->blend_states[i]); + for (i = 0; i < list->rasterizer_state_count; ++i) + wined3d_rasterizer_state_decref(list->rasterizer_states[i]); wined3d_mutex_lock(); wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); @@ -600,6 +605,12 @@ static inline void wined3d_device_context_acquire_blend_state(struct wined3d_dev context->ops->acquire_blend_state(context, blend_state); } +static inline void wined3d_device_context_acquire_rasterizer_state(struct wined3d_device_context *context, + struct wined3d_rasterizer_state *rasterizer_state) +{ + context->ops->acquire_rasterizer_state(context, rasterizer_state); +} + static struct wined3d_cs *wined3d_cs_from_context(struct wined3d_device_context *context) { return CONTAINING_RECORD(context, struct wined3d_cs, c); @@ -1891,6 +1902,8 @@ void wined3d_device_context_emit_set_rasterizer_state(struct wined3d_device_cont op->opcode = WINED3D_CS_OP_SET_RASTERIZER_STATE; op->state = rasterizer_state; + if (rasterizer_state) + wined3d_device_context_acquire_rasterizer_state(context, rasterizer_state); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2975,6 +2988,11 @@ static void wined3d_cs_acquire_blend_state(struct wined3d_device_context *contex { } +static void wined3d_cs_acquire_rasterizer_state(struct wined3d_device_context *context, + struct wined3d_rasterizer_state *rasterizer_state) +{ +} + static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const void *data); static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = @@ -3215,6 +3233,7 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_acquire_resource, wined3d_cs_acquire_command_list, wined3d_cs_acquire_blend_state, + wined3d_cs_acquire_rasterizer_state, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -3343,6 +3362,7 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_acquire_resource, wined3d_cs_acquire_command_list, wined3d_cs_acquire_blend_state, + wined3d_cs_acquire_rasterizer_state, }; static void poll_queries(struct wined3d_cs *cs) @@ -3572,6 +3592,9 @@ struct wined3d_deferred_context SIZE_T blend_state_count, blend_states_capacity; struct wined3d_blend_state **blend_states; + + SIZE_T rasterizer_state_count, rasterizer_states_capacity; + struct wined3d_rasterizer_state **rasterizer_states; }; static struct wined3d_deferred_context *wined3d_deferred_context_from_context(struct wined3d_device_context *context) @@ -3782,6 +3805,18 @@ static void wined3d_deferred_context_acquire_blend_state(struct wined3d_device_c wined3d_blend_state_incref(blend_state); } +static void wined3d_deferred_context_acquire_rasterizer_state(struct wined3d_device_context *context, + struct wined3d_rasterizer_state *rasterizer_state) +{ + struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); + if (!wined3d_array_reserve((void **)&deferred->rasterizer_states, &deferred->rasterizer_states_capacity, + deferred->rasterizer_state_count + 1, sizeof(*deferred->rasterizer_states))) + return; + + deferred->rasterizer_states[deferred->rasterizer_state_count++] = rasterizer_state; + wined3d_rasterizer_state_incref(rasterizer_state); +} + static const struct wined3d_device_context_ops wined3d_deferred_context_ops = { wined3d_deferred_context_require_space, @@ -3795,6 +3830,7 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_acquire_resource, wined3d_deferred_context_acquire_command_list, wined3d_deferred_context_acquire_blend_state, + wined3d_deferred_context_acquire_rasterizer_state, }; HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, struct wined3d_device_context **context) @@ -3856,6 +3892,10 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_blend_state_decref(deferred->blend_states[i]); heap_free(deferred->blend_states); + for (i = 0; i < deferred->rasterizer_state_count; ++i) + wined3d_rasterizer_state_decref(deferred->rasterizer_states[i]); + heap_free(deferred->rasterizer_states); + wined3d_state_destroy(deferred->c.state); heap_free(deferred->data); heap_free(deferred); @@ -3876,6 +3916,7 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device + deferred->command_list_count * sizeof(*object->command_lists) + deferred->query_count * sizeof(*object->queries) + deferred->blend_state_count * sizeof(*object->blend_states) + + deferred->rasterizer_state_count * sizeof(*object->rasterizer_states) + deferred->data_size); if (!memory) @@ -3921,6 +3962,13 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device memcpy(object->blend_states, deferred->blend_states, deferred->blend_state_count * sizeof(*object->blend_states)); /* Transfer our references to the blend states to the command list. */ + object->rasterizer_states = memory; + memory = &object->rasterizer_states[deferred->rasterizer_state_count]; + object->rasterizer_state_count = deferred->rasterizer_state_count; + memcpy(object->rasterizer_states, deferred->rasterizer_states, + deferred->rasterizer_state_count * sizeof(*object->rasterizer_states)); + /* Transfer our references to the rasterizer states to the command list. */ + object->data = memory; object->data_size = deferred->data_size; memcpy(object->data, deferred->data, deferred->data_size); @@ -3931,6 +3979,7 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->command_list_count = 0; deferred->query_count = 0; deferred->blend_state_count = 0; + deferred->rasterizer_state_count = 0; /* This is in fact recorded into a subsequent command list. */ if (restore) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3a4df301dcb..ecdfe1006a3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4848,6 +4848,8 @@ struct wined3d_device_context_ops void (*acquire_resource)(struct wined3d_device_context *context, struct wined3d_resource *resource); void (*acquire_command_list)(struct wined3d_device_context *context, struct wined3d_command_list *list); void (*acquire_blend_state)(struct wined3d_device_context *context, struct wined3d_blend_state *blend_state); + void (*acquire_rasterizer_state)(struct wined3d_device_context *context, + struct wined3d_rasterizer_state *rasterizer_state); }; struct wined3d_device_context

1 0

Jan Sikorski : wined3d: Acquire references to depth stencil states in deferred contexts.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: 6057507be428776514595cef49ef57546e5d1f8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6057507be428776514595cef… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Nov 12 14:56:33 2021 +0100 wined3d: Acquire references to depth stencil states in deferred contexts. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 49 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 51 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 1c41194eff6..911b9a2b9c8 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -70,6 +70,9 @@ struct wined3d_command_list SIZE_T rasterizer_state_count; struct wined3d_rasterizer_state **rasterizer_states; + + SIZE_T depth_stencil_state_count; + struct wined3d_depth_stencil_state **depth_stencil_states; }; static void wined3d_command_list_destroy_object(void *object) @@ -117,6 +120,8 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) wined3d_blend_state_decref(list->blend_states[i]); for (i = 0; i < list->rasterizer_state_count; ++i) wined3d_rasterizer_state_decref(list->rasterizer_states[i]); + for (i = 0; i < list->depth_stencil_state_count; ++i) + wined3d_depth_stencil_state_decref(list->depth_stencil_states[i]); wined3d_mutex_lock(); wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); @@ -611,6 +616,12 @@ static inline void wined3d_device_context_acquire_rasterizer_state(struct wined3 context->ops->acquire_rasterizer_state(context, rasterizer_state); } +static inline void wined3d_device_context_acquire_depth_stencil_state(struct wined3d_device_context *context, + struct wined3d_depth_stencil_state *depth_stencil_state) +{ + context->ops->acquire_depth_stencil_state(context, depth_stencil_state); +} + static struct wined3d_cs *wined3d_cs_from_context(struct wined3d_device_context *context) { return CONTAINING_RECORD(context, struct wined3d_cs, c); @@ -1882,6 +1893,8 @@ void wined3d_device_context_emit_set_depth_stencil_state(struct wined3d_device_c op->state = state; op->stencil_ref = stencil_ref; + if (state) + wined3d_device_context_acquire_depth_stencil_state(context, state); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2993,6 +3006,11 @@ static void wined3d_cs_acquire_rasterizer_state(struct wined3d_device_context *c { } +static void wined3d_cs_acquire_depth_stencil_state(struct wined3d_device_context *context, + struct wined3d_depth_stencil_state *depth_stencil_state) +{ +} + static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const void *data); static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = @@ -3234,6 +3252,7 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_acquire_command_list, wined3d_cs_acquire_blend_state, wined3d_cs_acquire_rasterizer_state, + wined3d_cs_acquire_depth_stencil_state, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -3363,6 +3382,7 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_acquire_command_list, wined3d_cs_acquire_blend_state, wined3d_cs_acquire_rasterizer_state, + wined3d_cs_acquire_depth_stencil_state, }; static void poll_queries(struct wined3d_cs *cs) @@ -3595,6 +3615,9 @@ struct wined3d_deferred_context SIZE_T rasterizer_state_count, rasterizer_states_capacity; struct wined3d_rasterizer_state **rasterizer_states; + + SIZE_T depth_stencil_state_count, depth_stencil_states_capacity; + struct wined3d_depth_stencil_state **depth_stencil_states; }; static struct wined3d_deferred_context *wined3d_deferred_context_from_context(struct wined3d_device_context *context) @@ -3817,6 +3840,18 @@ static void wined3d_deferred_context_acquire_rasterizer_state(struct wined3d_dev wined3d_rasterizer_state_incref(rasterizer_state); } +static void wined3d_deferred_context_acquire_depth_stencil_state(struct wined3d_device_context *context, + struct wined3d_depth_stencil_state *depth_stencil_state) +{ + struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); + if (!wined3d_array_reserve((void **)&deferred->depth_stencil_states, &deferred->depth_stencil_states_capacity, + deferred->depth_stencil_state_count + 1, sizeof(*deferred->depth_stencil_states))) + return; + + deferred->depth_stencil_states[deferred->depth_stencil_state_count++] = depth_stencil_state; + wined3d_depth_stencil_state_incref(depth_stencil_state); +} + static const struct wined3d_device_context_ops wined3d_deferred_context_ops = { wined3d_deferred_context_require_space, @@ -3831,6 +3866,7 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_acquire_command_list, wined3d_deferred_context_acquire_blend_state, wined3d_deferred_context_acquire_rasterizer_state, + wined3d_deferred_context_acquire_depth_stencil_state, }; HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, struct wined3d_device_context **context) @@ -3896,6 +3932,10 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_rasterizer_state_decref(deferred->rasterizer_states[i]); heap_free(deferred->rasterizer_states); + for (i = 0; i < deferred->depth_stencil_state_count; ++i) + wined3d_depth_stencil_state_decref(deferred->depth_stencil_states[i]); + heap_free(deferred->depth_stencil_states); + wined3d_state_destroy(deferred->c.state); heap_free(deferred->data); heap_free(deferred); @@ -3917,6 +3957,7 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device + deferred->query_count * sizeof(*object->queries) + deferred->blend_state_count * sizeof(*object->blend_states) + deferred->rasterizer_state_count * sizeof(*object->rasterizer_states) + + deferred->depth_stencil_state_count * sizeof(*object->depth_stencil_states) + deferred->data_size); if (!memory) @@ -3969,6 +4010,13 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->rasterizer_state_count * sizeof(*object->rasterizer_states)); /* Transfer our references to the rasterizer states to the command list. */ + object->depth_stencil_states = memory; + memory = &object->depth_stencil_states[deferred->depth_stencil_state_count]; + object->depth_stencil_state_count = deferred->depth_stencil_state_count; + memcpy(object->depth_stencil_states, deferred->depth_stencil_states, + deferred->depth_stencil_state_count * sizeof(*object->depth_stencil_states)); + /* Transfer our references to the depth stencil states to the command list. */ + object->data = memory; object->data_size = deferred->data_size; memcpy(object->data, deferred->data, deferred->data_size); @@ -3980,6 +4028,7 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->query_count = 0; deferred->blend_state_count = 0; deferred->rasterizer_state_count = 0; + deferred->depth_stencil_state_count = 0; /* This is in fact recorded into a subsequent command list. */ if (restore) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ecdfe1006a3..74c7932220b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4850,6 +4850,8 @@ struct wined3d_device_context_ops void (*acquire_blend_state)(struct wined3d_device_context *context, struct wined3d_blend_state *blend_state); void (*acquire_rasterizer_state)(struct wined3d_device_context *context, struct wined3d_rasterizer_state *rasterizer_state); + void (*acquire_depth_stencil_state)(struct wined3d_device_context *context, + struct wined3d_depth_stencil_state *depth_stencil_state); }; struct wined3d_device_context

1 0

Jan Sikorski : wined3d: Acquire references to shaders in deferred contexts.
by Alexandre Julliard 15 Nov '21

15 Nov '21

Module: wine Branch: master Commit: 908fb50728a33da6f7238cafcc8163065785ab0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=908fb50728a33da6f7238caf… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Nov 12 14:56:34 2021 +0100 wined3d: Acquire references to shaders in deferred contexts. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 48 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 49 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 911b9a2b9c8..2aa9f570d3e 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -73,6 +73,9 @@ struct wined3d_command_list SIZE_T depth_stencil_state_count; struct wined3d_depth_stencil_state **depth_stencil_states; + + SIZE_T shader_count; + struct wined3d_shader **shaders; }; static void wined3d_command_list_destroy_object(void *object) @@ -122,6 +125,8 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) wined3d_rasterizer_state_decref(list->rasterizer_states[i]); for (i = 0; i < list->depth_stencil_state_count; ++i) wined3d_depth_stencil_state_decref(list->depth_stencil_states[i]); + for (i = 0; i < list->shader_count; ++i) + wined3d_shader_decref(list->shaders[i]); wined3d_mutex_lock(); wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); @@ -622,6 +627,12 @@ static inline void wined3d_device_context_acquire_depth_stencil_state(struct win context->ops->acquire_depth_stencil_state(context, depth_stencil_state); } +static inline void wined3d_device_context_acquire_shader(struct wined3d_device_context *context, + struct wined3d_shader *shader) +{ + context->ops->acquire_shader(context, shader); +} + static struct wined3d_cs *wined3d_cs_from_context(struct wined3d_device_context *context) { return CONTAINING_RECORD(context, struct wined3d_cs, c); @@ -1834,6 +1845,8 @@ void wined3d_device_context_emit_set_shader(struct wined3d_device_context *conte op->type = type; op->shader = shader; + if (shader) + wined3d_device_context_acquire_shader(context, shader); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -3011,6 +3024,11 @@ static void wined3d_cs_acquire_depth_stencil_state(struct wined3d_device_context { } +static void wined3d_cs_acquire_shader(struct wined3d_device_context *context, + struct wined3d_shader *shader) +{ +} + static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const void *data); static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = @@ -3253,6 +3271,7 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_acquire_blend_state, wined3d_cs_acquire_rasterizer_state, wined3d_cs_acquire_depth_stencil_state, + wined3d_cs_acquire_shader, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -3383,6 +3402,7 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_acquire_blend_state, wined3d_cs_acquire_rasterizer_state, wined3d_cs_acquire_depth_stencil_state, + wined3d_cs_acquire_shader, }; static void poll_queries(struct wined3d_cs *cs) @@ -3618,6 +3638,9 @@ struct wined3d_deferred_context SIZE_T depth_stencil_state_count, depth_stencil_states_capacity; struct wined3d_depth_stencil_state **depth_stencil_states; + + SIZE_T shader_count, shaders_capacity; + struct wined3d_shader **shaders; }; static struct wined3d_deferred_context *wined3d_deferred_context_from_context(struct wined3d_device_context *context) @@ -3852,6 +3875,18 @@ static void wined3d_deferred_context_acquire_depth_stencil_state(struct wined3d_ wined3d_depth_stencil_state_incref(depth_stencil_state); } +static void wined3d_deferred_context_acquire_shader(struct wined3d_device_context *context, + struct wined3d_shader *shader) +{ + struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); + if (!wined3d_array_reserve((void **)&deferred->shaders, &deferred->shaders_capacity, + deferred->shader_count + 1, sizeof(*deferred->shaders))) + return; + + deferred->shaders[deferred->shader_count++] = shader; + wined3d_shader_incref(shader); +} + static const struct wined3d_device_context_ops wined3d_deferred_context_ops = { wined3d_deferred_context_require_space, @@ -3867,6 +3902,7 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_acquire_blend_state, wined3d_deferred_context_acquire_rasterizer_state, wined3d_deferred_context_acquire_depth_stencil_state, + wined3d_deferred_context_acquire_shader, }; HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, struct wined3d_device_context **context) @@ -3936,6 +3972,10 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_depth_stencil_state_decref(deferred->depth_stencil_states[i]); heap_free(deferred->depth_stencil_states); + for (i = 0; i < deferred->shader_count; ++i) + wined3d_shader_decref(deferred->shaders[i]); + heap_free(deferred->shaders); + wined3d_state_destroy(deferred->c.state); heap_free(deferred->data); heap_free(deferred); @@ -3958,6 +3998,7 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device + deferred->blend_state_count * sizeof(*object->blend_states) + deferred->rasterizer_state_count * sizeof(*object->rasterizer_states) + deferred->depth_stencil_state_count * sizeof(*object->depth_stencil_states) + + deferred->shader_count * sizeof(*object->shaders) + deferred->data_size); if (!memory) @@ -4017,6 +4058,12 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->depth_stencil_state_count * sizeof(*object->depth_stencil_states)); /* Transfer our references to the depth stencil states to the command list. */ + object->shaders = memory; + memory = &object->shaders[deferred->shader_count]; + object->shader_count = deferred->shader_count; + memcpy(object->shaders, deferred->shaders, deferred->shader_count * sizeof(*object->shaders)); + /* Transfer our references to the shaders to the command list. */ + object->data = memory; object->data_size = deferred->data_size; memcpy(object->data, deferred->data, deferred->data_size); @@ -4029,6 +4076,7 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->blend_state_count = 0; deferred->rasterizer_state_count = 0; deferred->depth_stencil_state_count = 0; + deferred->shader_count = 0; /* This is in fact recorded into a subsequent command list. */ if (restore) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 74c7932220b..94f0f94b1d7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4852,6 +4852,7 @@ struct wined3d_device_context_ops struct wined3d_rasterizer_state *rasterizer_state); void (*acquire_depth_stencil_state)(struct wined3d_device_context *context, struct wined3d_depth_stencil_state *depth_stencil_state); + void (*acquire_shader)(struct wined3d_device_context *context, struct wined3d_shader *shader); }; struct wined3d_device_context

1 0