September 2023 - Wine-commits

Matteo Bruni : wined3d: Rename wined3d_context_gl_apply_fbo_state_blit() function.
by Alexandre Julliard 15 Sep '23

15 Sep '23

Module: wine Branch: master Commit: 7d5f9e42d3acf55063ade530370d0350db428fb3 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d5f9e42d3acf55063ade530370d03… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Dec 2 02:39:27 2022 +0100 wined3d: Rename wined3d_context_gl_apply_fbo_state_blit() function. To wined3d_context_gl_apply_fbo_state_explicit(). It's not really related to blitting in principle; what it does is attaching specific textures to the FBO instead of the d3d render targets, which was the "original" use of FBOs in wined3d. BTW even that original use case (currently handled by context_state_fb()) is not using render_targets[] directly anymore and we end up kind of abusing the blit_targets[] arrays in struct wined3d_context_gl. Maybe we could rename that array as well. --- dlls/wined3d/context_gl.c | 6 +++--- dlls/wined3d/surface.c | 2 +- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d_gl.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index ab86ea19a69..eb3c8b2438e 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -850,7 +850,7 @@ static void wined3d_context_gl_apply_fbo_state(struct wined3d_context_gl *contex } /* Context activation is done by the caller. */ -void wined3d_context_gl_apply_fbo_state_blit(struct wined3d_context_gl *context_gl, GLenum target, +void wined3d_context_gl_apply_fbo_state_explicit(struct wined3d_context_gl *context_gl, GLenum target, struct wined3d_resource *rt, unsigned int rt_sub_resource_idx, struct wined3d_resource *ds, unsigned int ds_sub_resource_idx, uint32_t location) { @@ -3611,10 +3611,10 @@ void context_gl_apply_texture_draw_state(struct wined3d_context_gl *context_gl, if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { if (format->depth_size || format->stencil_size) - wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, NULL, + wined3d_context_gl_apply_fbo_state_explicit(context_gl, GL_DRAW_FRAMEBUFFER, NULL, 0, &texture->resource, sub_resource_idx, location); else - wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, &texture->resource, + wined3d_context_gl_apply_fbo_state_explicit(context_gl, GL_DRAW_FRAMEBUFFER, &texture->resource, sub_resource_idx, NULL, 0, location); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6850e984efb..b519e26ee2a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -374,7 +374,7 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_READ_FRAMEBUFFER, + wined3d_context_gl_apply_fbo_state_explicit(context_gl, GL_READ_FRAMEBUFFER, resource, sub_resource_idx, NULL, 0, src_location); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8a834c7e5ad..a59fdb7e255 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -531,7 +531,7 @@ static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_cont buffer = GL_COLOR_ATTACHMENT0; } - wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_READ_FRAMEBUFFER, + wined3d_context_gl_apply_fbo_state_explicit(context_gl, GL_READ_FRAMEBUFFER, &src_texture->resource, src_sub_resource_idx, NULL, 0, src_location); gl_info->gl_ops.gl.p_glReadBuffer(buffer); checkGLcall("glReadBuffer()"); @@ -632,7 +632,7 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct else wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); - wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_READ_FRAMEBUFFER, NULL, 0, + wined3d_context_gl_apply_fbo_state_explicit(context_gl, GL_READ_FRAMEBUFFER, NULL, 0, &src_texture->resource, src_sub_resource_idx, src_location); wined3d_context_gl_check_fbo_status(context_gl, GL_READ_FRAMEBUFFER); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 98832d54ff5..ba150476e79 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -734,7 +734,7 @@ GLuint wined3d_context_gl_allocate_vram_chunk_buffer(struct wined3d_context_gl * void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, const struct wined3d_device *device); BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, const struct wined3d_state *state, unsigned int rt_count, const struct wined3d_fb_state *fb); -void wined3d_context_gl_apply_fbo_state_blit(struct wined3d_context_gl *context_gl, GLenum target, +void wined3d_context_gl_apply_fbo_state_explicit(struct wined3d_context_gl *context_gl, GLenum target, struct wined3d_resource *rt, unsigned int rt_sub_resource_idx, struct wined3d_resource *ds, unsigned int ds_sub_resource_idx, uint32_t location); void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_gl,

1 0

Matteo Bruni : wined3d: Handle depth textures in texture2d_read_from_framebuffer().
by Alexandre Julliard 15 Sep '23

15 Sep '23

Module: wine Branch: master Commit: 0b5bd254156f37dfb9f0531f5cdbefd011755657 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b5bd254156f37dfb9f0531f5cdbef… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 6 20:37:04 2023 +0200 wined3d: Handle depth textures in texture2d_read_from_framebuffer(). --- dlls/wined3d/surface.c | 8 ++++++-- dlls/wined3d/texture.c | 3 +-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b519e26ee2a..dce1de3ac18 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -374,8 +374,12 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - wined3d_context_gl_apply_fbo_state_explicit(context_gl, GL_READ_FRAMEBUFFER, - resource, sub_resource_idx, NULL, 0, src_location); + if (resource->format->depth_size || resource->format->stencil_size) + wined3d_context_gl_apply_fbo_state_explicit(context_gl, GL_READ_FRAMEBUFFER, + NULL, 0, resource, sub_resource_idx, src_location); + else + wined3d_context_gl_apply_fbo_state_explicit(context_gl, GL_READ_FRAMEBUFFER, + resource, sub_resource_idx, NULL, 0, src_location); } /* Select the correct read buffer, and give some debug output. diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a59fdb7e255..22f69cc0cc6 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3006,8 +3006,7 @@ static BOOL wined3d_texture_gl_load_sysmem(struct wined3d_texture_gl *texture_gl return TRUE; } - if (!(texture_gl->t.resource.bind_flags & WINED3D_BIND_DEPTH_STENCIL) - && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) + if (sub_resource->locations & WINED3D_LOCATION_DRAWABLE) { texture2d_read_from_framebuffer(&texture_gl->t, sub_resource_idx, &context_gl->c, texture_gl->t.resource.draw_binding, dst_location);

1 0

Matteo Bruni : wined3d: Don't force going through a texture when downloading from renderbuffers.
by Alexandre Julliard 15 Sep '23

15 Sep '23

Module: wine Branch: master Commit: 510e262676be0aaf511316190b1d526b352a8b56 URL: https://gitlab.winehq.org/wine/wine/-/commit/510e262676be0aaf511316190b1d52… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jan 17 15:00:04 2022 +0100 wined3d: Don't force going through a texture when downloading from renderbuffers. It can be unnecessary at best and unsupported at worst (e.g. no ARB_texture_multisample or MultisampleTextures setting disabled). --- dlls/wined3d/surface.c | 10 ++++++---- dlls/wined3d/texture.c | 11 +++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dce1de3ac18..99338b91d5b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -359,6 +359,9 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i uint8_t *offset; unsigned int i; + TRACE("texture %p, sub_resource_idx %u, context %p, src_location %s, dst_location %s.\n", + texture, sub_resource_idx, context, wined3d_debug_location(src_location), wined3d_debug_location(dst_location)); + /* dst_location was already prepared by the caller. */ wined3d_texture_get_bo_address(texture, sub_resource_idx, &data, dst_location); offset = data.addr; @@ -382,10 +385,9 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i resource, sub_resource_idx, NULL, 0, src_location); } - /* Select the correct read buffer, and give some debug output. - * There is no need to keep track of the current read buffer or reset it, - * every part of the code that reads sets the read buffer as desired. - */ + /* Select the correct read buffer, and give some debug output. There is no + * need to keep track of the current read buffer or reset it, every part + * of the code that reads pixels sets the read buffer as desired. */ if (src_location != WINED3D_LOCATION_DRAWABLE || wined3d_resource_is_offscreen(resource)) { /* Mapping the primary render target which is not on a swapchain. diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 22f69cc0cc6..e5005cf99fa 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2974,18 +2974,17 @@ static BOOL wined3d_texture_gl_load_sysmem(struct wined3d_texture_gl *texture_gl sub_resource = &texture_gl->t.sub_resources[sub_resource_idx]; /* We cannot download data from multisample textures directly. */ - if (wined3d_texture_gl_is_multisample_location(texture_gl, WINED3D_LOCATION_TEXTURE_RGB)) - { + if (wined3d_texture_gl_is_multisample_location(texture_gl, WINED3D_LOCATION_TEXTURE_RGB) + || sub_resource->locations & WINED3D_LOCATION_RB_MULTISAMPLE) wined3d_texture_load_location(&texture_gl->t, sub_resource_idx, &context_gl->c, WINED3D_LOCATION_RB_RESOLVED); + + if (sub_resource->locations & WINED3D_LOCATION_RB_RESOLVED) + { texture2d_read_from_framebuffer(&texture_gl->t, sub_resource_idx, &context_gl->c, WINED3D_LOCATION_RB_RESOLVED, dst_location); return TRUE; } - if (sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED)) - wined3d_texture_load_location(&texture_gl->t, sub_resource_idx, &context_gl->c, WINED3D_LOCATION_TEXTURE_RGB); - - /* Download the sub-resource to system memory. */ if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) { unsigned int row_pitch, slice_pitch, level;

1 0

Matteo Bruni : wined3d: Skip acquiring a context for an offscreen resource in texture2d_read_from_framebuffer().
by Alexandre Julliard 15 Sep '23

15 Sep '23

Module: wine Branch: master Commit: e5652dbdb459a650267db57e98d9df63d204a631 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5652dbdb459a650267db57e98d9df… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 6 18:34:35 2023 +0200 wined3d: Skip acquiring a context for an offscreen resource in texture2d_read_from_framebuffer(). --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 99338b91d5b..87b3d3c38a4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -368,7 +368,7 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i restore_texture = context->current_rt.texture; restore_idx = context->current_rt.sub_resource_idx; - if (restore_texture != texture || restore_idx != sub_resource_idx) + if (!wined3d_resource_is_offscreen(resource) && (restore_texture != texture || restore_idx != sub_resource_idx)) context = context_acquire(device, texture, sub_resource_idx); else restore_texture = NULL;

1 0

Matteo Bruni : wined3d: Don't skip ARB fragment program selection when fog state is dirty.
by Alexandre Julliard 15 Sep '23

15 Sep '23

Module: wine Branch: master Commit: 15df23a88b8be587f2124590b971f37c2dae1bcb URL: https://gitlab.winehq.org/wine/wine/-/commit/15df23a88b8be587f2124590b971f3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 13 02:00:07 2023 +0200 wined3d: Don't skip ARB fragment program selection when fog state is dirty. This is in the same vein as e106bbdd39a5f27bce028ed992033eb0a5635f60 and further fallout from 2ddb6b66a7cda0bf6aaddc0c6899e35cc92ceee9. --- dlls/wined3d/arb_program_shader.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ff7994c0ffe..a488b4152de 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6575,28 +6575,6 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi TRACE("context %p, state %p, state_id %#lx.\n", context, state, state_id); - if (isStateDirty(context, STATE_RENDER(WINED3D_RS_FOGENABLE))) - { - if (!use_pshader && device->shader_backend == &arb_program_shader_backend && context->last_was_pshader) - { - /* Reload fixed function constants since they collide with the - * pixel shader constants. */ - for (i = 0; i < WINED3D_MAX_TEXTURES; ++i) - { - set_bumpmat_arbfp(context, state, STATE_TEXTURESTAGE(i, WINED3D_TSS_BUMPENV_MAT00)); - state_tss_constant_arbfp(context, state, STATE_TEXTURESTAGE(i, WINED3D_TSS_CONSTANT)); - } - state_texfactor_arbfp(context, state, STATE_RENDER(WINED3D_RS_TEXTUREFACTOR)); - state_arb_specularenable(context, state, STATE_RENDER(WINED3D_RS_SPECULARENABLE)); - color_key_arbfp(context, state, STATE_COLOR_KEY); - } - else if (use_pshader) - { - context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; - } - return; - } - if (!use_pshader) { /* Find or create a shader implementing the fixed function pipeline

1 0

Zebediah Figura : sensapi: Remove unnecessary includes.
by Alexandre Julliard 15 Sep '23

15 Sep '23

Module: wine Branch: master Commit: 4108dbf1bb5aa458c4c63707e524b5d4130da7f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/4108dbf1bb5aa458c4c63707e524b5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 6 13:01:36 2023 -0500 sensapi: Remove unnecessary includes. --- dlls/sensapi/sensapi.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/sensapi/sensapi.c b/dlls/sensapi/sensapi.c index 0588036609c..7305227b0aa 100644 --- a/dlls/sensapi/sensapi.c +++ b/dlls/sensapi/sensapi.c @@ -23,20 +23,13 @@ */ #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "ole2.h" #include "sensevts.h" #include "sensapi.h" -#include "uuids.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(sensapi);

1 0

Alexandre Julliard : ntdll: Fixup the pc address for breakpoint exceptions on ARM64.
by Alexandre Julliard 15 Sep '23

15 Sep '23

Module: wine Branch: master Commit: 4fabaa6a284fc9409faff03d69f5b48efc8e8aa6 URL: https://gitlab.winehq.org/wine/wine/-/commit/4fabaa6a284fc9409faff03d69f5b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 15 15:57:09 2023 +0200 ntdll: Fixup the pc address for breakpoint exceptions on ARM64. --- dlls/ntdll/unix/signal_arm64.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 6dbc3fd5a59..4897b8e1824 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1018,6 +1018,9 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) return; } + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ + if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context.Pc -= 4; + stack = virtual_setup_exception( stack_ptr, (sizeof(*stack) + 15) & ~15, rec ); stack->rec = *rec; stack->context = context; @@ -1336,6 +1339,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) NtRaiseException( &rec, &ctx, FALSE ); return; } + PC_sig( context ) += 4; /* skip the brk instruction */ rec.ExceptionCode = EXCEPTION_BREAKPOINT; rec.NumberParameters = 1; break;

1 0

Alexandre Julliard : ntdll: Fix the SystemProcessorFeaturesInformation value on ARM platforms.
by Alexandre Julliard 15 Sep '23

15 Sep '23

Module: wine Branch: master Commit: 6cde96fb38772b06fbc6b61de594b7e30cae0546 URL: https://gitlab.winehq.org/wine/wine/-/commit/6cde96fb38772b06fbc6b61de594b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 15 15:58:40 2023 +0200 ntdll: Fix the SystemProcessorFeaturesInformation value on ARM platforms. --- dlls/ntdll/unix/system.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 4805e765af0..4fbe45b2dd9 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -459,6 +459,7 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) static inline void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) { + ULONGLONG features = 0; #ifdef linux char line[512]; char *s, *value; @@ -489,8 +490,8 @@ static inline void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) } if (!strcmp( line, "Features" )) { - if (strstr(value, "crc32")) info->ProcessorFeatureBits |= CPU_FEATURE_ARM_V8_CRC32; - if (strstr(value, "aes")) info->ProcessorFeatureBits |= CPU_FEATURE_ARM_V8_CRYPTO; + if (strstr(value, "crc32")) features |= CPU_FEATURE_ARM_V8_CRC32; + if (strstr(value, "aes")) features |= CPU_FEATURE_ARM_V8_CRYPTO; continue; } } @@ -506,18 +507,19 @@ static inline void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) info->ProcessorLevel = value; valsize = sizeof(value); - if (!sysctlbyname("hw.floatingpoint", &value, &valsize, NULL, 0)) - info->ProcessorFeatureBits |= CPU_FEATURE_ARM_VFP_32; + if (!sysctlbyname("hw.floatingpoint", &value, &valsize, NULL, 0)) features |= CPU_FEATURE_ARM_VFP_32; #else FIXME("CPU Feature detection not implemented.\n"); #endif info->ProcessorArchitecture = PROCESSOR_ARCHITECTURE_ARM; + info->ProcessorFeatureBits = cpu_features.ProcessorFeatureBits = features; } #elif defined(__aarch64__) static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) { + ULONGLONG features = 0; #ifdef linux char line[512]; char *s, *value; @@ -548,8 +550,8 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) } if (!strcmp( line, "Features" )) { - if (strstr(value, "crc32")) info->ProcessorFeatureBits |= CPU_FEATURE_ARM_V8_CRC32; - if (strstr(value, "aes")) info->ProcessorFeatureBits |= CPU_FEATURE_ARM_V8_CRYPTO; + if (strstr(value, "crc32")) features |= CPU_FEATURE_ARM_V8_CRC32; + if (strstr(value, "aes")) features |= CPU_FEATURE_ARM_V8_CRYPTO; continue; } } @@ -560,6 +562,7 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) #endif info->ProcessorLevel = max(info->ProcessorLevel, 8); info->ProcessorArchitecture = PROCESSOR_ARCHITECTURE_ARM64; + info->ProcessorFeatureBits = cpu_features.ProcessorFeatureBits = features; } #endif /* End architecture specific feature detection for CPUs */

1 0

Alexandre Julliard : ntdll/tests: Mark some tests as todo for ARM64.
by Alexandre Julliard 15 Sep '23

15 Sep '23

Module: wine Branch: master Commit: e0f98c0ce96f5575d3e167de4e7647ba2529bc0d URL: https://gitlab.winehq.org/wine/wine/-/commit/e0f98c0ce96f5575d3e167de4e7647… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 15 16:31:26 2023 +0200 ntdll/tests: Mark some tests as todo for ARM64. --- dlls/ntdll/tests/wow64.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 07375f16082..99f6a6dec65 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -540,6 +540,7 @@ static void test_cross_process_notifications( HANDLE process, void *ptr ) FlushInstructionCache( process, addr, 0x1234 ); entry = pop_from_work_list( &list->work_list ); + todo_wine_if (current_machine == IMAGE_FILE_MACHINE_ARM64) entry = expect_cross_work_entry( list, entry, CrossProcessFlushCache, addr, 0x1234, 0xcccccccc, 0xcccccccc, 0xcccccccc, 0xcccccccc ); ok( !entry, "not at end of list\n" ); @@ -1084,6 +1085,7 @@ static void test_image_mappings(void) } else if (current_machine == IMAGE_FILE_MACHINE_ARM64) { + todo_wine ok( status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH, "NtMapViewOfSection returned %08lx\n", status ); NtUnmapViewOfSection( process, ptr ); }

1 0

Paul Gofman : d3dx9: Handle special adjacency index value in d3dx9_mesh_OptimizeInplace().
by Alexandre Julliard 15 Sep '23

15 Sep '23

Module: wine Branch: master Commit: 629c2f90d69a354aacc3a9c04fbde0321664d0b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/629c2f90d69a354aacc3a9c04fbde0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Sep 14 16:20:08 2023 -0600 d3dx9: Handle special adjacency index value in d3dx9_mesh_OptimizeInplace(). --- dlls/d3dx9_36/mesh.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index f033ac14cb7..47a0cadde67 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1624,6 +1624,13 @@ static HRESULT remap_faces_for_attrsort(struct d3dx9_mesh *This, const DWORD *in return D3D_OK; } +static DWORD adjacency_remap(DWORD *face_remap, DWORD index) +{ + if (index == 0xffffffff) + return index; + return face_remap[index]; +} + static HRESULT WINAPI d3dx9_mesh_OptimizeInplace(ID3DXMesh *iface, DWORD flags, const DWORD *adjacency_in, DWORD *adjacency_out, DWORD *face_remap_out, ID3DXBuffer **vertex_remap_out) { @@ -1778,9 +1785,10 @@ static HRESULT WINAPI d3dx9_mesh_OptimizeInplace(ID3DXMesh *iface, DWORD flags, for (i = 0; i < This->numfaces; i++) { DWORD old_pos = i * 3; DWORD new_pos = face_remap[i] * 3; - adjacency_out[new_pos++] = face_remap[adjacency_in[old_pos++]]; - adjacency_out[new_pos++] = face_remap[adjacency_in[old_pos++]]; - adjacency_out[new_pos++] = face_remap[adjacency_in[old_pos++]]; + + adjacency_out[new_pos++] = adjacency_remap(face_remap, adjacency_in[old_pos++]); + adjacency_out[new_pos++] = adjacency_remap(face_remap, adjacency_in[old_pos++]); + adjacency_out[new_pos] = adjacency_remap(face_remap, adjacency_in[old_pos]); } } else { memcpy(adjacency_out, adjacency_in, This->numfaces * 3 * sizeof(*adjacency_out));

1 0