December 2023 - Wine-commits

Zebediah Figura : wined3d: Remove an outdated comment.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 5d5adce343d2356a90a62692f4350d34d3ad3391 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d5adce343d2356a90a62692f4350d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Nov 12 14:25:04 2023 -0600 wined3d: Remove an outdated comment. The comment was originally added in 4b831a5d3e15af9dccf7114bb4440133cb8fe721. At that point, it referred only to non-FFP shader constants. Subsequently 38934fe70d7ffd2353351a7986346f4a205adc1f moved bumpenv constant loading to the misc pipeline, apparently out of concerns that bumpenv constants might interact badly with shader constants. It's not clear whether those concerns were ever justified, and normal shader constants are now sufficiently untangled from each other anyway. However, bumpenv constants, like e.g. color keys, affect both FFP and non-FFP pipelines, so it makes the most sense for them to remain in the misc state table anyway. --- dlls/wined3d/state.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5333382ab81..1dcef265b95 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4379,10 +4379,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { 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 }, - - /* TODO: Move shader constant loading to vertex and fragment pipeline respectively, as soon as the pshader and - * vshader loadings are untied from each other - */ { 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 },

1 0

Zebediah Figura : wined3d: Use context->stream_info.position_transformed instead of context->last_was_rhw in state handlers.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 936b950112e0ca06ffc4600efcfa86e8526939ad URL: https://gitlab.winehq.org/wine/wine/-/commit/936b950112e0ca06ffc4600efcfa86… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 15 15:02:01 2023 -0600 wined3d: Use context->stream_info.position_transformed instead of context->last_was_rhw in state handlers. Use of last_was_rhw in these state handlers is, firstly, confusing to read. The variable is actually supposed to be set for *this* draw, not the last one, and state handlers indeed expect that, but that fact isn't obvious. Reading from context->stream_info instead is clearer. Secondly, since last_was_rhw is set by the STATE_VDECL handler, any other state depending on it (including some, though not all, of the sites changed here) thus has an implicit state handler ordering assumption. This is, needless to say, fragile. context->stream_info is computed before state handlers, so that dependency is a bit less fragile. --- dlls/wined3d/arb_program_shader.c | 3 ++- dlls/wined3d/state.c | 12 ++++++------ dlls/wined3d/utils.c | 6 +++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3ae82383146..153786c25e7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6715,7 +6715,8 @@ static void state_arbfp_fog(struct wined3d_context *context, const struct wined3 } else { - if (state->render_states[WINED3D_RS_FOGVERTEXMODE] == WINED3D_FOG_NONE || context->last_was_rhw) + if (state->render_states[WINED3D_RS_FOGVERTEXMODE] == WINED3D_FOG_NONE + || context->stream_info.position_transformed) new_source = FOGSOURCE_COORD; else new_source = FOGSOURCE_FFP; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1dcef265b95..2fb75785daf 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1230,7 +1230,7 @@ static void depth(struct wined3d_context *context, const struct wined3d_state *s } } - if (context->last_was_rhw && !isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION))) + if (context->stream_info.position_transformed && !isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION))) context_apply_state(context, state, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); } @@ -1303,7 +1303,7 @@ static void state_fog_vertexpart(struct wined3d_context *context, const struct w /* Otherwise use per-vertex fog in any case */ gl_info->gl_ops.gl.p_glHint(GL_FOG_HINT, GL_FASTEST); - if (state->render_states[WINED3D_RS_FOGVERTEXMODE] == WINED3D_FOG_NONE || context->last_was_rhw) + if (state->render_states[WINED3D_RS_FOGVERTEXMODE] == WINED3D_FOG_NONE || context->stream_info.position_transformed) { /* No fog at all, or transformed vertices: Use fog coord */ if (!context->fog_coord) @@ -1436,7 +1436,7 @@ void state_fog_fragpart(struct wined3d_context *context, const struct wined3d_st { /* If processed vertices are used, fall through to the NONE case */ case WINED3D_FOG_EXP: - if (!context->last_was_rhw) + if (!context->stream_info.position_transformed) { gl_info->gl_ops.gl.p_glFogi(GL_FOG_MODE, GL_EXP); checkGLcall("glFogi(GL_FOG_MODE, GL_EXP)"); @@ -1446,7 +1446,7 @@ void state_fog_fragpart(struct wined3d_context *context, const struct wined3d_st /* drop through */ case WINED3D_FOG_EXP2: - if (!context->last_was_rhw) + if (!context->stream_info.position_transformed) { gl_info->gl_ops.gl.p_glFogi(GL_FOG_MODE, GL_EXP2); checkGLcall("glFogi(GL_FOG_MODE, GL_EXP2)"); @@ -1456,7 +1456,7 @@ void state_fog_fragpart(struct wined3d_context *context, const struct wined3d_st /* drop through */ case WINED3D_FOG_LINEAR: - if (!context->last_was_rhw) + if (!context->stream_info.position_transformed) { gl_info->gl_ops.gl.p_glFogi(GL_FOG_MODE, GL_LINEAR); checkGLcall("glFogi(GL_FOG_MODE, GL_LINEAR)"); @@ -3620,7 +3620,7 @@ static void transform_view(struct wined3d_context *context, const struct wined3d clipplane(context, state, STATE_CLIPPLANE(k)); } - if (context->last_was_rhw) + if (context->stream_info.position_transformed) { gl_info->gl_ops.gl.p_glLoadIdentity(); checkGLcall("glLoadIdentity()"); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e833bdc8d90..dd83b2fcef7 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5644,7 +5644,7 @@ void get_identity_matrix(struct wined3d_matrix *mat) void get_modelview_matrix(const struct wined3d_context *context, const struct wined3d_state *state, unsigned int index, struct wined3d_matrix *mat) { - if (context->last_was_rhw) + if (context->stream_info.position_transformed) get_identity_matrix(mat); else multiply_matrix(mat, &state->transforms[WINED3D_TS_VIEW], &state->transforms[WINED3D_TS_WORLD_MATRIX(index)]); @@ -5687,7 +5687,7 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w else center_offset = 0.0f; - if (context->last_was_rhw) + if (context->stream_info.position_transformed) { /* Transform D3D RHW coordinates to OpenGL clip coordinates. */ float x = state->viewports[0].x; @@ -5859,7 +5859,7 @@ void get_texture_matrix(const struct wined3d_context *context, const struct wine compute_texture_matrix(&state->transforms[WINED3D_TS_TEXTURE0 + tex], state->texture_states[tex][WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS], - generated, context->last_was_rhw, + 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,

1 0

Zebediah Figura : wined3d: Check WINED3D_TEXTURE_POW2_MAT_IDENT instead of context->lastWasPow2Texture.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 9a45a637d54e78dd1d60019f0f6296182091d521 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a45a637d54e78dd1d60019f0f6296… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 16 11:52:02 2023 -0600 wined3d: Check WINED3D_TEXTURE_POW2_MAT_IDENT instead of context->lastWasPow2Texture. As with the previous commit, this is clearer and avoids a state ordering assumption. --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index dd83b2fcef7..ac53f477edd 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5865,7 +5865,7 @@ void get_texture_matrix(const struct wined3d_context *context, const struct wine : WINED3DFMT_UNKNOWN, device->shader_backend->shader_has_ffp_proj_control(device->shader_priv), mat); - if ((context->lastWasPow2Texture & (1u << tex)) && texture) + if (texture && !(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) { if (generated) FIXME("Non-power-of-two texture being used with generated texture coords.\n");

1 0

Zebediah Figura : wined3d: Retrieve the FFP projection control flag from the d3d info in get_texture_matrix().
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 084e6e21da62d38073618b0207d24cb67520181a URL: https://gitlab.winehq.org/wine/wine/-/commit/084e6e21da62d38073618b0207d24c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Mar 22 16:10:15 2023 -0500 wined3d: Retrieve the FFP projection control flag from the d3d info in get_texture_matrix(). --- dlls/wined3d/arb_program_shader.c | 12 ------------ dlls/wined3d/glsl_shader.c | 12 ------------ dlls/wined3d/shader.c | 12 ------------ dlls/wined3d/shader_spirv.c | 12 ------------ dlls/wined3d/utils.c | 3 +-- dlls/wined3d/wined3d_private.h | 1 - 6 files changed, 1 insertion(+), 51 deletions(-)

1 0

Zebediah Figura : wined3d: Fix masking out the texcoord index in get_texture_matrix().
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: e2c373d7f3faa3310b96918f7e468199ad521de6 URL: https://gitlab.winehq.org/wine/wine/-/commit/e2c373d7f3faa3310b96918f7e4681… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 16 12:00:01 2023 -0600 wined3d: Fix masking out the texcoord index in get_texture_matrix(). Fixes: 370b8299ab8d33664ffbb8bdbaafd04c8f566c23 --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b2b234c8e29..a46a4c7257d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5852,7 +5852,7 @@ void get_texture_matrix(const struct wined3d_context *context, const struct wine { BOOL generated = (state->texture_states[tex][WINED3D_TSS_TEXCOORD_INDEX] & 0xffff0000) != WINED3DTSS_TCI_PASSTHRU; - unsigned int coord_idx = min(state->texture_states[tex][WINED3D_TSS_TEXCOORD_INDEX & 0x0000ffff], + unsigned int coord_idx = min(state->texture_states[tex][WINED3D_TSS_TEXCOORD_INDEX] & 0x0000ffff, WINED3D_MAX_FFP_TEXTURES - 1); struct wined3d_texture *texture = wined3d_state_get_ffp_texture(state, tex);

1 0

Zebediah Figura : d3d9/tests: Add another test for drawing from a mapped buffer.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 346f783ccccaa5bc128a316a134e8f34315937d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/346f783ccccaa5bc128a316a134e8f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 1 15:13:50 2023 -0600 d3d9/tests: Add another test for drawing from a mapped buffer. --- dlls/d3d9/tests/visual.c | 59 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index bb8381cde3d..1b990301cac 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -27360,14 +27360,9 @@ static void test_dynamic_map_synchronization(void) } hr = IDirect3DDevice9_CreateVertexBuffer(device, 200 * 4 * sizeof(struct dynamic_vb_vertex), - D3DUSAGE_DYNAMIC, D3DFVF_XYZ, D3DPOOL_DEFAULT, &buffer, NULL); + D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, D3DFVF_XYZ, D3DPOOL_DEFAULT, &buffer, NULL); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); - ok(hr == D3D_OK, "Failed to clear, hr %#lx.\n", hr); - - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9_SetStreamSource(device, 0, buffer, 0, sizeof(struct dynamic_vb_vertex)); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); @@ -27377,6 +27372,12 @@ static void test_dynamic_map_synchronization(void) hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#lx.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + for (y = 0; y < 200; ++y) { hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, &data, D3DLOCK_DISCARD); @@ -27414,6 +27415,52 @@ static void test_dynamic_map_synchronization(void) hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + IDirect3DVertexBuffer9_Release(buffer); + + /* Castlevania: Lords of Shadow 2 locks a vertex and index buffer and keeps + * both mapped for all of the draws in a frame. Test this by doing the same + * draws, but with the buffer mapped the whole time. */ + + hr = IDirect3DDevice9_CreateVertexBuffer(device, 200 * 4 * sizeof(struct dynamic_vb_vertex), + D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, D3DFVF_XYZ, D3DPOOL_DEFAULT, &buffer, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, buffer, 0, sizeof(struct dynamic_vb_vertex)); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#lx.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + + for (y = 0; y < 200; ++y) + { + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, &data, D3DLOCK_DISCARD); + ok(hr == D3D_OK, "Failed to map buffer, hr %#lx.\n", hr); + + fill_dynamic_vb_quad(data, 0, y); + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 2); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + + for (x = 1; x < 200; ++x) + { + fill_dynamic_vb_quad((struct dynamic_vb_vertex *)data + 4 * x, x, y); + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 4 * x, 2); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + } + + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(hr == D3D_OK, "Failed to map buffer, hr %#lx.\n", hr); + } + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &rt); + ok(hr == S_OK, "Failed to get render target, hr %#lx.\n", hr); + check_rt_color_todo(rt, 0x0000ff00); + IDirect3DSurface9_Release(rt); + IDirect3DVertexBuffer9_Release(buffer); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %lu references left.\n", refcount);

1 0

Zebediah Figura : d3d9: Upload mapped dynamic vertex and index buffers before every draw.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: c93440b700efa23069177db00909f12e95f90ecd URL: https://gitlab.winehq.org/wine/wine/-/commit/c93440b700efa23069177db00909f1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 1 18:36:38 2023 -0600 d3d9: Upload mapped dynamic vertex and index buffers before every draw. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55591 --- dlls/d3d9/device.c | 14 ++++++++++++++ dlls/d3d9/tests/visual.c | 12 +++--------- dlls/wined3d/cs.c | 28 ++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 5 files changed, 48 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1eeefac6cc0..1267dc8fca1 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3120,6 +3120,17 @@ static HRESULT d3d9_device_upload_sysmem_index_buffer(struct d3d9_device *device return S_OK; } +static void d3d9_device_flush_mapped_vertex_buffers(struct d3d9_device *device) +{ + for (unsigned int i = 0; i < WINED3D_MAX_STREAMS; ++i) + { + struct wined3d_buffer *buffer = device->stateblock_state->streams[i].buffer; + + if (buffer) + wined3d_device_context_flush_mapped_buffer(device->immediate_context, buffer); + } +} + static void d3d9_device_upload_managed_textures(struct d3d9_device *device) { const struct wined3d_stateblock_state *state = device->stateblock_state; @@ -3159,6 +3170,7 @@ static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface, vertex_count = vertex_count_from_primitive_count(primitive_type, primitive_count); d3d9_device_upload_managed_textures(device); d3d9_device_upload_sysmem_vertex_buffers(device, 0, start_vertex, vertex_count); + d3d9_device_flush_mapped_vertex_buffers(device); d3d9_generate_auto_mipmaps(device); wined3d_device_context_set_primitive_type(device->immediate_context, wined3d_primitive_type_from_d3d(primitive_type), 0); @@ -3200,11 +3212,13 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface index_count = vertex_count_from_primitive_count(primitive_type, primitive_count); d3d9_device_upload_managed_textures(device); d3d9_device_upload_sysmem_vertex_buffers(device, base_vertex_idx, min_vertex_idx, vertex_count); + d3d9_device_flush_mapped_vertex_buffers(device); d3d9_generate_auto_mipmaps(device); wined3d_device_context_set_primitive_type(device->immediate_context, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); d3d9_device_upload_sysmem_index_buffer(device, &start_idx, index_count); + wined3d_device_context_flush_mapped_buffer(device->immediate_context, device->stateblock_state->index_buffer); wined3d_device_context_draw_indexed(device->immediate_context, base_vertex_idx, start_idx, index_count, 0, device->stateblock_state->streams[0].frequency); d3d9_rts_flag_auto_gen_mipmap(device); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1b990301cac..2d54920ddba 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26720,7 +26720,6 @@ static void test_draw_mapped_buffer(void) unsigned int color, i; IDirect3D9 *d3d; ULONG refcount; - BOOL test_pass; HWND window; HRESULT hr; void *data; @@ -26741,11 +26740,10 @@ static void test_draw_mapped_buffer(void) { D3DPOOL pool; DWORD usage; - BOOL ignore_wine_result; } tests[] = { - {D3DPOOL_DEFAULT, D3DUSAGE_DYNAMIC, TRUE}, + {D3DPOOL_DEFAULT, D3DUSAGE_DYNAMIC}, {D3DPOOL_MANAGED, 0}, {D3DPOOL_SYSTEMMEM, 0}, }; @@ -26825,11 +26823,7 @@ static void test_draw_mapped_buffer(void) ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); color = getPixelColor(device, 160, 120); - - test_pass = color_match(color, 0x00ff0000, 1); - todo_wine_if(tests[i].ignore_wine_result && !test_pass) - ok(test_pass, "Got unexpected color 0x%08x, test %u.\n", color, i); - + ok(color_match(color, 0x00ff0000, 1), "Got unexpected color 0x%08x, test %u.\n", color, i); color = getPixelColor(device, 480, 360); ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x, test %u.\n", color, i); @@ -27458,7 +27452,7 @@ static void test_dynamic_map_synchronization(void) hr = IDirect3DDevice9_GetRenderTarget(device, 0, &rt); ok(hr == S_OK, "Failed to get render target, hr %#lx.\n", hr); - check_rt_color_todo(rt, 0x0000ff00); + check_rt_color(rt, 0x0000ff00); IDirect3DSurface9_Release(rt); IDirect3DVertexBuffer9_Release(buffer); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 7c6e465844c..bf171326926 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3459,6 +3459,34 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) FreeLibraryAndExitThread(wined3d_module, 0); } +void CDECL wined3d_device_context_flush_mapped_buffer(struct wined3d_device_context *context, + struct wined3d_buffer *buffer) +{ + struct wined3d_client_resource *client = &buffer->resource.client; + + /* d3d9 applications can draw from a mapped dynamic buffer. + * Castlevania 2 depends on this behaviour. + * This means that we need to upload a pending discard bo, without actually + * unmapping it. */ + + assert(context == &context->device->cs->c); + + if (wined3d_bo_address_is_null(&client->mapped_upload.addr)) + return; + + if (client->mapped_upload.flags & UPLOAD_BO_UPLOAD_ON_UNMAP) + wined3d_device_context_upload_bo(context, &buffer->resource, 0, + &client->mapped_box, &client->mapped_upload, buffer->resource.size, buffer->resource.size); + + if (client->mapped_upload.flags & UPLOAD_BO_RENAME_ON_UNMAP) + { + client->mapped_upload.flags &= ~UPLOAD_BO_RENAME_ON_UNMAP; + /* This logic matches wined3d_cs_map_upload_bo(). */ + if (client->mapped_upload.addr.buffer_object->coherent && wined3d_map_persistent()) + client->mapped_upload.flags &= ~UPLOAD_BO_UPLOAD_ON_UNMAP; + } +} + struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device, const enum wined3d_feature_level *levels, unsigned int level_count) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 72e0e3fd8fa..accb6f65658 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -103,6 +103,7 @@ @ cdecl wined3d_device_context_draw_indirect(ptr ptr long long) @ cdecl wined3d_device_context_execute_command_list(ptr ptr long) @ cdecl wined3d_device_context_flush(ptr) +@ cdecl wined3d_device_context_flush_mapped_buffer(ptr ptr) @ cdecl wined3d_device_context_generate_mipmaps(ptr ptr) @ cdecl wined3d_device_context_get_blend_state(ptr ptr ptr) @ cdecl wined3d_device_context_get_constant_buffer(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d7a3dd1e0fe..fcbe094e30b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2458,6 +2458,8 @@ void __cdecl wined3d_device_context_draw_indirect(struct wined3d_device_context void __cdecl wined3d_device_context_execute_command_list(struct wined3d_device_context *context, struct wined3d_command_list *list, bool restore_state); void __cdecl wined3d_device_context_flush(struct wined3d_device_context *context); +void __cdecl wined3d_device_context_flush_mapped_buffer(struct wined3d_device_context *context, + struct wined3d_buffer *buffer); void __cdecl wined3d_device_context_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view); struct wined3d_blend_state * __cdecl wined3d_device_context_get_blend_state(

1 0

Zhiyi Zhang : win32u: Find the correct DIB driver in windrv_CreateDC().
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 36366f129b1e456f4530ae98015646af499e280a URL: https://gitlab.winehq.org/wine/wine/-/commit/36366f129b1e456f4530ae98015646… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Nov 6 16:13:22 2023 +0800 win32u: Find the correct DIB driver in windrv_CreateDC(). push_dc_driver() places drivers based on their priorities, so the newly created driver is not necessarily on top. Thus in windrv_CreateDC(), find_dc_driver() should be used to find the DIB driver instead of assuming the DIB driver is the top driver, which could be the path driver because it has a higher priority. The exact wrong code path was: 1. A path driver with priority 400 is created for a DC. 2. windrv_CreateDC() is called to create a window driver for the DC. 3. Then in dibdrv_CreateDC(), push_dc_driver() is called with 'dev' pointing to the top driver, which is the path driver. 4. push_dc_driver() updates 'dev' to point to the address of the next driver because DIB driver has a lower 300 priority. 5. The DIB driver is assigned to 'dev', which is not the original parameter passed into push_dc_driver(). 6. In windrv_CreateDC(), get_dibdrv_pdev(*dev) is called, assuming the top driver is the DIB driver. But actually the top driver that '*dev' points to is still the path driver. The added tests can demonstrate the memory corruption before this fix is applied. --- dlls/gdi32/tests/path.c | 18 ++++++++++++++++-- dlls/win32u/dibdrv/dc.c | 6 +++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index c653c22edeb..c34cb034d88 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -607,6 +607,7 @@ static void test_polydraw(void) BOOL retb; POINT pos; HDC hdc = GetDC(0); + HWND hwnd; MoveToEx( hdc, -20, -20, NULL ); @@ -620,7 +621,8 @@ static void test_polydraw(void) { /* PolyDraw is only available on Win2k and later */ win_skip("PolyDraw is not available\n"); - goto done; + ReleaseDC(0, hdc); + return; } expect(TRUE, retb); GetCurrentPositionEx( hdc, &pos ); @@ -684,8 +686,20 @@ static void test_polydraw(void) ok_path(hdc, "polydraw_path", polydraw_path, ARRAY_SIZE(polydraw_path)); GetCurrentPositionEx( hdc, &pos ); ok( pos.x == 80 && pos.y == 80, "wrong pos %ld,%ld\n", pos.x, pos.y ); -done: ReleaseDC(0, hdc); + + /* Test a special case that GDI path driver is created before window driver */ + hwnd = CreateWindowA("static", NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL); + hdc = GetDC(hwnd); + + BeginPath(hdc); + SetWindowPos(hwnd, 0, 0, 0, 100, 100, SWP_NOZORDER | SWP_NOMOVE | SWP_SHOWWINDOW); + retb = PolyDraw(hdc, polydraw_pts, polydraw_tps, 2); + ok(retb, "PolyDraw failed, error %#lx\n", GetLastError()); + EndPath(hdc); + + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); } static void test_closefigure(void) { diff --git a/dlls/win32u/dibdrv/dc.c b/dlls/win32u/dibdrv/dc.c index 87e637553da..7fe4b765a78 100644 --- a/dlls/win32u/dibdrv/dc.c +++ b/dlls/win32u/dibdrv/dc.c @@ -871,6 +871,8 @@ static BOOL windrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, static BOOL windrv_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output, const DEVMODEW *devmode ) { struct windrv_physdev *physdev = calloc( 1, sizeof(*physdev) ); + PHYSDEV dibdrv; + DC *dc; if (!physdev) return FALSE; @@ -879,7 +881,9 @@ static BOOL windrv_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output, const free( physdev ); return FALSE; } - physdev->dibdrv = get_dibdrv_pdev( *dev ); + dc = get_physdev_dc( *dev ); + dibdrv = find_dc_driver( dc, &dib_driver ); + physdev->dibdrv = get_dibdrv_pdev( dibdrv ); push_dc_driver( dev, &physdev->dev, &window_driver ); return TRUE; }

1 0

Piotr Caban : wineps.drv: Fix printing images from iexplore.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: a294a6cbbfa02ce4f561224db7ccbf55e1a21938 URL: https://gitlab.winehq.org/wine/wine/-/commit/a294a6cbbfa02ce4f561224db7ccbf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 30 16:54:08 2023 +0100 wineps.drv: Fix printing images from iexplore. --- dlls/wineps.drv/printproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 98de5badda7..db2979f0fbe 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -390,7 +390,7 @@ static int stretch_blt(print_ctx *ctx, const EMRSTRETCHBLT *blt, bits.is_copy = TRUE; bitmap = CreateDIBSection(hdc, dst_info, DIB_RGB_COLORS, &bits.ptr, NULL, 0); - SetDIBits(hdc, bitmap, 0, bi->bmiHeader.biHeight, src_bits, bi, blt->iUsageSrc); + SetDIBits(hdc, bitmap, 0, abs(bi->bmiHeader.biHeight), src_bits, bi, blt->iUsageSrc); err = PSDRV_PutImage(ctx, 0, dst_info, &bits, &src, &dst, blt->dwRop); DeleteObject(bitmap);

1 0

Alexandre Julliard : ntdll/tests: Fix some compiler warnings on ARM.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: de3fd9e2654a7b7b21830e361e4377e77aa18bcd URL: https://gitlab.winehq.org/wine/wine/-/commit/de3fd9e2654a7b7b21830e361e4377… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 3 13:29:28 2023 +0100 ntdll/tests: Fix some compiler warnings on ARM. --- dlls/ntdll/tests/exception.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index f195fc6e5e5..7e4eec4a2ba 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -5600,9 +5600,9 @@ static void test_raiseexception_regs(void) #define UWOP_SAVE_D0_RANGE(first,last) UWOP_TWOBYTES((0xF5 << 8) | (first << 4) | (last)) #define UWOP_SAVE_D16_RANGE(first,last)UWOP_TWOBYTES((0xF6 << 8) | ((first - 16) << 4) | (last - 16)) #define UWOP_ALLOC_LARGE(size) UWOP_THREEBYTES((0xF7 << 16) | (size/4)) -#define UWOP_ALLOC_HUGE(size) UWOP_FOURBYTES((0xF8 << 24) | (size/4)) +#define UWOP_ALLOC_HUGE(size) UWOP_FOURBYTES((0xF8u << 24) | (size/4)) #define UWOP_ALLOC_LARGEW(size) UWOP_THREEBYTES((0xF9 << 16) | (size/4)) -#define UWOP_ALLOC_HUGEW(size) UWOP_FOURBYTES((0xFA << 24) | (size/4)) +#define UWOP_ALLOC_HUGEW(size) UWOP_FOURBYTES((0xFAu << 24) | (size/4)) #define UWOP_NOP16 0xFB #define UWOP_NOP32 0xFC #define UWOP_END_NOP16 0xFD @@ -5690,7 +5690,7 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) context.Lr = (ULONG_PTR)ORIG_LR; context.R11 = (ULONG_PTR)fake_stack + test->results[i].fp_offset; orig_fp = context.R11; - orig_pc = (ULONG64)code_mem + code_offset + test->results[i].pc_offset; + orig_pc = (ULONG_PTR)code_mem + code_offset + test->results[i].pc_offset; trace( "%u/%u: pc=%p (%02x) fp=%p sp=%p\n", testnum, i, (void *)orig_pc, *(UINT *)orig_pc, (void *)orig_fp, (void *)context.Sp ); @@ -6544,7 +6544,7 @@ static void test_virtual_unwind(void) (1 << 19) | /* R (0 integer registers, 1 float registers, R=1, Reg=7 no registers */ (1 << 20) | /* L, push LR */ (0 << 21) | /* C - hook up r11 */ - (0x3fc << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ + (0x3fcu << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ static const BYTE unwind_info_18[] = { DW(unwind_info_18_packed) }; @@ -6575,7 +6575,7 @@ static void test_virtual_unwind(void) (0 << 19) | /* R (0 integer registers, 1 float registers, R=1, Reg=7 no registers */ (0 << 20) | /* L, push LR */ (0 << 21) | /* C - hook up r11 */ - (0x3ff << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ + (0x3ffu << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ static const BYTE unwind_info_19[] = { DW(unwind_info_19_packed) }; @@ -6610,7 +6610,7 @@ static void test_virtual_unwind(void) (0 << 19) | /* R (0 integer registers, 1 float registers, R=1, Reg=7 no registers */ (0 << 20) | /* L, push LR */ (0 << 21) | /* C - hook up r11 */ - (0x3f7 << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ + (0x3f7u << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ static const BYTE unwind_info_20[] = { DW(unwind_info_20_packed) }; @@ -6646,7 +6646,7 @@ static void test_virtual_unwind(void) (0 << 19) | /* R (0 integer registers, 1 float registers, R=1, Reg=7 no registers */ (0 << 20) | /* L, push LR */ (0 << 21) | /* C - hook up r11 */ - (0x3fb << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ + (0x3fbu << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ static const BYTE unwind_info_21[] = { DW(unwind_info_21_packed) }; @@ -6744,7 +6744,7 @@ static void test_virtual_unwind(void) (0 << 19) | /* R (0 integer registers, 1 float registers, R=1, Reg=7 no registers */ (1 << 20) | /* L, push LR */ (1 << 21) | /* C - hook up r11 */ - (0x3f5 << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ + (0x3f5u << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ static const BYTE unwind_info_24[] = { DW(unwind_info_24_packed) }; @@ -6776,7 +6776,7 @@ static void test_virtual_unwind(void) (0 << 19) | /* R (0 integer registers, 1 float registers, R=1, Reg=7 no registers */ (1 << 20) | /* L, push LR */ (1 << 21) | /* C - hook up r11 */ - (0x3f9 << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ + (0x3f9u << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ static const BYTE unwind_info_25[] = { DW(unwind_info_25_packed) }; @@ -6844,7 +6844,7 @@ static void test_virtual_unwind(void) (1 << 19) | /* R (0 integer registers, 1 float registers, R=1, Reg=7 no registers */ (0 << 20) | /* L, push LR */ (0 << 21) | /* C - hook up r11 */ - (0x3f6 << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ + (0x3f6u << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ static const BYTE unwind_info_27[] = { DW(unwind_info_27_packed) }; @@ -6874,7 +6874,7 @@ static void test_virtual_unwind(void) (1 << 19) | /* R (0 integer registers, 1 float registers, R=1, Reg=7 no registers */ (0 << 20) | /* L, push LR */ (0 << 21) | /* C - hook up r11 */ - (0x3fa << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ + (0x3fau << 22); /* StackAdjust, stack/4. 0x3F4 special, + (0-3) stack adjustment, 4 PF (prologue folding), 8 EF (epilogue folding) */ static const BYTE unwind_info_28[] = { DW(unwind_info_28_packed) };

1 0