wine-commits May 2024

wine-commits@winehq.org

1 participants
705 discussions

Jacek Caban : d3d9/tests: Use GNU assembly syntax on clang x86_64 MSVC target.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: d30bd3a1f0151d1f03036fe1f840ebf6f4cc7d95 URL: https://gitlab.winehq.org/wine/wine/-/commit/d30bd3a1f0151d1f03036fe1f840eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 13 12:15:10 2024 +0200 d3d9/tests: Use GNU assembly syntax on clang x86_64 MSVC target. Also fix unused dummy_object_vtbl variable warnings on targets skipping the test. --- dlls/d3d9/tests/device.c | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 9d92b248dd9..53dc9ee55ed 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -4906,28 +4906,34 @@ cleanup: } +static const GUID d3d9_private_data_test_guid = +{ + 0xfdb37466, + 0x428f, + 0x4edf, + {0xa3,0x7f,0x9b,0x1d,0xf4,0x88,0xc5,0xfc} +}; + +#if defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__) && (defined(__GNUC__) || defined(__clang__))) + static inline void set_fpu_cw(WORD cw) { -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) -#define D3D9_TEST_SET_FPU_CW 1 - __asm__ volatile ("fnclex"); - __asm__ volatile ("fldcw %0" : : "m" (cw)); -#elif defined(__i386__) && defined(_MSC_VER) -#define D3D9_TEST_SET_FPU_CW 1 +#if defined(_MSC_VER) && defined(__i386__) __asm fnclex; __asm fldcw cw; +#else + __asm__ volatile ("fnclex"); + __asm__ volatile ("fldcw %0" : : "m" (cw)); #endif } static inline WORD get_fpu_cw(void) { WORD cw = 0; -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) -#define D3D9_TEST_GET_FPU_CW 1 - __asm__ volatile ("fnstcw %0" : "=m" (cw)); -#elif defined(__i386__) && defined(_MSC_VER) -#define D3D9_TEST_GET_FPU_CW 1 +#if defined(_MSC_VER) && defined(__i386__) __asm fnstcw cw; +#else + __asm__ volatile ("fnstcw %0" : "=m" (cw)); #endif return cw; } @@ -4964,17 +4970,8 @@ static const IUnknownVtbl dummy_object_vtbl = dummy_object_Release, }; -static const GUID d3d9_private_data_test_guid = -{ - 0xfdb37466, - 0x428f, - 0x4edf, - {0xa3,0x7f,0x9b,0x1d,0xf4,0x88,0xc5,0xfc} -}; - static void test_fpu_setup(void) { -#if defined(D3D9_TEST_SET_FPU_CW) && defined(D3D9_TEST_GET_FPU_CW) static const BOOL is_64bit = sizeof(void *) > sizeof(int); IUnknown dummy_object = {&dummy_object_vtbl}; struct device_desc device_desc; @@ -5079,9 +5076,16 @@ static void test_fpu_setup(void) done: IDirect3D9_Release(d3d9); DestroyWindow(window); -#endif } +#else + +static void test_fpu_setup(void) +{ +} + +#endif + static void test_window_style(void) { RECT focus_rect, device_rect, fullscreen_rect, r, r2;

1 0

Elizabeth Figura : d3d9/tests: Remove leftover debugging code.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: 91d57e36565dcd4d91f67737b6fd7b49e53eb329 URL: https://gitlab.winehq.org/wine/wine/-/commit/91d57e36565dcd4d91f67737b6fd7b… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed May 15 12:14:48 2024 -0500 d3d9/tests: Remove leftover debugging code. --- dlls/d3d9/tests/visual.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 367c8a9a955..600a6296c70 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12428,9 +12428,6 @@ stop: release_surface_readback(&rb); - IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - Sleep(50); - winetest_pop_context(); } IDirect3DDevice9_SetVertexShader(device, NULL);

1 0

Elizabeth Figura : wined3d: Remove the no longer needed fragment_caps.proj_control flag.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: 1e2d2b29c75732b69df0c5da6ef8f13216fb0f07 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e2d2b29c75732b69df0c5da6ef8f1… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Mar 20 17:29:44 2024 -0500 wined3d: Remove the no longer needed fragment_caps.proj_control flag. --- dlls/wined3d/glsl_shader.c | 1 - dlls/wined3d/utils.c | 120 ++++++++++++----------------------------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 34 insertions(+), 88 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index bf6f49d3f62..24bbe1cc6a8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12132,7 +12132,6 @@ static void glsl_fragment_pipe_get_caps(const struct wined3d_adapter *adapter, s const struct wined3d_gl_info *gl_info = &wined3d_adapter_gl_const(adapter)->gl_info; memset(caps, 0, sizeof(*caps)); - caps->proj_control = true; caps->srgb_write = true; caps->color_key = true; caps->PrimitiveMiscCaps = WINED3DPMISCCAPS_TSSARGTEMP diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 642c5e64eee..91355438378 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5701,7 +5701,7 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w /* Setup this textures matrix according to the texture flags. */ static void compute_texture_matrix(const struct wined3d_matrix *matrix, uint32_t flags, BOOL calculated_coords, - BOOL transformed, enum wined3d_format_id format_id, BOOL ffp_proj_control, struct wined3d_matrix *out_matrix) + BOOL transformed, enum wined3d_format_id format_id, struct wined3d_matrix *out_matrix) { struct wined3d_matrix mat; @@ -5719,92 +5719,41 @@ static void compute_texture_matrix(const struct wined3d_matrix *matrix, uint32_t mat = *matrix; - if (flags & WINED3D_TTFF_PROJECTED) + /* Under Direct3D the R/Z coord can be used for translation, under + * OpenGL we use the Q coord instead. */ + if (!(flags & WINED3D_TTFF_PROJECTED) && !calculated_coords) { - if (!ffp_proj_control) + switch (format_id) { - switch (flags & ~WINED3D_TTFF_PROJECTED) - { - case WINED3D_TTFF_COUNT2: - mat._14 = mat._12; - mat._24 = mat._22; - mat._34 = mat._32; - mat._44 = mat._42; - mat._12 = mat._22 = mat._32 = mat._42 = 0.0f; - break; - case WINED3D_TTFF_COUNT3: - mat._14 = mat._13; - mat._24 = mat._23; - mat._34 = mat._33; - mat._44 = mat._43; - mat._13 = mat._23 = mat._33 = mat._43 = 0.0f; - break; - } - } - } - else - { - /* Under Direct3D the R/Z coord can be used for translation, under - * OpenGL we use the Q coord instead. */ - if (!calculated_coords) - { - switch (format_id) - { - /* Direct3D passes the default 1.0 in the 2nd coord, while GL - * passes it in the 4th. Swap 2nd and 4th coord. No need to - * store the value of mat._41 in mat._21 because the input - * value to the transformation will be 0, so the matrix value - * is irrelevant. */ - case WINED3DFMT_R32_FLOAT: - mat._41 = mat._21; - mat._42 = mat._22; - mat._43 = mat._23; - mat._44 = mat._24; - break; - /* See above, just 3rd and 4th coord. */ - case WINED3DFMT_R32G32_FLOAT: - mat._41 = mat._31; - mat._42 = mat._32; - mat._43 = mat._33; - mat._44 = mat._34; - break; - case WINED3DFMT_R32G32B32_FLOAT: /* Opengl defaults match dx defaults */ - case WINED3DFMT_R32G32B32A32_FLOAT: /* No defaults apply, all app defined */ + /* Direct3D passes the default 1.0 in the 2nd coord, while GL + * passes it in the 4th. Swap 2nd and 4th coord. No need to + * store the value of mat._41 in mat._21 because the input + * value to the transformation will be 0, so the matrix value + * is irrelevant. */ + case WINED3DFMT_R32_FLOAT: + mat._41 = mat._21; + mat._42 = mat._22; + mat._43 = mat._23; + mat._44 = mat._24; + break; + /* See above, just 3rd and 4th coord. */ + case WINED3DFMT_R32G32_FLOAT: + mat._41 = mat._31; + mat._42 = mat._32; + mat._43 = mat._33; + mat._44 = mat._34; + break; + case WINED3DFMT_R32G32B32_FLOAT: /* Opengl defaults match dx defaults */ + case WINED3DFMT_R32G32B32A32_FLOAT: /* No defaults apply, all app defined */ - /* This is to prevent swapping the matrix lines and put the default 4th coord = 1.0 - * into a bad place. The division elimination below will apply to make sure the - * 1.0 doesn't do anything bad. The caller will set this value if the stride is 0 - */ - case WINED3DFMT_UNKNOWN: /* No texture coords, 0/0/0/1 defaults are passed */ - break; - default: - FIXME("Unexpected fixed function texture coord input\n"); - } - } - if (!ffp_proj_control) - { - switch (flags & ~WINED3D_TTFF_PROJECTED) - { - /* case WINED3D_TTFF_COUNT1: Won't ever get here. */ - case WINED3D_TTFF_COUNT2: - mat._13 = mat._23 = mat._33 = mat._43 = 0.0f; - /* OpenGL divides the first 3 vertex coordinates by the 4th by - * default, which is essentially the same as D3DTTFF_PROJECTED. - * Make sure that the 4th coordinate evaluates to 1.0 to - * eliminate that. - * - * If the fixed function pipeline is used, the 4th value - * remains unused, so there is no danger in doing this. With - * vertex shaders we have a problem. Should an application hit - * that problem, the code here would have to check for pixel - * shaders, and the shader has to undo the default GL divide. - * - * A more serious problem occurs if the application passes 4 - * coordinates in, and the 4th is != 1.0 (OpenGL default). - * This would have to be fixed with immediate mode draws. */ - default: - mat._14 = mat._24 = mat._34 = 0.0f; mat._44 = 1.0f; - } + /* This is to prevent swapping the matrix lines and put the default 4th coord = 1.0 + * into a bad place. The division elimination below will apply to make sure the + * 1.0 doesn't do anything bad. The caller will set this value if the stride is 0 + */ + case WINED3DFMT_UNKNOWN: /* No texture coords, 0/0/0/1 defaults are passed */ + break; + default: + FIXME("Unexpected fixed function texture coord input\n"); } } @@ -5824,8 +5773,7 @@ void get_texture_matrix(const struct wined3d_context *context, const struct wine generated, context->stream_info.position_transformed, context->stream_info.use_map & (1u << (WINED3D_FFP_TEXCOORD0 + coord_idx)) ? context->stream_info.elements[WINED3D_FFP_TEXCOORD0 + coord_idx].format->id - : WINED3DFMT_UNKNOWN, - context->d3d_info->ffp_fragment_caps.proj_control, mat); + : WINED3DFMT_UNKNOWN, mat); } void get_pointsize_minmax(const struct wined3d_context *context, const struct wined3d_state *state, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 96762351f21..1c70b65dd8c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -197,7 +197,6 @@ struct fragment_caps unsigned int TextureOpCaps; unsigned int max_blend_stages; unsigned int max_textures; - bool proj_control; bool srgb_write; bool color_key; };

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

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

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

Victor Chiletto : vkd3d-shader/preproc: Treat CR as whitespace.
by Alexandre Julliard 23 May '24

23 May '24

Module: vkd3d Branch: master Commit: 105ef282736090c034599ecbe5abca56ea6d05a1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/105ef282736090c034599ecbe5abc… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Wed May 22 14:07:00 2024 -0300 vkd3d-shader/preproc: Treat CR as whitespace. --- libs/vkd3d-shader/preproc.l | 2 +- tests/hlsl_d3d12.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index d360f6ca..be50d3b9 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -65,7 +65,7 @@ static void update_location(struct preproc_ctx *ctx); %s LINE NEWLINE \r?\n -WS [ \t] +WS [ \t\r] IDENTIFIER [A-Za-z_][A-Za-z0-9_]* INT_SUFFIX [uUlL]{0,2} diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 8d5d8d90..215d624a 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -379,6 +379,18 @@ static void test_preprocess(void) "pass", "fail", }, + + /* CRs are treated as whitespace. */ + { + "#define\rKEY(a,\rb)\ra##b\r\n" + "KEY(pa,\rss)\r\n" + "#ifndef\rKEY\r\n" + "fail\r\n" + "#endif\r\n", + + "pass", + "fail", + } }; for (i = 0; i < ARRAY_SIZE(tests); ++i)

1 0

Alexandre Julliard : ntdll: Make __wine_unix_call() an inline function.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: 127650c293b5716c6a1f2028185c3f3fe8c6598c URL: https://gitlab.winehq.org/wine/wine/-/commit/127650c293b5716c6a1f2028185c3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 23 11:54:55 2024 +0200 ntdll: Make __wine_unix_call() an inline function. --- dlls/ntdll/loader.c | 11 +---------- dlls/ntdll/ntdll.spec | 1 - dlls/win32u/main.c | 8 +++----- include/wine/unixlib.h | 8 ++++++-- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 6e3f67ef593..31bfe60d121 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -70,7 +70,7 @@ typedef DWORD (CALLBACK *DLLENTRYPROC)(HMODULE,DWORD,LPVOID); typedef void (CALLBACK *LDRENUMPROC)(LDR_DATA_TABLE_ENTRY *, void *, BOOLEAN *); void (FASTCALL *pBaseThreadInitThunk)(DWORD,LPTHREAD_START_ROUTINE,void *) = NULL; -NTSTATUS (WINAPI *__wine_unix_call_dispatcher)( unixlib_handle_t, unsigned int, void * ) = __wine_unix_call; +NTSTATUS (WINAPI *__wine_unix_call_dispatcher)( unixlib_handle_t, unsigned int, void * ) = NULL; static DWORD (WINAPI *pCtrlRoutine)(void *); @@ -3314,15 +3314,6 @@ NTSTATUS WINAPI __wine_ctrl_routine( void *arg ) } -/*********************************************************************** - * __wine_unix_call - */ -NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ) -{ - return __wine_unix_call_dispatcher( handle, code, args ); -} - - /*********************************************************************** * __wine_unix_spawnvp */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 13043130cf6..d32c95c49ad 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1719,7 +1719,6 @@ @ cdecl wine_server_handle_to_fd(long long ptr ptr) # Unix interface -@ stdcall __wine_unix_call(int64 long ptr) @ stdcall __wine_unix_spawnvp(long ptr) @ stdcall __wine_ctrl_routine(ptr) @ extern -private __wine_syscall_dispatcher diff --git a/dlls/win32u/main.c b/dlls/win32u/main.c index 28383161b6f..8e32fc63556 100644 --- a/dlls/win32u/main.c +++ b/dlls/win32u/main.c @@ -33,8 +33,6 @@ void *__wine_syscall_dispatcher = NULL; -static unixlib_handle_t win32u_handle; - /******************************************************************* * syscalls */ @@ -2192,6 +2190,8 @@ void __cdecl __wine_spec_unimplemented_stub( const char *module, const char *fun for (;;) RtlRaiseException( &record ); } +void *dummy = NtQueryVirtualMemory; /* forced import to avoid link error with winecrt0 */ + BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) { HMODULE ntdll; @@ -2206,9 +2206,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) LdrGetDllHandle( NULL, 0, &ntdll_name, &ntdll ); dispatcher_ptr = RtlFindExportedRoutineByName( ntdll, "__wine_syscall_dispatcher" ); __wine_syscall_dispatcher = *dispatcher_ptr; - if (!NtQueryVirtualMemory( GetCurrentProcess(), inst, MemoryWineUnixFuncs, - &win32u_handle, sizeof(win32u_handle), NULL )) - __wine_unix_call( win32u_handle, 0, NULL ); + if (!__wine_init_unix_call()) WINE_UNIX_CALL( 0, NULL ); break; } return TRUE; diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 95ff406d968..17ec93110f2 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -258,12 +258,16 @@ static inline ULONG ntdll_wcstoul( const WCHAR *s, WCHAR **end, int base ) #else /* WINE_UNIX_LIB */ -NTSYSAPI NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); 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); -#define WINE_UNIX_CALL(code,args) __wine_unix_call_dispatcher( __wine_unixlib_handle, (code), (args) ) +static inline NTSTATUS __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ) +{ + return __wine_unix_call_dispatcher( handle, code, args ); +} + +#define WINE_UNIX_CALL(code,args) __wine_unix_call( __wine_unixlib_handle, (code), (args) ) #endif /* WINE_UNIX_LIB */

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2024