March 2021 - Wine-Commits - list.winehq.org

Paul Gofman : ddraw: Do not require specific texture location for blits.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: 06255e6991932908744139a468cc1c718e1305b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06255e6991932908744139a4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Mar 11 16:34:02 2021 +0300 ddraw: Do not require specific texture location for blits. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 9 +++++++++ dlls/ddraw/device.c | 4 ++-- dlls/ddraw/surface.c | 10 +++++----- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 1c28e081b8a..0c65b9940ba 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -699,6 +699,15 @@ static inline struct wined3d_texture *ddraw_surface_get_draw_texture(struct ddra return surface->draw_texture; } +static inline struct wined3d_texture *ddraw_surface_get_any_texture(struct ddraw_surface *surface, unsigned int flags) +{ + if (surface->texture_location & DDRAW_SURFACE_LOCATION_DEFAULT) + return ddraw_surface_get_default_texture(surface, flags); + + assert(surface->texture_location & DDRAW_SURFACE_LOCATION_DRAW); + return ddraw_surface_get_draw_texture(surface, flags); +} + void d3d_device_sync_surfaces(struct d3d_device *device) DECLSPEC_HIDDEN; /* Used for generic dumping */ diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index b2392f54b01..c99eafc7524 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6171,9 +6171,9 @@ static void copy_mipmap_chain(struct d3d_device *device, struct ddraw_surface *d UINT src_h = src_rect.bottom - src_rect.top; RECT dst_rect = {point.x, point.y, point.x + src_w, point.y + src_h}; - if (FAILED(hr = wined3d_texture_blt(ddraw_surface_get_default_texture(dst_level, DDRAW_SURFACE_RW), + if (FAILED(hr = wined3d_texture_blt(ddraw_surface_get_any_texture(dst_level, DDRAW_SURFACE_RW), dst_level->sub_resource_idx, &dst_rect, - ddraw_surface_get_default_texture(src_level, DDRAW_SURFACE_READ), + ddraw_surface_get_any_texture(src_level, DDRAW_SURFACE_READ), src_level->sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) ERR("Blit failed, hr %#x.\n", hr); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e8a5518b2f9..19a1ae3d2d2 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -113,7 +113,7 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, dst_texture = ddraw->wined3d_frontbuffer; if (SUCCEEDED(hr = wined3d_texture_blt(dst_texture, 0, rect, - ddraw_surface_get_default_texture(surface, DDRAW_SURFACE_READ), surface->sub_resource_idx, rect, 0, + ddraw_surface_get_any_texture(surface, DDRAW_SURFACE_READ), surface->sub_resource_idx, rect, 0, NULL, WINED3D_TEXF_POINT)) && swap_interval) { hr = wined3d_swapchain_present(ddraw->wined3d_swapchain, rect, rect, NULL, swap_interval, 0); @@ -1557,8 +1557,8 @@ static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT * if (!(flags & DDBLT_ASYNC)) wined3d_flags |= WINED3D_BLT_SYNCHRONOUS; - return wined3d_texture_blt(ddraw_surface_get_default_texture(dst_surface, DDRAW_SURFACE_RW), - dst_surface->sub_resource_idx, dst_rect, ddraw_surface_get_default_texture(src_surface, DDRAW_SURFACE_READ), + return wined3d_texture_blt(ddraw_surface_get_any_texture(dst_surface, DDRAW_SURFACE_RW), + dst_surface->sub_resource_idx, dst_rect, ddraw_surface_get_any_texture(src_surface, DDRAW_SURFACE_READ), src_surface->sub_resource_idx, src_rect, wined3d_flags, fx, filter); } @@ -4406,8 +4406,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_BltFast(IDirectDrawSurfac if (src_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) hr = ddraw_surface_update_frontbuffer(src_impl, src_rect, TRUE, 0); if (SUCCEEDED(hr)) - hr = wined3d_texture_blt(ddraw_surface_get_default_texture(dst_impl, DDRAW_SURFACE_RW), - dst_impl->sub_resource_idx, &dst_rect, ddraw_surface_get_default_texture(src_impl,DDRAW_SURFACE_READ), + hr = wined3d_texture_blt(ddraw_surface_get_any_texture(dst_impl, DDRAW_SURFACE_RW), + dst_impl->sub_resource_idx, &dst_rect, ddraw_surface_get_any_texture(src_impl,DDRAW_SURFACE_READ), src_impl->sub_resource_idx, src_rect, flags, NULL, WINED3D_TEXF_POINT); if (SUCCEEDED(hr) && (dst_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) hr = ddraw_surface_update_frontbuffer(dst_impl, &dst_rect, FALSE, 0);

1 0

Paul Gofman : ddraw/tests: Run test_depth_blit() for each device type.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: a63716af13a081ed0d2766366d99e5fb4c8cf991 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a63716af13a081ed0d276636… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Mar 11 16:33:58 2021 +0300 ddraw/tests: Run test_depth_blit() for each device type. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 95 ++++++++++++++++++++------------- dlls/ddraw/tests/ddraw4.c | 106 +++++++++++++++++++++++-------------- dlls/ddraw/tests/ddraw7.c | 130 ++++++++++++++++++++++++++++++---------------- 3 files changed, 210 insertions(+), 121 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a63716af13a081ed0d27…

1 0

Henri Verbeet : wined3d: Implement automatic mip-map generation for the Vulkan adapter.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: afe401219c3b1db2234fcf689f567e36e1e7185f URL: https://source.winehq.org/git/wine.git/?a=commit;h=afe401219c3b1db2234fcf68… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 12 17:59:06 2021 +0100 wined3d: Implement automatic mip-map generation for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 9 +++ dlls/wined3d/adapter_vk.c | 9 +++ dlls/wined3d/cs.c | 6 +- dlls/wined3d/utils.c | 3 + dlls/wined3d/view.c | 153 +++++++++++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 6 +- 6 files changed, 172 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=afe401219c3b1db2234f…

1 0

Paul Gofman : ddraw: Track location for surfaces with the second texture.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: 2f938ef3ec3e6fc69a5732788400be6c3560a574 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f938ef3ec3e6fc69a573278… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Mar 11 16:34:01 2021 +0300 ddraw: Track location for surfaces with the second texture. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 46 +++++++++++++++++++++++++++++------- dlls/ddraw/device.c | 39 ++++++++++++++----------------- dlls/ddraw/executebuffer.c | 9 +++---- dlls/ddraw/surface.c | 58 +++++++++++++++++++++++++--------------------- 4 files changed, 89 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2f938ef3ec3e6fc69a57…

1 0

Jacek Caban : jscript: Improve interp_local debug traces.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: bb85e0aefdc58cf0a2eebee15e13fc5028a823f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb85e0aefdc58cf0a2eebee1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 12 18:39:23 2021 +0100 jscript: Improve interp_local debug traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e1c3783196f..b6930a25b65 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1304,7 +1304,7 @@ static HRESULT interp_local_ref(script_ctx_t *ctx) call_frame_t *frame = ctx->call_ctx; exprval_t ref; - TRACE("%d\n", arg); + TRACE("%s\n", debugstr_w(local_name(frame, arg))); if(!frame->base_scope || !frame->base_scope->frame) return interp_identifier_ref(ctx, local_name(frame, arg), flags); @@ -1321,15 +1321,16 @@ static HRESULT interp_local(script_ctx_t *ctx) jsval_t copy; HRESULT hres; - TRACE("%d: %s\n", arg, debugstr_w(local_name(frame, arg))); - - if(!frame->base_scope || !frame->base_scope->frame) + if(!frame->base_scope || !frame->base_scope->frame) { + TRACE("%s\n", debugstr_w(local_name(frame, arg))); return identifier_value(ctx, local_name(frame, arg)); + } hres = jsval_copy(ctx->stack[local_off(frame, arg)], &copy); if(FAILED(hres)) return hres; + TRACE("%s: %s\n", debugstr_w(local_name(frame, arg)), debugstr_jsval(copy)); return stack_push(ctx, copy); }

1 0

Paul Gofman : ddraw/tests: Run test_zenable() for each device type.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: e68abb70df13b7b6090cf6ca4cc5ff229bd090d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e68abb70df13b7b6090cf6ca… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Mar 11 16:33:59 2021 +0300 ddraw/tests: Run test_zenable() for each device type. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 18 +++++++++--------- dlls/ddraw/tests/ddraw2.c | 36 +++++++++++++++++++++++++----------- dlls/ddraw/tests/ddraw4.c | 36 +++++++++++++++++++++++++----------- dlls/ddraw/tests/ddraw7.c | 34 ++++++++++++++++++++++++---------- 4 files changed, 83 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e68abb70df13b7b6090c…

1 0

Paul Gofman : ddraw/tests: Run test_ck_rgba() for each device type.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: 041ff96fce2f67a3a031c8c6d1bc4accfb3d6e69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=041ff96fce2f67a3a031c8c6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Mar 11 16:34:00 2021 +0300 ddraw/tests: Run test_ck_rgba() for each device type. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 107 +++++++++++++++++++++++++++------------------- dlls/ddraw/tests/ddraw2.c | 56 +++++++++++++----------- dlls/ddraw/tests/ddraw4.c | 54 ++++++++++++----------- dlls/ddraw/tests/ddraw7.c | 52 ++++++++++++---------- 4 files changed, 152 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=041ff96fce2f67a3a031…

1 0

Alexandre Julliard : Release 6.4.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: 4336ed0b84b3dd3097bbbbf8e4b9de2e4d444ad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4336ed0b84b3dd3097bbbbf8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 12 21:34:39 2021 +0100 Release 6.4. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1079 +++++++++++++++++++++++++++++-------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 533 insertions(+), 568 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4336ed0b84b3dd3097bb…

1 0

Tag wine-6.4 : Alexandre Julliard : Release 6.4
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: refs/tags/wine-6.4 Tag: 56fb819c362c8d993f0b2946da2ca3bd869a6649 URL: https://source.winehq.org/git/wine.git/?a=tag;h=56fb819c362c8d993f0b2946da2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 12 21:34:39 2021 +0100 Release 6.4

1 0

Jacek Caban : jscript: Silence parser_error warning.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: c79561f7aec69f9d70a48bbbcd61c4bf4af8122a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c79561f7aec69f9d70a48bbb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 12 18:39:17 2021 +0100 jscript: Silence parser_error warning. It's triggered on handling implicit semi-colon in the end of statement. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/parser.y | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index ba81668dbb3..716c9688201 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1468,7 +1468,6 @@ static int parser_error(unsigned *loc, parser_ctx_t *ctx, const char *str) ctx->error_loc = *loc; if(ctx->hres == S_OK) ctx->hres = JS_E_SYNTAX; - WARN("%s: %s\n", debugstr_w(ctx->begin + *loc), str); return 0; }

1 0