wine-devel January 2019

wine-devel@winehq.org

68 participants
552 discussions

[PATCH v2] dsound: Trace ref in a consistent way
by Alistair Leslie-Hughes 11 Jan '19

11 Jan '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsound/buffer.c | 16 ++++++++-------- dlls/dsound/capture.c | 10 +++++----- dlls/dsound/dsound.c | 4 ++-- dlls/dsound/primary.c | 4 ++-- dlls/dsound/propset.c | 4 ++-- dlls/dsound/sound3d.c | 8 ++++---- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index cb7ff78..5262628 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -60,7 +60,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(IDirectSoundNotify *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedIncrement(&This->refn); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -73,7 +73,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_Release(IDirectSoundNotify *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedDecrement(&This->refn); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); @@ -344,7 +344,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_AddRef(IDirectSoundBuffer8 *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -361,7 +361,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_Release(IDirectSoundBuffer8 *iface) ref = capped_refcount_dec(&This->ref); if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) ref is now: %d\n", This, ref); + TRACE("(%p) ref %d\n", This, ref); return ref; } @@ -369,7 +369,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_Release(IDirectSoundBuffer8 *iface) if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); - TRACE("(%p) ref is now %d\n", This, ref); + TRACE("(%p) ref %d\n", This, ref); return ref; } @@ -1237,7 +1237,7 @@ static ULONG WINAPI IKsPropertySetImpl_AddRef(IKsPropertySet *iface) IDirectSoundBufferImpl *This = impl_from_IKsPropertySet(iface); ULONG ref = InterlockedIncrement(&This->refiks); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -1254,7 +1254,7 @@ static ULONG WINAPI IKsPropertySetImpl_Release(IKsPropertySet *iface) ref = capped_refcount_dec(&This->refiks); if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) ref is now: %d\n", This, ref); + TRACE("(%p) ref %d\n", This, ref); return ref; } @@ -1262,7 +1262,7 @@ static ULONG WINAPI IKsPropertySetImpl_Release(IKsPropertySet *iface) if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); - TRACE("(%p) ref is now %d\n", This, ref); + TRACE("(%p) ref %d\n", This, ref); return ref; } diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index c849624..8fc2749 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -137,7 +137,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(IDirectSoundNotify *iface) IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedIncrement(&This->refn); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -150,7 +150,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_Release(IDirectSoundNotify *iface) IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedDecrement(&This->refn); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) capturebuffer_destroy(This); @@ -263,7 +263,7 @@ static ULONG WINAPI IDirectSoundCaptureBufferImpl_AddRef(IDirectSoundCaptureBuff IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -276,7 +276,7 @@ static ULONG WINAPI IDirectSoundCaptureBufferImpl_Release(IDirectSoundCaptureBuf IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) capturebuffer_destroy(This); @@ -851,7 +851,7 @@ static ULONG DirectSoundCaptureDevice_Release( DirectSoundCaptureDevice * device) { ULONG ref = InterlockedDecrement(&(device->ref)); - TRACE("(%p) ref was %d\n", device, ref + 1); + TRACE("(%p) ref %d\n", device, ref); if (!ref) { TRACE("deleting object\n"); diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 71ede7d..2fbb3ce 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -189,7 +189,7 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) static ULONG DirectSoundDevice_AddRef(DirectSoundDevice * device) { ULONG ref = InterlockedIncrement(&(device->ref)); - TRACE("(%p) ref was %d\n", device, ref - 1); + TRACE("(%p) ref %d\n", device, ref); return ref; } @@ -197,7 +197,7 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) { HRESULT hr; ULONG ref = InterlockedDecrement(&(device->ref)); - TRACE("(%p) ref was %u\n", device, ref + 1); + TRACE("(%p) ref %d\n", device, ref); if (!ref) { int i; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index f74db2f..a30fc5e 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -675,7 +675,7 @@ static ULONG WINAPI PrimaryBufferImpl_AddRef(IDirectSoundBuffer8 *iface) { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); ULONG ref = InterlockedIncrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); return ref; @@ -704,7 +704,7 @@ static ULONG WINAPI PrimaryBufferImpl_Release(IDirectSoundBuffer8 *iface) if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) primary ref is now %d\n", This, ref); + TRACE("(%p) primary ref %d\n", This, ref); return ref; } diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 0272ac0..92aae8f 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -81,7 +81,7 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_AddRef(LPKSPROPERTYSET iface) { IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); ULONG ref = InterlockedIncrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); return ref; } @@ -89,7 +89,7 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_Release(LPKSPROPERTYSET iface) { IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); ULONG ref = InterlockedDecrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 118bb60..27fc416 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -396,7 +396,7 @@ static ULONG WINAPI IDirectSound3DBufferImpl_AddRef(IDirectSound3DBuffer *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); ULONG ref = InterlockedIncrement(&This->ref3D); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -409,7 +409,7 @@ static ULONG WINAPI IDirectSound3DBufferImpl_Release(IDirectSound3DBuffer *iface IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); ULONG ref = InterlockedDecrement(&This->ref3D); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); @@ -744,7 +744,7 @@ static ULONG WINAPI IDirectSound3DListenerImpl_AddRef(IDirectSound3DListener *if IDirectSoundBufferImpl *This = impl_from_IDirectSound3DListener(iface); ULONG ref = InterlockedIncrement(&This->ref3D); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -761,7 +761,7 @@ static ULONG WINAPI IDirectSound3DListenerImpl_Release(IDirectSound3DListener *i if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) ref is now %d\n", This, ref); + TRACE("(%p) ref %d\n", This, ref); return ref; } -- 1.9.1

2 1

[PATCH v1 1/2] kernel32: Fix MoveFileWithProgressW from closing same handle twice
by Jon Doron 11 Jan '19

11 Jan '19

Signed-off-by: Jon Doron <arilou(a)gmail.com> --- dlls/kernel32/path.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 41f0d34aa4..554f96a2b1 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1392,6 +1392,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, } NtClose( dest_handle ); + dest_handle = NULL; } else if (status != STATUS_OBJECT_NAME_NOT_FOUND) { -- 2.19.2

1 1

[PATCH 6/6] d3d9/tests: Add test for clearing surfaces with different sizes.
by Józef Kucia 10 Jan '19

10 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 107 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b4f512ed0aff..9a62f873dce3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -239,10 +239,10 @@ static DWORD getPixelColor(IDirect3DDevice9 *device, UINT x, UINT y) #define check_rt_color(a, b) check_rt_color_(__LINE__, a, b) static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR expected_color) { + D3DCOLOR color = 0xdeadbeef; struct surface_readback rb; D3DSURFACE_DESC desc; unsigned int x, y; - D3DCOLOR color; HRESULT hr; hr = IDirect3DSurface9_GetDesc(rt, &desc); @@ -261,7 +261,7 @@ static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR e break; } release_surface_readback(&rb); - ok_(__FILE__, line)(color == 0x000000ff, "Got unexpected color 0x%08x.\n", color); + ok_(__FILE__, line)(color == expected_color, "Got unexpected color 0x%08x.\n", color); } static IDirect3DDevice9 *create_device(IDirect3D9 *d3d, HWND device_window, HWND focus_window, BOOL windowed) @@ -1349,6 +1349,108 @@ done: DestroyWindow(window); } +static void test_clear_different_size_surfaces(void) +{ + IDirect3DSurface9 *ds, *rt, *rt2; + IDirect3DDevice9 *device; + D3DFORMAT ds_format; + D3DLOCKED_RECT lr; + unsigned int x, y; + D3DVIEWPORT9 vp; + IDirect3D9 *d3d; + D3DCAPS9 caps; + WORD *depth; + HWND window; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create D3D device.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Failed to get device caps, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateRenderTarget(device, 1, 1, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, TRUE, &rt, NULL); + ok(hr == D3D_OK, "Failed to create render target surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 1, 2, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, TRUE, &rt2, NULL); + ok(hr == D3D_OK, "Failed to create render target surface, hr %#x.\n", hr); + + if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_SURFACE, D3DFMT_D16_LOCKABLE))) + { + ds_format = D3DFMT_D16_LOCKABLE; + } + else + { + ds_format = D3DFMT_D24S8; + } + + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 4, 4, ds_format, + D3DMULTISAMPLE_NONE, 0, FALSE, &ds, NULL); + ok(hr == D3D_OK, "Failed to create depth surface, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds); + ok(hr == D3D_OK, "Failed to set depth stencil surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + if (caps.NumSimultaneousRTs >= 2) + { + hr = IDirect3DDevice9_SetRenderTarget(device, 1, rt2); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + } + + vp.X = 0; + vp.Y = 0; + vp.Width = 640; + vp.Height = 640; + vp.MinZ = 0.0f; + vp.MaxZ = 1.0f; + hr = IDirect3DDevice9_SetViewport(device, &vp); + ok(hr == D3D_OK, "Failed to set viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 0.5f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + check_rt_color(rt, 0x00ff0000); + + if (caps.NumSimultaneousRTs >= 2) + check_rt_color(rt2, 0x00ff0000); + + if (ds_format == D3DFMT_D16_LOCKABLE) + { + hr = IDirect3DSurface9_LockRect(ds, &lr, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Failed to lock rect, hr %#x.\n", hr); + for (y = 0; y < 4; ++y) + { + depth = (WORD *)((BYTE *)lr.pBits + y * lr.Pitch); + for (x = 0; x < 4; ++x) + { + ok(abs(depth[x] - 0x7fff) <= 2, "Got depth 0x%04x at %u, %u.\n", depth[x], x, y); + } + } + hr = IDirect3DSurface9_UnlockRect(ds); + ok(hr == D3D_OK, "Failed to unlock rect, hr %#x.\n", hr); + IDirect3DSurface9_Release(ds); + } + else + { + skip("D3DFMT_D16_LOCKABLE is not supported.\n"); + } + + IDirect3DSurface9_Release(rt); + IDirect3DSurface9_Release(rt2); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + static void color_fill_test(void) { IDirect3DSurface9 *surface; @@ -24465,6 +24567,7 @@ START_TEST(visual) lighting_test(); test_specular_lighting(); clear_test(); + test_clear_different_size_surfaces(); color_fill_test(); fog_test(); test_cube_wrap(); -- 2.19.2

2 1

[PATCH 5/6] wined3d: Do not limit draw rect to intersection of all render target views.
by Józef Kucia 10 Jan '19

10 Jan '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46067 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/cs.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c67cc6ce3f0f..7471d24e7ee7 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -605,7 +605,6 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * struct wined3d_rendertarget_view *view; struct wined3d_cs_clear *op; unsigned int rt_count, i; - RECT view_rect; rt_count = flags & WINED3DCLEAR_TARGET ? cs->device->adapter->d3d_info.limits.max_rt_count : 0; @@ -627,17 +626,11 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * for (i = 0; i < rt_count; ++i) { if ((view = state->fb->render_targets[i])) - { - SetRect(&view_rect, 0, 0, view->width, view->height); - IntersectRect(&op->draw_rect, &op->draw_rect, &view_rect); wined3d_resource_acquire(view->resource); - } } if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) { view = state->fb->depth_stencil; - SetRect(&view_rect, 0, 0, view->width, view->height); - IntersectRect(&op->draw_rect, &op->draw_rect, &view_rect); wined3d_resource_acquire(view->resource); } -- 2.19.2

2 1

[PATCH 4/6] wined3d: Limit surface_cpu_blt_colour_fill() to dimensions of render target view.
by Józef Kucia 10 Jan '19

10 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5dbac1c6aec9..1b6e7a5a0654 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2970,8 +2970,8 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, c = wined3d_format_convert_from_float(view->format, colour); bpp = view->format->byte_count; - w = box->right - box->left; - h = box->bottom - box->top; + w = min(box->right, view->width) - box->left; + h = min(box->bottom, view->height) - box->top; texture = texture_from_resource(view->resource); map_binding = texture->resource.map_binding; -- 2.19.2

2 1

[PATCH 3/6] wined3d: Split clears for different size resources in ffp_blitter_clear().
by Józef Kucia 10 Jan '19

10 Jan '19

We cannot reliably clear attachments of different sizes using a single glClear() command. The OpenGL spec says: "If the attachment sizes are not all identical, the results of rendering are defined only within the largest area that can fit in all of the attachments. This area is defined as the intersection of rectangles having a lower left of (0, 0) and an upper right of (width, height) for each attachment. Contents of attachments outside this area are undefined after execution of a rendering command (as defined in section 2.4)." Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46067 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/surface.c | 61 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 58 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a36d010e7930..5dbac1c6aec9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2052,8 +2052,12 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { + BOOL have_previous_rect = FALSE, have_identical_size = TRUE; struct wined3d_rendertarget_view *view; + struct wined3d_fb_state tmp_fb; + unsigned int next_rt_count = 0; struct wined3d_blitter *next; + RECT previous_rect, rect; DWORD next_flags = 0; unsigned int i; @@ -2071,6 +2075,8 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de { next_flags |= WINED3DCLEAR_TARGET; flags &= ~WINED3DCLEAR_TARGET; + next_rt_count = rt_count; + rt_count = 0; break; } @@ -2089,11 +2095,60 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de } if (flags) - device_clear_render_targets(device, flags & WINED3DCLEAR_TARGET ? rt_count : 0, fb, rect_count, - clear_rects, draw_rect, flags, colour, depth, stencil); + { + for (i = 0; i < rt_count; ++i) + { + if (!(view = fb->render_targets[i])) + continue; + + SetRect(&rect, 0, 0, view->width, view->height); + IntersectRect(&rect, draw_rect, &rect); + if (have_previous_rect && !EqualRect(&previous_rect, &rect)) + have_identical_size = FALSE; + previous_rect = rect; + have_previous_rect = TRUE; + } + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) + { + view = fb->depth_stencil; + + SetRect(&rect, 0, 0, view->width, view->height); + IntersectRect(&rect, draw_rect, &rect); + if (have_previous_rect && !EqualRect(&previous_rect, &rect)) + have_identical_size = FALSE; + previous_rect = rect; + have_previous_rect = TRUE; + } + + if (have_identical_size) + { + device_clear_render_targets(device, rt_count, fb, rect_count, + clear_rects, draw_rect, flags, colour, depth, stencil); + } + else + { + for (i = 0; i < rt_count; ++i) + { + if (!(view = fb->render_targets[i])) + continue; + + tmp_fb.render_targets[0] = view; + tmp_fb.depth_stencil = NULL; + device_clear_render_targets(device, 1, &tmp_fb, rect_count, + clear_rects, draw_rect, WINED3DCLEAR_TARGET, colour, depth, stencil); + } + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) + { + tmp_fb.render_targets[0] = NULL; + tmp_fb.depth_stencil = fb->depth_stencil; + device_clear_render_targets(device, 0, &tmp_fb, rect_count, + clear_rects, draw_rect, flags & ~WINED3DCLEAR_TARGET, colour, depth, stencil); + } + } + } if (next_flags && (next = blitter->next)) - next->ops->blitter_clear(next, device, next_flags & WINED3DCLEAR_TARGET ? rt_count : 0, fb, rect_count, + next->ops->blitter_clear(next, device, next_rt_count, fb, rect_count, clear_rects, draw_rect, next_flags, colour, depth, stencil); } -- 2.19.2

2 1

[PATCH 2/6] wined3d: Use accurate rt_count in ffp_blitter_clear().
by Józef Kucia 10 Jan '19

10 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 85f94899cd60..a36d010e7930 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2089,11 +2089,11 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de } if (flags) - device_clear_render_targets(device, rt_count, fb, rect_count, + device_clear_render_targets(device, flags & WINED3DCLEAR_TARGET ? rt_count : 0, fb, rect_count, clear_rects, draw_rect, flags, colour, depth, stencil); if (next_flags && (next = blitter->next)) - next->ops->blitter_clear(next, device, rt_count, fb, rect_count, + next->ops->blitter_clear(next, device, next_flags & WINED3DCLEAR_TARGET ? rt_count : 0, fb, rect_count, clear_rects, draw_rect, next_flags, colour, depth, stencil); } -- 2.19.2

2 1

[PATCH 1/6] wined3d: Sanitise clear flags passed to blitters.
by Józef Kucia 10 Jan '19

10 Jan '19

In order to not trigger "if (flags)" conditions in ffp_blitter_clear() unnecessarily. Also, avoids passing WINED3DCLEAR_SYNCHRONOUS, which is handled at the level of command stream. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/cs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index aa8eef7a2e01..c67cc6ce3f0f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -612,7 +612,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * op = wined3d_cs_require_space(cs, FIELD_OFFSET(struct wined3d_cs_clear, rects[rect_count]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_CLEAR; - op->flags = flags; + op->flags = flags & (WINED3DCLEAR_TARGET | WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); op->rt_count = rt_count; op->fb = &cs->fb; SetRect(&op->draw_rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); @@ -655,7 +655,7 @@ void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined op->fb = (void *)&op->rects[1]; op->opcode = WINED3D_CS_OP_CLEAR; - op->flags = flags; + op->flags = flags & (WINED3DCLEAR_TARGET | WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); if (flags & WINED3DCLEAR_TARGET) { op->rt_count = 1; -- 2.19.2

2 1

[PATCH 3/3] windowscodecs: Simplify the buffer size check in copy_pixels() helper.
by Dmitry Timoshkov 10 Jan '19

10 Jan '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 7650c755ba..78281519b8 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -82,7 +82,7 @@ HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, if (dststride < bytesperrow) return E_INVALIDARG; - if ((dststride * (rc->Height-1)) + ((rc->Width * bpp) + 7)/8 > dstbuffersize) + if ((dststride * (rc->Height-1)) + bytesperrow > dstbuffersize) return E_INVALIDARG; /* if the whole bitmap is copied and the buffer format matches then it's a matter of a single memcpy */ -- 2.20.1

2 1

[PATCH] windowscodecs/tests: Fix typos in TIFF test data.
by Dmitry Timoshkov 10 Jan '19

10 Jan '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/tiffformat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 8da843bdcc..c15e4985e6 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -220,7 +220,7 @@ static struct tiff_resolution_image_data { 0x11, 0x22, 0x33, 0 } }; -static const struct +static const struct tiff_24bpp_data { USHORT byte_order; USHORT version; @@ -247,12 +247,12 @@ static const struct { 0x102, IFD_SHORT, 1, 8 }, /* BITSPERSAMPLE */ { 0x103, IFD_SHORT, 1, 1 }, /* COMPRESSION: XP doesn't accept IFD_LONG here */ { 0x106, IFD_SHORT, 1, 2 }, /* PHOTOMETRIC */ - { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_1bpp_data, pixel_data) }, /* STRIPOFFSETS */ + { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_24bpp_data, pixel_data) }, /* STRIPOFFSETS */ { 0x115, IFD_SHORT, 1, 3 }, /* SAMPLESPERPIXEL */ { 0x116, IFD_LONG, 1, 1 }, /* ROWSPERSTRIP */ - { 0x117, IFD_LONG, 1, 1 }, /* STRIPBYTECOUNT */ - { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1bpp_data, res) }, /* XRESOLUTION */ - { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1bpp_data, res) }, /* YRESOLUTION */ + { 0x117, IFD_LONG, 1, 3 }, /* STRIPBYTECOUNT */ + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_24bpp_data, res) }, /* XRESOLUTION */ + { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_24bpp_data, res) }, /* YRESOLUTION */ { 0x128, IFD_SHORT, 1, 2 }, /* RESOLUTIONUNIT */ }, 0, -- 2.20.1

2 1

← Newer
1
...
39
40
41
42
43
44
45
...
56
Older →

Jump to page:

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-devel January 2019