June 2024 - Wine-commits - list.winehq.org

Piotr Caban : wineps.drv: Add partial support for changing page size.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 71300e23857ddb8d36e7f0691d6e8c1ad925322e URL: https://gitlab.winehq.org/wine/wine/-/commit/71300e23857ddb8d36e7f0691d6e8c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 4 21:21:45 2024 +0200 wineps.drv: Add partial support for changing page size. --- dlls/wineps.drv/printproc.c | 2 ++ dlls/wineps.drv/ps.c | 14 ++++++++++++-- dlls/wineps.drv/psdrv.h | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index db2979f0fbe..84f4b9f5900 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -3110,6 +3110,8 @@ BOOL WINAPI PrintDocumentOnPrintProcessor(HANDLE pp, WCHAR *doc_name) if (ret) ret = PSDRV_ResetDC(data->ctx, devmode); + if (ret && devmode && (devmode->dmFields & DM_PAPERSIZE)) + ret = PSDRV_WritePageSize(data->ctx); free(devmode); if (!ret) goto cleanup; diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 9896ea46bc7..8e52a97867a 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -397,6 +397,17 @@ static void write_cups_job_ticket( print_ctx *ctx, const struct ticket_info *inf write_spool( ctx, cups_ap_d_inputslot, sizeof(cups_ap_d_inputslot) - 1 ); } +INT PSDRV_WritePageSize( print_ctx *ctx ) +{ + PAGESIZE *page = find_pagesize( ctx->pi->ppd, &ctx->Devmode->dmPublic ); + + if (page && page->InvocationString) + PSDRV_WriteFeature( ctx, "*PageSize", page->Name, page->InvocationString ); + else + WARN("Page size not set\n"); + return 1; +} + INT PSDRV_WriteHeader( print_ctx *ctx, LPCWSTR title ) { char *buf, *escaped_title; @@ -444,8 +455,7 @@ INT PSDRV_WriteHeader( print_ctx *ctx, LPCWSTR title ) if (slot && slot->InvocationString) PSDRV_WriteFeature( ctx, "*InputSlot", slot->Name, slot->InvocationString ); - if (page && page->InvocationString) - PSDRV_WriteFeature( ctx, "*PageSize", page->Name, page->InvocationString ); + PSDRV_WritePageSize( ctx ); if (duplex && duplex->InvocationString) PSDRV_WriteFeature( ctx, "*Duplex", duplex->Name, duplex->InvocationString ); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index d1ac2cc06cd..2c4703de942 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -466,6 +466,7 @@ extern char PSDRV_UnicodeToANSI(int u); extern INT PSDRV_WriteHeader( print_ctx *ctx, LPCWSTR title ); extern INT PSDRV_WriteFooter( print_ctx *ctx ); +extern INT PSDRV_WritePageSize( print_ctx *ctx ); extern INT PSDRV_WriteNewPage( print_ctx *ctx ); extern INT PSDRV_WriteEndPage( print_ctx *ctx ); extern BOOL PSDRV_WriteMoveTo(print_ctx *ctx, INT x, INT y);

1 0

Esme Povirk : win32u: Send EVENT_OBJECT_FOCUS in more cases.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 069a0b1e26823121e8beac3756a3c9c60422601a URL: https://gitlab.winehq.org/wine/wine/-/commit/069a0b1e26823121e8beac3756a3c9… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Jun 3 20:07:59 2024 +0000 win32u: Send EVENT_OBJECT_FOCUS in more cases. --- dlls/user32/tests/msg.c | 68 +++++++++++++++++++++++++++---------------------- dlls/win32u/input.c | 3 +-- 2 files changed, 39 insertions(+), 32 deletions(-)

1 0

Tim Clem : gitlab: Update configuration for the new Mac runner.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: b6fb9e5c5c180f9a8abdd04a638eff7b61edd255 URL: https://gitlab.winehq.org/wine/wine/-/commit/b6fb9e5c5c180f9a8abdd04a638eff… Author: Tim Clem <tclem(a)codeweavers.com> Date: Wed May 29 09:06:59 2024 -0700 gitlab: Update configuration for the new Mac runner. Two main changes: - VM configuration in build.yml for the executor. - The build-mac script is now architecture-agnostic. --- tools/gitlab/build-mac | 26 ++++++++++++++++++++++++-- tools/gitlab/build.yml | 5 ++++- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/tools/gitlab/build-mac b/tools/gitlab/build-mac index 98df7731ad1..53cb60b3afc 100755 --- a/tools/gitlab/build-mac +++ b/tools/gitlab/build-mac @@ -5,15 +5,37 @@ echo "---" set -Eeuxo pipefail +X86_BREW_HOME='/usr/local' +if [ "$(arch)" = 'arm64' ]; then + ARCH_BREW_HOME='/opt/homebrew' + ARCH_CMD='arch -x86_64' + + # On the ARM runner, use Xcode's SDK. SDKROOT is independent of + # DEVELOPER_DIR/xcode-select, and will default to the command line tools. + # That's what we want on the old Intel runner. + export SDKROOT="$(xcode-select -p)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" +else + ARCH_BREW_HOME="$X86_BREW_HOME" + ARCH_CMD= +fi + +# Pick up dependencies from homebrew. +export PATH="$X86_BREW_HOME/bin:$ARCH_BREW_HOME/bin:$PATH" +export LIBRARY_PATH="$X86_BREW_HOME/lib" + +# x86 ccache wrappers. These need to go at the front of PATH. +export PATH="$X86_BREW_HOME/opt/ccache/libexec:$PATH" + ./tools/make_requests ./tools/make_specfiles ./tools/make_makefiles autoreconf -f cd build64 -../configure -C --enable-win64 --with-mingw BISON=/usr/local/opt/bison/bin/bison -make -s -j8 +$ARCH_CMD ../configure -C --enable-win64 --with-mingw BISON="$ARCH_BREW_HOME/opt/bison/bin/bison" +$ARCH_CMD make -s -j$(sysctl -n hw.activecpu) cd .. git reset --hard + sleep 2 diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index 66daf518386..528d998b644 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -52,6 +52,10 @@ build-clang: build-mac: extends: .wine-build + image: winehq-sonoma-pristine + variables: + TART_EXECUTOR_SSH_USERNAME: "gitlab" + TART_EXECUTOR_SSH_PASSWORD: "gitlab" rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' tags: @@ -63,7 +67,6 @@ build-mac: - build32/config.log script: - mkdir -p build32 build64 - - export PATH="/usr/local/opt/ccache/libexec:$PATH" - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-mac build-winetest:

1 0

Nikolay Sivov : scrrun/dictionary: Implement putref_Item() method.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 0da33d5493814b8cb8309c092bd7c6e1c60f1868 URL: https://gitlab.winehq.org/wine/wine/-/commit/0da33d5493814b8cb8309c092bd7c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 5 11:52:49 2024 +0200 scrrun/dictionary: Implement putref_Item() method. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56781 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/scrrun/dictionary.c | 14 ++++++++++---- dlls/scrrun/tests/dictionary.c | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 5 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index f2f39c82f6f..af771c9245a 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -559,11 +559,17 @@ static HRESULT WINAPI dictionary_Invoke(IDictionary *iface, DISPID dispIdMember, return hr; } -static HRESULT WINAPI dictionary_putref_Item(IDictionary *iface, VARIANT *Key, VARIANT *pRetItem) +static HRESULT WINAPI dictionary_putref_Item(IDictionary *iface, VARIANT *key, VARIANT *item) { - FIXME("%p, %p, %p stub\n", iface, Key, pRetItem); + struct dictionary *dictionary = impl_from_IDictionary(iface); + struct keyitem_pair *pair; - return E_NOTIMPL; + TRACE("%p, %s, %s.\n", iface, debugstr_variant(key), debugstr_variant(item)); + + if ((pair = get_keyitem_pair(dictionary, key))) + return VariantCopyInd(&pair->item, item); + + return add_keyitem_pair(dictionary, key, item); } static HRESULT WINAPI dictionary_put_Item(IDictionary *iface, VARIANT *key, VARIANT *item) @@ -576,7 +582,7 @@ static HRESULT WINAPI dictionary_put_Item(IDictionary *iface, VARIANT *key, VARI if ((pair = get_keyitem_pair(dictionary, key))) return VariantCopyInd(&pair->item, item); - return IDictionary_Add(iface, key, item); + return add_keyitem_pair(dictionary, key, item); } static HRESULT WINAPI dictionary_get_Item(IDictionary *iface, VARIANT *key, VARIANT *item) diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index ccc4d181793..e1cb33c45a7 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -243,7 +243,6 @@ static HRESULT WINAPI test_unk_no_QI(IUnknown *iface, REFIID riid, void **obj) static ULONG WINAPI test_unk_AddRef(IUnknown *iface) { - ok(0, "unexpected\n"); return 2; } @@ -1168,6 +1167,45 @@ static void test_IEnumVARIANT(void) IDictionary_Release(dict); } +static void test_putref_Item(void) +{ + IUnknown *obj = &test_unk; + VARIANT key, item, item2; + IDictionary *dict; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IDictionary, (void **)&dict); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + V_VT(&key) = VT_I2; + V_I2(&key) = 10; + V_VT(&item) = VT_UNKNOWN; + V_UNKNOWN(&item) = obj; + hr = IDictionary_putref_Item(dict, &key, &item); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + VariantInit(&item2); + hr = IDictionary_get_Item(dict, &key, &item2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&item2) == VT_UNKNOWN, "Unexpected type.\n"); + ok(V_UNKNOWN(&item2) == obj, "Unexpected value.\n"); + VariantClear(&item2); + + V_VT(&key) = VT_I2; + V_I2(&key) = 11; + V_VT(&item) = VT_UNKNOWN|VT_BYREF; + V_UNKNOWNREF(&item) = &obj; + hr = IDictionary_putref_Item(dict, &key, &item); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IDictionary_get_Item(dict, &key, &item2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&item2) == VT_UNKNOWN, "Unexpected type.\n"); + ok(V_UNKNOWN(&item2) == obj, "Unexpected value.\n"); + + IDictionary_Release(dict); +} + START_TEST(dictionary) { IDispatch *disp; @@ -1193,6 +1231,7 @@ START_TEST(dictionary) test_Item(); test_Add(); test_IEnumVARIANT(); + test_putref_Item(); CoUninitialize(); }

1 0

Rémi Bernon : gdi32: Use an internal NtUser call for D3DKMTOpenAdapterFromGdiDisplayName.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 6b8cdda502a5fd726529af0cdb14c57467cde14b URL: https://gitlab.winehq.org/wine/wine/-/commit/6b8cdda502a5fd726529af0cdb14c5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 4 12:46:47 2024 +0200 gdi32: Use an internal NtUser call for D3DKMTOpenAdapterFromGdiDisplayName. Fixes a deadlock with display_device_init mutex and display_lock when trying to open the D3DKMT adapter while holding the mutex in the caller. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56764 --- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/objects.c | 78 ++----------------------------------------------- dlls/win32u/sysparams.c | 31 ++++++++++++++++++++ include/ntuser.h | 8 +++++ 4 files changed, 42 insertions(+), 77 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 8c5a299933d..80a5ad0858b 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -D_GDI32_ MODULE = gdi32.dll IMPORTLIB = gdi32 IMPORTS = user32 advapi32 win32u -DELAYIMPORTS = setupapi winspool +DELAYIMPORTS = winspool SOURCES = \ dc.c \ diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 070ce9c3885..0c7eacae2e5 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -886,89 +886,15 @@ UINT WINAPI SetDIBColorTable( HDC hdc, UINT start, UINT count, const RGBQUAD *co return NtGdiDoPalette( hdc, start, count, (void *)colors, NtGdiSetDIBColorTable, FALSE ); } -static HANDLE get_display_device_init_mutex( void ) -{ - HANDLE mutex = CreateMutexW( NULL, FALSE, L"display_device_init" ); - - WaitForSingleObject( mutex, INFINITE ); - return mutex; -} - -static void release_display_device_init_mutex( HANDLE mutex ) -{ - ReleaseMutex( mutex ); - CloseHandle( mutex ); -} - /*********************************************************************** * D3DKMTOpenAdapterFromGdiDisplayName (GDI32.@) */ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc ) { - WCHAR *end, key_nameW[MAX_PATH], bufferW[MAX_PATH]; - HDEVINFO devinfo = INVALID_HANDLE_VALUE; - NTSTATUS status = STATUS_UNSUCCESSFUL; - D3DKMT_OPENADAPTERFROMLUID luid_desc; - SP_DEVINFO_DATA device_data; - DWORD size, state_flags; - DEVPROPTYPE type; - HANDLE mutex; - int index; - TRACE("(%p)\n", desc); - if (!desc) - return STATUS_UNSUCCESSFUL; - - TRACE("DeviceName: %s\n", wine_dbgstr_w( desc->DeviceName )); - if (wcsnicmp( desc->DeviceName, L"\\\\.\\DISPLAY", lstrlenW(L"\\\\.\\DISPLAY") )) - return STATUS_UNSUCCESSFUL; - - index = wcstol( desc->DeviceName + lstrlenW(L"\\\\.\\DISPLAY"), &end, 10 ) - 1; - if (*end) - return STATUS_UNSUCCESSFUL; - - /* Get adapter LUID from SetupAPI */ - mutex = get_display_device_init_mutex(); - - size = sizeof( bufferW ); - swprintf( key_nameW, MAX_PATH, L"\\Device\\Video%d", index ); - if (RegGetValueW( HKEY_LOCAL_MACHINE, L"HARDWARE\\DEVICEMAP\\VIDEO", key_nameW, - RRF_RT_REG_SZ, NULL, bufferW, &size )) - goto done; - - /* Strip \Registry\Machine\ prefix and retrieve Wine specific data set by the display driver */ - lstrcpyW( key_nameW, bufferW + 18 ); - size = sizeof( state_flags ); - if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, L"StateFlags", RRF_RT_REG_DWORD, NULL, - &state_flags, &size )) - goto done; - - if (!(state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) - goto done; - - size = sizeof( bufferW ); - if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, L"GPUID", RRF_RT_REG_SZ, NULL, bufferW, &size )) - goto done; - - devinfo = SetupDiCreateDeviceInfoList( &GUID_DEVCLASS_DISPLAY, NULL ); - device_data.cbSize = sizeof( device_data ); - SetupDiOpenDeviceInfoW( devinfo, bufferW, NULL, 0, &device_data ); - if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &type, - (BYTE *)&luid_desc.AdapterLuid, sizeof( luid_desc.AdapterLuid ), - NULL, 0)) - goto done; - - if ((status = NtGdiDdDDIOpenAdapterFromLuid( &luid_desc ))) goto done; - - desc->hAdapter = luid_desc.hAdapter; - desc->AdapterLuid = luid_desc.AdapterLuid; - desc->VidPnSourceId = index; - -done: - SetupDiDestroyDeviceInfoList( devinfo ); - release_display_device_init_mutex( mutex ); - return status; + if (!desc) return STATUS_UNSUCCESSFUL; + return NtUserD3DKMTOpenAdapterFromGdiDisplayName( desc ); } /*********************************************************************** diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index db23795d57c..7c0ef662014 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2730,6 +2730,34 @@ static void monitor_get_interface_name( struct monitor *monitor, WCHAR *interfac asciiz_to_unicode( interface_name, buffer ); } +/* see D3DKMTOpenAdapterFromGdiDisplayName */ +static NTSTATUS d3dkmt_open_adapter_from_gdi_display_name( D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc ) +{ + NTSTATUS status = STATUS_UNSUCCESSFUL; + D3DKMT_OPENADAPTERFROMLUID luid_desc; + struct source *source; + UNICODE_STRING name; + + TRACE( "desc %p, name %s\n", desc, debugstr_w( desc->DeviceName ) ); + + RtlInitUnicodeString( &name, desc->DeviceName ); + if (!name.Length) return STATUS_UNSUCCESSFUL; + if (!(source = find_source( &name ))) return STATUS_UNSUCCESSFUL; + + luid_desc.AdapterLuid = source->gpu->luid; + if ((source->state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) && + !(status = NtGdiDdDDIOpenAdapterFromLuid( &luid_desc ))) + { + desc->hAdapter = luid_desc.hAdapter; + desc->AdapterLuid = luid_desc.AdapterLuid; + desc->VidPnSourceId = source->id + 1; + } + + source_release( source ); + return status; +} + + /*********************************************************************** * NtUserEnumDisplayDevices (win32u.@) */ @@ -6433,6 +6461,9 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) case NtUserCallOneParam_SetThreadDpiAwarenessContext: return set_thread_dpi_awareness_context( arg ); + case NtUserCallOneParam_D3DKMTOpenAdapterFromGdiDisplayName: + return d3dkmt_open_adapter_from_gdi_display_name( (void *)arg ); + /* temporary exports */ case NtUserGetDeskPattern: return get_entry( &entry_DESKPATTERN, 256, (WCHAR *)arg ); diff --git a/include/ntuser.h b/include/ntuser.h index 1d2f32b5ea6..35936a99fd3 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -912,6 +912,7 @@ enum NtUserCallOneParam_SetProcessDefaultLayout, NtUserCallOneParam_SetKeyboardAutoRepeat, NtUserCallOneParam_SetThreadDpiAwarenessContext, + NtUserCallOneParam_D3DKMTOpenAdapterFromGdiDisplayName, /* temporary exports */ NtUserGetDeskPattern, }; @@ -1035,6 +1036,13 @@ static inline UINT NtUserSetThreadDpiAwarenessContext( UINT context ) return NtUserCallOneParam( context, NtUserCallOneParam_SetThreadDpiAwarenessContext ); } +typedef struct _D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME; + +static inline NTSTATUS NtUserD3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc ) +{ + return NtUserCallOneParam( (UINT_PTR)desc, NtUserCallOneParam_D3DKMTOpenAdapterFromGdiDisplayName ); +} + /* NtUserCallTwoParam codes, not compatible with Windows */ enum {

1 0

Elizabeth Figura : wined3d: Invalidate the vertex shader when WINED3D_FFP_PSIZE is toggled.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 392a724fc9fb59d4b82adbca3652962832db87e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/392a724fc9fb59d4b82adbca365296… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri May 3 16:20:30 2024 -0500 wined3d: Invalidate the vertex shader when WINED3D_FFP_PSIZE is toggled. --- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/glsl_shader.c | 4 +++- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 600a6296c70..d1020339db0 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12332,7 +12332,7 @@ static void test_pointsize(void) ok(color != 0xff00ffff, "Got unexpected color 0x%08x at (64, 64).\n", color); } - todo_wine_if (j == 10) + todo_wine_if (j == 10 || (j == 11 && i == 10)) { color = get_readback_color(&rb, 63, 64); ok(color == 0xff00ffff, "Got unexpected color 0x%08x at (63, 64).\n", color); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ea79e0361e0..463dbf47fd6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11759,6 +11759,7 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context_gl->gl_info; BOOL specular = !!(context->stream_info.use_map & (1u << WINED3D_FFP_SPECULAR)); + BOOL point_size = !!(context->stream_info.use_map & (1u << WINED3D_FFP_PSIZE)); BOOL diffuse = !!(context->stream_info.use_map & (1u << WINED3D_FFP_DIFFUSE)); BOOL normal = !!(context->stream_info.use_map & (1u << WINED3D_FFP_NORMAL)); const BOOL legacy_clip_planes = needs_legacy_glsl_syntax(gl_info); @@ -11799,7 +11800,7 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, * normal presence changes. */ if (!shader_glsl_full_ffp_varyings(gl_info) || (state->render_states[WINED3D_RS_COLORVERTEX] && (diffuse != context->last_was_diffuse || specular != context->last_was_specular)) - || normal != context->last_was_normal) + || normal != context->last_was_normal || point_size != context->last_was_point_size) context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_VERTEX; if (use_ps(state) @@ -11824,6 +11825,7 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, context->last_was_diffuse = diffuse; context->last_was_specular = specular; context->last_was_normal = normal; + context->last_was_point_size = point_size; } static void glsl_vertex_pipe_vs(struct wined3d_context *context, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 67ddf6f88cd..85badd3b2c3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1907,12 +1907,12 @@ struct wined3d_context DWORD update_unordered_access_view_bindings : 1; DWORD update_compute_unordered_access_view_bindings : 1; DWORD update_primitive_type : 1; - DWORD update_patch_vertex_count : 1; DWORD last_was_rhw : 1; /* True iff last draw_primitive was in xyzrhw mode. */ DWORD last_was_vshader : 1; DWORD last_was_diffuse : 1; DWORD last_was_specular : 1; DWORD last_was_normal : 1; + DWORD last_was_point_size : 1; DWORD last_was_ffp_blit : 1; DWORD last_was_blit : 1; DWORD last_was_dual_source_blend : 1; @@ -1927,7 +1927,8 @@ struct wined3d_context DWORD destroyed : 1; DWORD destroy_delayed : 1; DWORD update_multisample_state : 1; - DWORD padding : 24; + DWORD update_patch_vertex_count : 1; + DWORD padding : 23; DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */

1 0

Elizabeth Figura : wined3d: Just check the vertex declaration for point size usage.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: db63c8be29fdadf95e4ce2788f5b39e58b0cfe86 URL: https://gitlab.winehq.org/wine/wine/-/commit/db63c8be29fdadf95e4ce2788f5b39… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri May 3 16:42:42 2024 -0500 wined3d: Just check the vertex declaration for point size usage. Do not check the stream info. In practice, this amounts to a difference if the usage is included in the vertex declaration but the corresponding stream is not bound. The just-added tests show that in this case it is correct to use per-vertex point size with a default size of one, rather than treating this case as equivalent to if the usage was not specified in the vertex declaration. --- dlls/d3d9/tests/visual.c | 19 ++++++++----------- dlls/wined3d/glsl_shader.c | 3 ++- dlls/wined3d/utils.c | 5 +++-- dlls/wined3d/vertexdeclaration.c | 4 +++- dlls/wined3d/wined3d_private.h | 3 ++- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d1020339db0..4b8a7a994b3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12332,17 +12332,14 @@ static void test_pointsize(void) ok(color != 0xff00ffff, "Got unexpected color 0x%08x at (64, 64).\n", color); } - todo_wine_if (j == 10 || (j == 11 && i == 10)) - { - color = get_readback_color(&rb, 63, 64); - ok(color == 0xff00ffff, "Got unexpected color 0x%08x at (63, 64).\n", color); - color = get_readback_color(&rb, 65, 64); - ok(color == 0xff00ffff, "Got unexpected color 0x%08x at (65, 64).\n", color); - color = get_readback_color(&rb, 64, 63); - ok(color == 0xff00ffff, "Got unexpected color 0x%08x at (64, 63).\n", color); - color = get_readback_color(&rb, 64, 65); - ok(color == 0xff00ffff, "Got unexpected color 0x%08x at (64, 65).\n", color); - } + color = get_readback_color(&rb, 63, 64); + ok(color == 0xff00ffff, "Got unexpected color 0x%08x at (63, 64).\n", color); + color = get_readback_color(&rb, 65, 64); + ok(color == 0xff00ffff, "Got unexpected color 0x%08x at (65, 64).\n", color); + color = get_readback_color(&rb, 64, 63); + ok(color == 0xff00ffff, "Got unexpected color 0x%08x at (64, 63).\n", color); + color = get_readback_color(&rb, 64, 65); + ok(color == 0xff00ffff, "Got unexpected color 0x%08x at (64, 65).\n", color); } else { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 463dbf47fd6..ae618266d79 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11756,15 +11756,16 @@ static void glsl_vertex_pipe_shader(struct wined3d_context *context, static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + const struct wined3d_vertex_declaration *vdecl = state->vertex_declaration; struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context_gl->gl_info; BOOL specular = !!(context->stream_info.use_map & (1u << WINED3D_FFP_SPECULAR)); - BOOL point_size = !!(context->stream_info.use_map & (1u << WINED3D_FFP_PSIZE)); BOOL diffuse = !!(context->stream_info.use_map & (1u << WINED3D_FFP_DIFFUSE)); BOOL normal = !!(context->stream_info.use_map & (1u << WINED3D_FFP_NORMAL)); const BOOL legacy_clip_planes = needs_legacy_glsl_syntax(gl_info); BOOL transformed = context->stream_info.position_transformed; BOOL wasrhw = context->last_was_rhw; + bool point_size = vdecl->point_size; unsigned int i; context->last_was_rhw = transformed; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a1c5a00d51f..98b58cbeb06 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6566,6 +6566,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, const struct wined3d_state *state, struct wined3d_ffp_vs_settings *settings) { enum wined3d_material_color_source diffuse_source, emissive_source, ambient_source, specular_source; + const struct wined3d_vertex_declaration *vdecl = state->vertex_declaration; const struct wined3d_stream_info *si = &context->stream_info; const struct wined3d_d3d_info *d3d_info = context->d3d_info; unsigned int coord_idx, i; @@ -6576,7 +6577,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, { settings->transformed = 1; settings->point_size = state->primitive_type == WINED3D_PT_POINTLIST; - settings->per_vertex_point_size = !!(si->use_map & 1u << WINED3D_FFP_PSIZE); + settings->per_vertex_point_size = vdecl->point_size; if (!state->render_states[WINED3D_RS_FOGENABLE]) settings->fog_mode = WINED3D_FFP_VS_FOG_OFF; else if (state->render_states[WINED3D_RS_FOGTABLEMODE] != WINED3D_FOG_NONE) @@ -6625,7 +6626,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, settings->localviewer = !!state->render_states[WINED3D_RS_LOCALVIEWER]; settings->specular_enable = !!state->render_states[WINED3D_RS_SPECULARENABLE]; settings->point_size = state->primitive_type == WINED3D_PT_POINTLIST; - settings->per_vertex_point_size = !!(si->use_map & 1u << WINED3D_FFP_PSIZE); + settings->per_vertex_point_size = vdecl->point_size; wined3d_get_material_colour_source(&diffuse_source, &emissive_source, &ambient_source, &specular_source, state, si); diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index c48c621bd11..d86b6afc41c 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -219,7 +219,9 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara alignment = 4; if (e->usage == WINED3D_DECL_USAGE_POSITIONT) - declaration->position_transformed = TRUE; + declaration->position_transformed = true; + else if (e->usage == WINED3D_DECL_USAGE_PSIZE) + declaration->point_size = true; /* Find the streams used in the declaration. The vertex buffers have * to be loaded when drawing, but filter tessellation pseudo streams. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 85badd3b2c3..ff192c1b3f4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3491,7 +3491,8 @@ struct wined3d_vertex_declaration struct wined3d_vertex_declaration_element *elements; unsigned int element_count; - BOOL position_transformed; + bool position_transformed; + bool point_size; }; bool wined3d_light_state_enable_light(struct wined3d_light_state *state, const struct wined3d_d3d_info *d3d_info,

1 0

Elizabeth Figura : wined3d: Just check the vertex declaration for colour usage.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 4929e519323c41cc32aa01434980ba1316fcfac7 URL: https://gitlab.winehq.org/wine/wine/-/commit/4929e519323c41cc32aa01434980ba… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri May 3 16:57:18 2024 -0500 wined3d: Just check the vertex declaration for colour usage. Do not check the stream info. In practice, this amounts to a difference if the usage is included in the vertex declaration but the corresponding stream is not bound; however, tests show that in this case we should supply a default colour of zero. --- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/utils.c | 2 +- dlls/wined3d/vertexdeclaration.c | 4 ++++ dlls/wined3d/wined3d_private.h | 23 +++++++++++++---------- 6 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4b8a7a994b3..b74836d79c4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26083,7 +26083,7 @@ static void test_color_vertex(void) ok(SUCCEEDED(hr), "Failed to end scene, hr %#lx.\n", hr); colour = getPixelColor(device, 320, 240); - todo_wine_if (i == 13 || i == 14 || i == 16 || i == 18 || i == 19) + todo_wine_if (i == 13 || i == 14 || i == 19) ok(color_match(colour, tests[i].result, 1), "Expected colour 0x%08x for test %u, got 0x%08x.\n", tests[i].result, i, colour); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 12786f4a068..c0648f2aace 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3383,7 +3383,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO lighting = state->render_states[WINED3D_RS_LIGHTING] && (dst_fvf & (WINED3DFVF_DIFFUSE | WINED3DFVF_SPECULAR)); wined3d_get_material_colour_source(&diffuse_source, &emissive_source, - &ambient_source, &specular_source, state, stream_info); + &ambient_source, &specular_source, state); output_colour_format = wined3d_get_format(device->adapter, WINED3DFMT_B8G8R8A8_UNORM, 0); material_specular_state_colour = state->render_states[WINED3D_RS_SPECULARENABLE] ? &state->material.specular : &black; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ae618266d79..0fbff8e4597 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11759,13 +11759,13 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, const struct wined3d_vertex_declaration *vdecl = state->vertex_declaration; struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context_gl->gl_info; - BOOL specular = !!(context->stream_info.use_map & (1u << WINED3D_FFP_SPECULAR)); - BOOL diffuse = !!(context->stream_info.use_map & (1u << WINED3D_FFP_DIFFUSE)); BOOL normal = !!(context->stream_info.use_map & (1u << WINED3D_FFP_NORMAL)); const BOOL legacy_clip_planes = needs_legacy_glsl_syntax(gl_info); BOOL transformed = context->stream_info.position_transformed; BOOL wasrhw = context->last_was_rhw; bool point_size = vdecl->point_size; + bool specular = vdecl->specular; + bool diffuse = vdecl->diffuse; unsigned int i; context->last_was_rhw = transformed; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 98b58cbeb06..df502af247f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6629,7 +6629,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, settings->per_vertex_point_size = vdecl->point_size; wined3d_get_material_colour_source(&diffuse_source, &emissive_source, - &ambient_source, &specular_source, state, si); + &ambient_source, &specular_source, state); settings->diffuse_source = diffuse_source; settings->emissive_source = emissive_source; settings->ambient_source = ambient_source; diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index d86b6afc41c..9affc604f13 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -222,6 +222,10 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara declaration->position_transformed = true; else if (e->usage == WINED3D_DECL_USAGE_PSIZE) declaration->point_size = true; + else if (e->usage == WINED3D_DECL_USAGE_COLOR && !e->usage_idx) + declaration->diffuse = true; + else if (e->usage == WINED3D_DECL_USAGE_COLOR && e->usage_idx == 1) + declaration->specular = true; /* Find the streams used in the declaration. The vertex buffers have * to be loaded when drawing, but filter tessellation pseudo streams. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ff192c1b3f4..a1a981d5a4c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3493,6 +3493,8 @@ struct wined3d_vertex_declaration bool position_transformed; bool point_size; + bool diffuse; + bool specular; }; bool wined3d_light_state_enable_light(struct wined3d_light_state *state, const struct wined3d_d3d_info *d3d_info, @@ -4625,21 +4627,22 @@ static inline void wined3d_not_from_cs(const struct wined3d_cs *cs) assert(cs->thread_id != GetCurrentThreadId()); } -static inline enum wined3d_material_color_source validate_material_colour_source(WORD use_map, - enum wined3d_material_color_source source) +static inline enum wined3d_material_color_source validate_material_colour_source( + const struct wined3d_vertex_declaration *vdecl, enum wined3d_material_color_source source) { - if (source == WINED3D_MCS_COLOR1 && use_map & (1u << WINED3D_FFP_DIFFUSE)) + if (source == WINED3D_MCS_COLOR1 && vdecl->diffuse) return source; - if (source == WINED3D_MCS_COLOR2 && use_map & (1u << WINED3D_FFP_SPECULAR)) + if (source == WINED3D_MCS_COLOR2 && vdecl->specular) return source; return WINED3D_MCS_MATERIAL; } static inline void wined3d_get_material_colour_source(enum wined3d_material_color_source *diffuse, enum wined3d_material_color_source *emissive, enum wined3d_material_color_source *ambient, - enum wined3d_material_color_source *specular, const struct wined3d_state *state, - const struct wined3d_stream_info *si) + enum wined3d_material_color_source *specular, const struct wined3d_state *state) { + const struct wined3d_vertex_declaration *vdecl = state->vertex_declaration; + if (!state->render_states[WINED3D_RS_LIGHTING]) { *diffuse = WINED3D_MCS_COLOR1; @@ -4656,10 +4659,10 @@ static inline void wined3d_get_material_colour_source(enum wined3d_material_colo return; } - *diffuse = validate_material_colour_source(si->use_map, state->render_states[WINED3D_RS_DIFFUSEMATERIALSOURCE]); - *emissive = validate_material_colour_source(si->use_map, state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE]); - *ambient = validate_material_colour_source(si->use_map, state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE]); - *specular = validate_material_colour_source(si->use_map, state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE]); + *diffuse = validate_material_colour_source(vdecl, state->render_states[WINED3D_RS_DIFFUSEMATERIALSOURCE]); + *emissive = validate_material_colour_source(vdecl, state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE]); + *ambient = validate_material_colour_source(vdecl, state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE]); + *specular = validate_material_colour_source(vdecl, state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE]); } static inline void wined3d_vec4_transform(struct wined3d_vec4 *dst,

1 0

Elizabeth Figura : wined3d: Just check the vertex declaration for normal usage.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 89a71df48ee6943d390c515e2408a25ac3fcceb0 URL: https://gitlab.winehq.org/wine/wine/-/commit/89a71df48ee6943d390c515e2408a2… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri May 3 17:14:34 2024 -0500 wined3d: Just check the vertex declaration for normal usage. Do not check the stream info. This would make a difference if the usage was included in the vertex declaration but the corresponding stream is not bound. However, in that case we supply a default stream containing zero, which provides the same behaviour as if the normal usage is not included in the vertex declaration. --- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/vertexdeclaration.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0fbff8e4597..4e7655186bf 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11759,13 +11759,13 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, const struct wined3d_vertex_declaration *vdecl = state->vertex_declaration; struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context_gl->gl_info; - BOOL normal = !!(context->stream_info.use_map & (1u << WINED3D_FFP_NORMAL)); const BOOL legacy_clip_planes = needs_legacy_glsl_syntax(gl_info); BOOL transformed = context->stream_info.position_transformed; BOOL wasrhw = context->last_was_rhw; bool point_size = vdecl->point_size; bool specular = vdecl->specular; bool diffuse = vdecl->diffuse; + bool normal = vdecl->normal; unsigned int i; context->last_was_rhw = transformed; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index df502af247f..7d2bef8b7cc 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6620,7 +6620,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, settings->clipping = state->render_states[WINED3D_RS_CLIPPING] && state->render_states[WINED3D_RS_CLIPPLANEENABLE]; - settings->normal = !!(si->use_map & (1u << WINED3D_FFP_NORMAL)); + settings->normal = vdecl->normal; settings->normalize = settings->normal && state->render_states[WINED3D_RS_NORMALIZENORMALS]; settings->lighting = !!state->render_states[WINED3D_RS_LIGHTING]; settings->localviewer = !!state->render_states[WINED3D_RS_LOCALVIEWER]; diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 9affc604f13..f2df8979089 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -226,6 +226,8 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara declaration->diffuse = true; else if (e->usage == WINED3D_DECL_USAGE_COLOR && e->usage_idx == 1) declaration->specular = true; + else if (e->usage == WINED3D_DECL_USAGE_NORMAL) + declaration->normal = true; /* Find the streams used in the declaration. The vertex buffers have * to be loaded when drawing, but filter tessellation pseudo streams. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a1a981d5a4c..14a91875014 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3495,6 +3495,7 @@ struct wined3d_vertex_declaration bool point_size; bool diffuse; bool specular; + bool normal; }; bool wined3d_light_state_enable_light(struct wined3d_light_state *state, const struct wined3d_d3d_info *d3d_info,

1 0

Elizabeth Figura : wined3d: Just check the vertex declaration for texcoord usage.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: c825c885d389643114ce8c7d900e4bfc6d9828a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/c825c885d389643114ce8c7d900e4b… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri May 3 17:28:06 2024 -0500 wined3d: Just check the vertex declaration for texcoord usage. Do not check the stream info. This would make a difference if the usage was included in the vertex declaration but the corresponding stream is not bound; however, in that case we supply a default stream containing zero, which provides the same behaviour as if the usage is not included in the vertex declaration. --- dlls/wined3d/utils.c | 7 +++---- dlls/wined3d/vertexdeclaration.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7d2bef8b7cc..e0519942e1a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6507,11 +6507,10 @@ void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, } else { - const struct wined3d_stream_info *si = &context->stream_info; unsigned int coord_idx = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; if ((state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX] >> WINED3D_FFP_TCI_SHIFT) & WINED3D_FFP_TCI_MASK - || (coord_idx < WINED3D_MAX_FFP_TEXTURES && (si->use_map & (1u << (WINED3D_FFP_TEXCOORD0 + coord_idx))))) + || (coord_idx < WINED3D_MAX_FFP_TEXTURES && (state->vertex_declaration->texcoords & (1u << coord_idx)))) settings->texcoords_initialized |= 1u << i; } } @@ -6588,7 +6587,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, for (i = 0; i < WINED3D_MAX_FFP_TEXTURES; ++i) { coord_idx = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; - if (coord_idx < WINED3D_MAX_FFP_TEXTURES && (si->use_map & (1u << (WINED3D_FFP_TEXCOORD0 + coord_idx)))) + if (coord_idx < WINED3D_MAX_FFP_TEXTURES && (vdecl->texcoords & (1u << coord_idx))) settings->texcoords |= 1u << i; settings->texgen[i] = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; } @@ -6638,7 +6637,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, for (i = 0; i < WINED3D_MAX_FFP_TEXTURES; ++i) { coord_idx = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; - if (coord_idx < WINED3D_MAX_FFP_TEXTURES && (si->use_map & (1u << (WINED3D_FFP_TEXCOORD0 + coord_idx)))) + if (coord_idx < WINED3D_MAX_FFP_TEXTURES && (vdecl->texcoords & (1u << coord_idx))) settings->texcoords |= 1u << i; settings->texgen[i] = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; } diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index f2df8979089..7d74d9c385e 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -228,6 +228,8 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara declaration->specular = true; else if (e->usage == WINED3D_DECL_USAGE_NORMAL) declaration->normal = true; + else if (e->usage == WINED3D_DECL_USAGE_TEXCOORD) + declaration->texcoords |= (1u << e->usage_idx); /* Find the streams used in the declaration. The vertex buffers have * to be loaded when drawing, but filter tessellation pseudo streams. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 14a91875014..63e05239ac0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3496,6 +3496,7 @@ struct wined3d_vertex_declaration bool diffuse; bool specular; bool normal; + uint8_t texcoords; }; bool wined3d_light_state_enable_light(struct wined3d_light_state *state, const struct wined3d_d3d_info *d3d_info,

1 0