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

Alexandre Julliard : wbemprox: Don't reference yysymbol_name on older bisons.
by Alexandre Julliard 24 May '24

24 May '24

Module: wine Branch: master Commit: 5df6f5a513bcefd723a3ad226e6c77947a71af1d URL: https://gitlab.winehq.org/wine/wine/-/commit/5df6f5a513bcefd723a3ad226e6c77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 12:25:17 2024 +0200 wbemprox: Don't reference yysymbol_name on older bisons. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56718 --- dlls/wbemprox/wql.y | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 541cd2450f0..d71475fc827 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -299,7 +299,9 @@ associatorsof: } PARSER_BUBBLE_UP_VIEW( parser, $$, view ); +#if YYBISON >= 30704 (void)yysymbol_name; /* avoid unused function warning */ +#endif } | TK_ASSOCIATORS TK_OF path TK_WHERE keywordlist {

1 0

Alistair Leslie-Hughes : include: Complete __wine_uuidof for C++.
by Alexandre Julliard 24 May '24

24 May '24

Module: wine Branch: master Commit: 5813a1fe23d859f1c77a087b283562d1026ba94f URL: https://gitlab.winehq.org/wine/wine/-/commit/5813a1fe23d859f1c77a087b283562… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 24 17:41:26 2024 +1000 include: Complete __wine_uuidof for C++. /usr/local/include/wine/windows/guiddef.h:83:68: error: incomplete type ‘__wine_uuidof_type<IUnknown>::inst’ {aka ‘__wine_uuidof<IUnknown>’} used in nested name specifier 83 | #define __uuidof(type) __wine_uuidof_type<__typeof__(type)>::inst::uuid --- include/guiddef.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/guiddef.h b/include/guiddef.h index c5ba9635b89..0837ed34ad7 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -56,8 +56,9 @@ typedef struct _GUID #ifdef __WINE_UUID_ATTR extern "C++" { - template<typename T> struct __wine_uuidof; - + template<typename T> struct __wine_uuidof { + static const GUID uuid; + }; template<typename T> struct __wine_uuidof_type { typedef __wine_uuidof<T> inst; };

1 0

Alistair Leslie-Hughes : include: Add C++ support for IUnknown.
by Alexandre Julliard 24 May '24

24 May '24

Module: wine Branch: master Commit: 77583eed19e63221b0a3821f1956c7055f9a31c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/77583eed19e63221b0a3821f1956c7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 24 17:41:26 2024 +1000 include: Add C++ support for IUnknown. --- include/unknwn.idl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/unknwn.idl b/include/unknwn.idl index 7856a7f5047..0798ccf79ab 100644 --- a/include/unknwn.idl +++ b/include/unknwn.idl @@ -39,12 +39,35 @@ interface IUnknown { typedef [unique] IUnknown *LPUNKNOWN; +cpp_quote("#if defined(__cplusplus) && !defined(CINTERFACE)") +cpp_quote("EXTERN_C const IID IID_IUnknown;") +cpp_quote("extern \"C++\"") +cpp_quote("{") +cpp_quote(" MIDL_INTERFACE(\"00000000-0000-0000-c000-000000000046\")") +cpp_quote(" IUnknown") +cpp_quote(" {") +cpp_quote(" public:") +cpp_quote(" BEGIN_INTERFACE") +cpp_quote(" virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject) = 0;") +cpp_quote(" virtual ULONG STDMETHODCALLTYPE AddRef(void) = 0;") +cpp_quote(" virtual ULONG STDMETHODCALLTYPE Release(void) = 0;") + +cpp_quote(" template<class iface>") +cpp_quote(" HRESULT STDMETHODCALLTYPE QueryInterface(iface** pp)") +cpp_quote(" {") +cpp_quote(" return QueryInterface(__uuidof(iface), (void **)pp);") +cpp_quote(" }") +cpp_quote(" END_INTERFACE") +cpp_quote(" };") +cpp_quote("}") +cpp_quote("#else") HRESULT QueryInterface( [in] REFIID riid, [out, iid_is(riid)] void **ppvObject); ULONG AddRef(); ULONG Release(); } +cpp_quote("#endif") cpp_quote("HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown* This, REFIID riid, void **ppvObject);") cpp_quote("void __RPC_STUB IUnknown_QueryInterface_Stub(IRpcStubBuffer* This, IRpcChannelBuffer* pRpcChannelBuffer,")

1 0

Henri Verbeet : vkd3d-shader: Use a separate allocation for the "semantic_name" field of shader signature elements.
by Alexandre Julliard 23 May '24

23 May '24

Module: vkd3d Branch: master Commit: b5ac6ac636ec3594d8c440c6a789b0e3204d2d49 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b5ac6ac636ec3594d8c440c6a789b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 21 20:11:26 2024 +0200 vkd3d-shader: Use a separate allocation for the "semantic_name" field of shader signature elements. For tpf shader this would previously be a pointer into the original shader code, and for d3dbc shaders we'd use static strings. Unfortunately the dxil parser creates shader signatures where these are pointers to metadata strings, and those go away when we call sm6_parser_cleanup(). We could conceivably store a flag in the shader signature to indicate whether shader_signature_cleanup()/vkd3d_shader_free_shader_signature() should free the "semantic_name" field. It'd be a little ugly, and seems unlikely to be worth it, but I'd be willing to be convinced. --- libs/vkd3d-shader/d3dbc.c | 3 ++- libs/vkd3d-shader/dxbc.c | 10 ++++++++-- libs/vkd3d-shader/dxil.c | 17 ++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_main.c | 18 +++++++++++++++++- 4 files changed, 43 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 58f830dd..f33146e3 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -559,7 +559,8 @@ static bool add_signature_element(struct vkd3d_shader_sm1_parser *sm1, bool outp element = &signature->elements[signature->element_count++]; memset(element, 0, sizeof(*element)); - element->semantic_name = name; + if (!(element->semantic_name = vkd3d_strdup(name))) + return false; element->semantic_index = index; element->sysval_semantic = sysval; element->component_type = VKD3D_SHADER_COMPONENT_FLOAT; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 8a1012d9..4b9f6723 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -360,7 +360,7 @@ static int shader_parse_signature(const struct vkd3d_shader_dxbc_section_desc *s uint32_t count, header_size; struct signature_element *e; const char *ptr = data; - unsigned int i; + unsigned int i, j; if (!require_space(0, 2, sizeof(uint32_t), section->data.size)) { @@ -403,6 +403,7 @@ static int shader_parse_signature(const struct vkd3d_shader_dxbc_section_desc *s for (i = 0; i < count; ++i) { size_t name_offset; + const char *name; uint32_t mask; e[i].sort_index = i; @@ -413,9 +414,14 @@ static int shader_parse_signature(const struct vkd3d_shader_dxbc_section_desc *s e[i].stream_index = 0; name_offset = read_u32(&ptr); - if (!(e[i].semantic_name = shader_get_string(data, section->data.size, name_offset))) + if (!(name = shader_get_string(data, section->data.size, name_offset)) + || !(e[i].semantic_name = vkd3d_strdup(name))) { WARN("Invalid name offset %#zx (data size %#zx).\n", name_offset, section->data.size); + for (j = 0; j < i; ++j) + { + vkd3d_free((void *)e[j].semantic_name); + } vkd3d_free(e); return VKD3D_ERROR_INVALID_ARGUMENT; } diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 4943a586..73a8d868 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -9445,7 +9445,22 @@ static enum vkd3d_result sm6_parser_read_signature(struct sm6_parser *sm6, const } } - vkd3d_free(s->elements); + for (i = 0; i < operand_count; ++i) + { + if ((elements[i].semantic_name = vkd3d_strdup(elements[i].semantic_name))) + continue; + + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, + "Failed to allocate signature element semantic name."); + for (j = 0; j < i; ++j) + { + vkd3d_free((void *)elements[j].semantic_name); + } + vkd3d_free(elements); + return VKD3D_ERROR_OUT_OF_MEMORY; + } + + shader_signature_cleanup(s); s->elements = elements; s->element_count = operand_count; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 27a88a12..cee7a296 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -657,7 +657,15 @@ static bool vkd3d_shader_signature_from_shader_signature(struct vkd3d_shader_sig struct vkd3d_shader_signature_element *d = &signature->elements[i]; struct signature_element *e = &src->elements[i]; - d->semantic_name = e->semantic_name; + if (!(d->semantic_name = vkd3d_strdup(e->semantic_name))) + { + for (unsigned int j = 0; j < i; ++j) + { + vkd3d_free((void *)signature->elements[j].semantic_name); + } + vkd3d_free(signature->elements); + return false; + } d->semantic_index = e->semantic_index; d->stream_index = e->stream_index; d->sysval_semantic = e->sysval_semantic; @@ -1763,6 +1771,10 @@ void vkd3d_shader_free_root_signature(struct vkd3d_shader_versioned_root_signatu void shader_signature_cleanup(struct shader_signature *signature) { + for (unsigned int i = 0; i < signature->element_count; ++i) + { + vkd3d_free((void *)signature->elements[i].semantic_name); + } vkd3d_free(signature->elements); signature->elements = NULL; } @@ -1820,6 +1832,10 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature { TRACE("signature %p.\n", signature); + for (unsigned int i = 0; i < signature->element_count; ++i) + { + vkd3d_free((void *)signature->elements[i].semantic_name); + } vkd3d_free(signature->elements); signature->elements = NULL; }

1 0

Nikolay Sivov : vkd3d-shader: Remove explicit newlines from hlsl_fixme() messages.
by Alexandre Julliard 23 May '24

23 May '24

Module: vkd3d Branch: master Commit: f090d1e80d8b6617b71f25dd422665b44759f3d0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f090d1e80d8b6617b71f25dd42266… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 23 00:57:32 2024 +0200 vkd3d-shader: Remove explicit newlines from hlsl_fixme() messages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/d3dbc.c | 8 ++++---- libs/vkd3d-shader/hlsl_codegen.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index f33146e3..bfd5b52b 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2051,7 +2051,7 @@ static void write_sm1_cast(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b case HLSL_TYPE_BOOL: /* Casts to bool should have already been lowered. */ default: - hlsl_fixme(ctx, &expr->node.loc, "SM1 cast from %s to %s.\n", + hlsl_fixme(ctx, &expr->node.loc, "SM1 cast from %s to %s.", debug_hlsl_type(ctx, src_type), debug_hlsl_type(ctx, dst_type)); break; } @@ -2459,7 +2459,7 @@ static void write_sm1_jump(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b } default: - hlsl_fixme(ctx, &jump->node.loc, "Jump type %s.\n", hlsl_jump_type_to_string(jump->type)); + hlsl_fixme(ctx, &jump->node.loc, "Jump type %s.", hlsl_jump_type_to_string(jump->type)); } } @@ -2547,7 +2547,7 @@ static void write_sm1_resource_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_ break; default: - hlsl_fixme(ctx, &instr->loc, "Resource load type %u\n", load->load_type); + hlsl_fixme(ctx, &instr->loc, "Resource load type %u.", load->load_type); return; } @@ -2579,7 +2579,7 @@ static void write_sm1_store(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * if (store->lhs.var->data_type->class == HLSL_CLASS_MATRIX) { - hlsl_fixme(ctx, &instr->loc, "Lower matrix writemasks.\n"); + hlsl_fixme(ctx, &instr->loc, "Lower matrix writemasks."); return; } diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 27f16af5..bdb72a1f 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2988,7 +2988,7 @@ static bool lower_ternary(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, stru if (cond->data_type->class > HLSL_CLASS_VECTOR || instr->data_type->class > HLSL_CLASS_VECTOR) { - hlsl_fixme(ctx, &instr->loc, "Lower ternary of type other than scalar or vector.\n"); + hlsl_fixme(ctx, &instr->loc, "Lower ternary of type other than scalar or vector."); return false; }

1 0

Jacek Caban : ntdll: Use assembly wrapper for unixlib calls on ARM64EC.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: 434702fdc94480648c0a2036f682ef3dc1f8d48c URL: https://gitlab.winehq.org/wine/wine/-/commit/434702fdc94480648c0a2036f682ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 16 13:03:22 2024 +0200 ntdll: Use assembly wrapper for unixlib calls on ARM64EC. Instead of using indirect C calls, which need to go through the call dispatcher. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_arm64ec.c | 17 ++++++++++++++++- dlls/ntdll/unix/loader.c | 13 ++++++++++++- dlls/winecrt0/unix_lib.c | 25 +++++++++++++++++++++++++ include/wine/unixlib.h | 8 ++++++++ 5 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d32c95c49ad..2d2ec919c5c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1723,6 +1723,7 @@ @ stdcall __wine_ctrl_routine(ptr) @ extern -private __wine_syscall_dispatcher @ extern -private __wine_unix_call_dispatcher +@ extern -private -arch=arm64ec __wine_unix_call_dispatcher_arm64ec @ extern -private __wine_unixlib_handle # Debugging diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 8caf4218ab9..a79996f8b48 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -2227,6 +2227,22 @@ ULONG WINAPI RtlWalkFrameChain( void **buffer, ULONG count, ULONG flags ) } +/************************************************************************* + * __wine_unix_call_arm64ec + */ +NTSTATUS __attribute__((naked)) __wine_unix_call_arm64ec( unixlib_handle_t handle, unsigned int code, void *args ) +{ + asm( ".seh_proc \"#__wine_unix_call_arm64ec\"\n\t" + ".seh_endprologue\n\t" + "adrp x16, __wine_unix_call_dispatcher_arm64ec\n\t" + "ldr x16, [x16, #:lo12:__wine_unix_call_dispatcher_arm64ec]\n\t" + "br x16\n\t" + ".seh_endproc" ); +} + +NTSTATUS (WINAPI *__wine_unix_call_dispatcher_arm64ec)( unixlib_handle_t, unsigned int, void * ) = __wine_unix_call_arm64ec; + + static int code_match( BYTE *code, const BYTE *seq, size_t len ) { for ( ; len; len--, code++, seq++) if (*seq && *code != *seq) return 0; @@ -2262,7 +2278,6 @@ void *check_call( void **target, void *exit_thunk, void *dest ) for (;;) { - if (dest == __wine_unix_call_dispatcher) return dest; if (RtlIsEcCode( (ULONG_PTR)dest )) return dest; if (code_match( dest, jmp_sequence, sizeof(jmp_sequence) )) { diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 06959fa95df..9d866fa70f5 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1517,6 +1517,7 @@ static void load_ntdll_functions( HMODULE module ) { void **p__wine_syscall_dispatcher; void **p__wine_unix_call_dispatcher; + void **p__wine_unix_call_dispatcher_arm64ec = NULL; unixlib_handle_t *p__wine_unixlib_handle; const IMAGE_EXPORT_DIRECTORY *exports; @@ -1539,9 +1540,19 @@ static void load_ntdll_functions( HMODULE module ) GET_FUNC( __wine_syscall_dispatcher ); GET_FUNC( __wine_unix_call_dispatcher ); GET_FUNC( __wine_unixlib_handle ); + if (is_arm64ec()) + { + GET_FUNC( __wine_unix_call_dispatcher_arm64ec ); + } *p__wine_syscall_dispatcher = __wine_syscall_dispatcher; - *p__wine_unix_call_dispatcher = __wine_unix_call_dispatcher; *p__wine_unixlib_handle = (UINT_PTR)unix_call_funcs; + if (p__wine_unix_call_dispatcher_arm64ec) + { + /* redirect __wine_unix_call_dispatcher to __wine_unix_call_dispatcher_arm64ec */ + *p__wine_unix_call_dispatcher = *p__wine_unix_call_dispatcher_arm64ec; + *p__wine_unix_call_dispatcher_arm64ec = __wine_unix_call_dispatcher; + } + else *p__wine_unix_call_dispatcher = __wine_unix_call_dispatcher; #undef GET_FUNC } diff --git a/dlls/winecrt0/unix_lib.c b/dlls/winecrt0/unix_lib.c index fd5087cbe48..ebf6594e770 100644 --- a/dlls/winecrt0/unix_lib.c +++ b/dlls/winecrt0/unix_lib.c @@ -64,6 +64,31 @@ static NTSTATUS WINAPI unix_call_init( unixlib_handle_t handle, unsigned int cod unixlib_handle_t __wine_unixlib_handle = 0; NTSTATUS (WINAPI *__wine_unix_call_dispatcher)( unixlib_handle_t, unsigned int, void * ) = unix_call_init; +#ifdef __arm64ec__ + +static NTSTATUS WINAPI unix_call_init_arm64ec( unixlib_handle_t handle, unsigned int code, void *args ); + +static __attribute__((used)) NTSTATUS (WINAPI *__wine_unix_call_dispatcher_arm64ec)( unixlib_handle_t, unsigned int, void * ) = unix_call_init_arm64ec; + +static NTSTATUS WINAPI unix_call_init_arm64ec( unixlib_handle_t handle, unsigned int code, void *args ) +{ + InterlockedExchangePointer( (void **)&__wine_unix_call_dispatcher_arm64ec, + get_dispatcher( "__wine_unix_call_dispatcher_arm64ec" )); + return __wine_unix_call_arm64ec( handle, code, args ); +} + +NTSTATUS __attribute__((naked)) __wine_unix_call_arm64ec( unixlib_handle_t handle, unsigned int code, void *args ) +{ + asm( ".seh_proc \"#__wine_unix_call_arm64ec\"\n\t" + ".seh_endprologue\n\t" + "adrp x16, __wine_unix_call_dispatcher_arm64ec\n\t" + "ldr x16, [x16, #:lo12:__wine_unix_call_dispatcher_arm64ec]\n\t" + "br x16\n\t" + ".seh_endproc" ); +} + +#endif + NTSTATUS WINAPI __wine_init_unix_call(void) { return NtQueryVirtualMemory( GetCurrentProcess(), image_base(), MemoryWineUnixFuncs, diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 17ec93110f2..9a342fada73 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -262,10 +262,18 @@ extern unixlib_handle_t __wine_unixlib_handle; extern NTSTATUS (WINAPI *__wine_unix_call_dispatcher)( unixlib_handle_t, unsigned int, void * ); extern NTSTATUS WINAPI __wine_init_unix_call(void); +#ifdef __arm64ec__ +NTSTATUS __wine_unix_call_arm64ec( unixlib_handle_t handle, unsigned int code, void *args ); +static inline NTSTATUS __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ) +{ + return __wine_unix_call_arm64ec( handle, code, args ); +} +#else static inline NTSTATUS __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ) { return __wine_unix_call_dispatcher( handle, code, args ); } +#endif #define WINE_UNIX_CALL(code,args) __wine_unix_call( __wine_unixlib_handle, (code), (args) )

1 0

Elizabeth Figura : wined3d: Remove the no longer used STATE_SAMPLER.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: 870f1b02f952d5b4a0507b3a2b80e193247b607d URL: https://gitlab.winehq.org/wine/wine/-/commit/870f1b02f952d5b4a0507b3a2b80e1… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Apr 26 17:20:12 2024 -0500 wined3d: Remove the no longer used STATE_SAMPLER. --- dlls/wined3d/adapter_vk.c | 21 --------------------- dlls/wined3d/context_gl.c | 6 ------ dlls/wined3d/cs.c | 11 ----------- dlls/wined3d/directx.c | 21 --------------------- dlls/wined3d/ffp_gl.c | 25 ------------------------- dlls/wined3d/texture.c | 15 --------------- dlls/wined3d/utils.c | 2 -- dlls/wined3d/view.c | 6 ------ dlls/wined3d/wined3d_private.h | 6 +----- 9 files changed, 1 insertion(+), 112 deletions(-)

1 0

Elizabeth Figura : wined3d: Remove the no longer used STATE_POINTSPRITECOORDORIGIN.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: 3bd79e0ef21374f3e0cc9137275f52e4f2e7ccaf URL: https://gitlab.winehq.org/wine/wine/-/commit/3bd79e0ef21374f3e0cc9137275f52… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri May 10 19:14:47 2024 -0500 wined3d: Remove the no longer used STATE_POINTSPRITECOORDORIGIN. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/context_gl.c | 6 ++++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/ffp_gl.c | 23 ----------------------- dlls/wined3d/utils.c | 2 -- dlls/wined3d/wined3d_private.h | 5 +---- 6 files changed, 7 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 9cdd731bcf5..1b0a402b233 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -44,7 +44,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_DEPTH_BOUNDS, {STATE_DEPTH_BOUNDS, state_nop}}, {STATE_RASTERIZER, {STATE_RASTERIZER, state_nop}}, {STATE_SCISSORRECT, {STATE_SCISSORRECT, state_nop}}, - {STATE_POINTSPRITECOORDORIGIN, {STATE_POINTSPRITECOORDORIGIN, state_nop}}, {STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT00), {STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT00), state_nop}}, {STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT01), {STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT00)}}, diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index d1181c3cb1f..d066e7293a6 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2230,6 +2230,12 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi } } + if (!gl_info->supported[ARB_CLIP_CONTROL] && gl_info->supported[WINED3D_GL_VERSION_2_0]) + { + GL_EXTCALL(glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_LOWER_LEFT)); + checkGLcall("glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_LOWER_LEFT)"); + } + if (gl_info->supported[ARB_PROVOKING_VERTEX]) { GL_EXTCALL(glProvokingVertex(GL_FIRST_VERTEX_CONVENTION)); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 67fd4b9d680..9df95bdea55 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2766,7 +2766,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_VDECL, {STATE_VDECL, state_nop}}, {STATE_RASTERIZER, {STATE_VDECL}}, {STATE_SCISSORRECT, {STATE_VDECL}}, - {STATE_POINTSPRITECOORDORIGIN, {STATE_VDECL}}, {STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT00), {STATE_VDECL}}, {STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT01), {STATE_VDECL}}, diff --git a/dlls/wined3d/ffp_gl.c b/dlls/wined3d/ffp_gl.c index ab0e5afab24..e2b9be647d0 100644 --- a/dlls/wined3d/ffp_gl.c +++ b/dlls/wined3d/ffp_gl.c @@ -1318,25 +1318,6 @@ static void rasterizer_cc(struct wined3d_context *context, const struct wined3d_ line_antialias(r, gl_info); } -static void psorigin_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - static BOOL warned; - - if (!warned) - { - WARN("Point sprite coordinate origin switching not supported.\n"); - warned = TRUE; - } -} - -static void psorigin(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; - - GL_EXTCALL(glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_LOWER_LEFT)); - checkGLcall("glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, ...)"); -} - void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; @@ -1510,9 +1491,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RASTERIZER, { STATE_RASTERIZER, rasterizer_cc }, ARB_CLIP_CONTROL }, { STATE_RASTERIZER, { STATE_RASTERIZER, rasterizer }, WINED3D_GL_EXT_NONE }, { STATE_SCISSORRECT, { STATE_SCISSORRECT, scissorrect }, WINED3D_GL_EXT_NONE }, - { STATE_POINTSPRITECOORDORIGIN, { STATE_POINTSPRITECOORDORIGIN, state_nop }, ARB_CLIP_CONTROL }, - { STATE_POINTSPRITECOORDORIGIN, { STATE_POINTSPRITECOORDORIGIN, psorigin }, WINED3D_GL_VERSION_2_0 }, - { STATE_POINTSPRITECOORDORIGIN, { STATE_POINTSPRITECOORDORIGIN, psorigin_w }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT00), { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT00), shader_bumpenv }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT01), { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT10), { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, @@ -1752,7 +1730,6 @@ static void validate_state_table(struct wined3d_state_entry *state_table) STATE_LIGHT_TYPE, STATE_SCISSORRECT, STATE_RASTERIZER, - STATE_POINTSPRITECOORDORIGIN, STATE_BASEVERTEXINDEX, STATE_FRAMEBUFFER, STATE_POINT_ENABLE, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2d576b77c66..642c5e64eee 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5387,8 +5387,6 @@ const char *debug_d3dstate(uint32_t state) return "STATE_RASTERIZER"; if (STATE_IS_DEPTH_BOUNDS(state)) return "STATE_DEPTH_BOUNDS"; - if (STATE_IS_POINTSPRITECOORDORIGIN(state)) - return "STATE_POINTSPRITECOORDORIGIN"; if (STATE_IS_BASEVERTEXINDEX(state)) return "STATE_BASEVERTEXINDEX"; if (STATE_IS_FRAMEBUFFER(state)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 35002309a42..96762351f21 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1778,10 +1778,7 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state #define STATE_DEPTH_BOUNDS (STATE_RASTERIZER + 1) #define STATE_IS_DEPTH_BOUNDS(a) ((a) == STATE_DEPTH_BOUNDS) -#define STATE_POINTSPRITECOORDORIGIN (STATE_DEPTH_BOUNDS + 1) -#define STATE_IS_POINTSPRITECOORDORIGIN(a) ((a) == STATE_POINTSPRITECOORDORIGIN) - -#define STATE_BASEVERTEXINDEX (STATE_POINTSPRITECOORDORIGIN + 1) +#define STATE_BASEVERTEXINDEX (STATE_DEPTH_BOUNDS + 1) #define STATE_IS_BASEVERTEXINDEX(a) ((a) == STATE_BASEVERTEXINDEX) #define STATE_FRAMEBUFFER (STATE_BASEVERTEXINDEX + 1)

1 0

Elizabeth Figura : wined3d: Remove the FFP blitter.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: c782aeb49ae82b87e54c01c05be663da771faa71 URL: https://gitlab.winehq.org/wine/wine/-/commit/c782aeb49ae82b87e54c01c05be663… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Apr 26 18:00:04 2024 -0500 wined3d: Remove the FFP blitter. The GLSL blitter covers a superset of the same functionality. --- dlls/wined3d/context_gl.c | 143 ----------------------------- dlls/wined3d/texture.c | 226 ++-------------------------------------------- dlls/wined3d/wined3d_gl.h | 5 - 3 files changed, 6 insertions(+), 368 deletions(-)

1 0

Elizabeth Figura : wined3d: Remove some obsolete state invalidations.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: a728460e03b7f8340947aec810dba89f3565eddd URL: https://gitlab.winehq.org/wine/wine/-/commit/a728460e03b7f8340947aec810dba8… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Apr 26 18:11:36 2024 -0500 wined3d: Remove some obsolete state invalidations. Only the FFP vertex pipe needed these. --- dlls/wined3d/context_gl.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 0692f957cb9..ad6334016ec 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3174,7 +3174,6 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, { struct wined3d_context *context = &context_gl->c; const struct wined3d_gl_info *gl_info; - unsigned int sampler; SIZE rt_size; TRACE("Setting up context %p for blitting.\n", context); @@ -3204,15 +3203,6 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, GL_EXTCALL(glBindSampler(0, 0)); wined3d_context_gl_active_texture(context_gl, gl_info, 0); - sampler = context_gl->rev_tex_unit_map[0]; - if (sampler != WINED3D_UNMAPPED_STAGE) - { - if (sampler < WINED3D_MAX_FFP_TEXTURES) - { - context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_TEXTURE0 + sampler)); - context_invalidate_state(context, STATE_TEXTURESTAGE(sampler, WINED3D_TSS_COLOR_OP)); - } - } context_invalidate_compute_state(context, STATE_COMPUTE_SHADER_RESOURCE_BINDING); context_invalidate_state(context, STATE_GRAPHICS_SHADER_RESOURCE_BINDING);

1 0