wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Michael Stefaniuc : oleaut32/tests: Use todo_wine_if() instead of ifdef constructs.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 9d74567ad30d741073461904479c08579ad8e196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d74567ad30d7410734619044… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 5 00:06:16 2016 +0200 oleaut32/tests: Use todo_wine_if() instead of ifdef constructs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 90 ++++++++----------------------------------- 1 file changed, 15 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d74567ad30d741073461…

1 0

Henri Verbeet : wined3d: Use wined3d_cs_emit_unload_resource() in wined3d_device_uninit_3d().
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 4e0394d7853245d9b8baac3d5494df4bc6d23f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e0394d7853245d9b8baac3d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 5 12:39:02 2016 +0200 wined3d: Use wined3d_cs_emit_unload_resource() in wined3d_device_uninit_3d(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 74a07ec..2215af8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1185,7 +1185,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) { TRACE("Unloading resource %p.\n", resource); - resource->resource_ops->resource_unload(resource); + wined3d_cs_emit_unload_resource(device->cs, resource); } wine_rb_clear(&device->samplers, device_free_sampler, NULL);

1 0

Henri Verbeet : wined3d: Evict managed resources through the command stream.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: cac28d32fc1c83c0a942786e84f95c31ea675add URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac28d32fc1c83c0a942786e8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 5 12:39:01 2016 +0200 wined3d: Evict managed resources through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ff2fff5..0d5c151 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -55,6 +55,7 @@ enum wined3d_cs_op WINED3D_CS_OP_RESET_STATE, WINED3D_CS_OP_DESTROY_OBJECT, WINED3D_CS_OP_QUERY_ISSUE, + WINED3D_CS_OP_UNLOAD_RESOURCE, }; struct wined3d_cs_present @@ -275,6 +276,12 @@ struct wined3d_cs_query_issue DWORD flags; }; +struct wined3d_cs_unload_resource +{ + enum wined3d_cs_op opcode; + struct wined3d_resource *resource; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -1243,6 +1250,25 @@ void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *qu cs->ops->submit(cs); } +static void wined3d_cs_exec_unload_resource(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_unload_resource *op = data; + struct wined3d_resource *resource = op->resource; + + resource->resource_ops->resource_unload(resource); +} + +void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) +{ + struct wined3d_cs_unload_resource *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_UNLOAD_RESOURCE; + op->resource = resource; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -1274,6 +1300,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_RESET_STATE */ wined3d_cs_exec_reset_state, /* WINED3D_CS_OP_DESTROY_OBJECT */ wined3d_cs_exec_destroy_object, /* WINED3D_CS_OP_QUERY_ISSUE */ wined3d_cs_exec_query_issue, + /* WINED3D_CS_OP_UNLOAD_RESOURCE */ wined3d_cs_exec_unload_resource, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a633a2d..74a07ec 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4544,7 +4544,7 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) if (resource->pool == WINED3D_POOL_MANAGED && !resource->map_count) { TRACE("Evicting %p.\n", resource); - resource->resource_ops->resource_unload(resource); + wined3d_cs_emit_unload_resource(device->cs, resource); } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f300e4b..01af06f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3090,6 +3090,7 @@ void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN; +void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d_push_constants p, unsigned int start_idx, unsigned int count, const void *constants)

1 0

Henri Verbeet : wined3d: Invalidate STATE_STREAMSRC in buffer_unload() if needed.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 0072830804e844de3b06bb25e3c4b68b7db52c98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0072830804e844de3b06bb25e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 5 12:39:00 2016 +0200 wined3d: Invalidate STATE_STREAMSRC in buffer_unload() if needed. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 18 ++++++++---------- dlls/wined3d/device.c | 3 --- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9e0892e..d51d0e8 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -538,6 +538,14 @@ static void buffer_unload(struct wined3d_resource *resource) buffer->stride = 0; buffer->conversion_stride = 0; buffer->flags &= ~WINED3D_BUFFER_HASDESC; + + /* The stream source state handler might have read the memory of the + * vertex buffer already and got the memory in the vbo which is not + * valid any longer. Dirtify the stream source to force a reload. This + * happens only once per changed vertexbuffer and should occur rather + * rarely. */ + if (resource->bind_count) + device_invalidate_state(device, STATE_STREAMSRC); } resource_unload(resource); @@ -545,18 +553,8 @@ static void buffer_unload(struct wined3d_resource *resource) static void wined3d_buffer_drop_bo(struct wined3d_buffer *buffer) { - struct wined3d_device *device = buffer->resource.device; - buffer->flags &= ~WINED3D_BUFFER_USE_BO; buffer_unload(&buffer->resource); - - /* The stream source state handler might have read the memory of - * the vertex buffer already and got the memory in the vbo which - * is not valid any longer. Dirtify the stream source to force a - * reload. This happens only once per changed vertexbuffer and - * should occur rather rarely. */ - if (buffer->resource.bind_count) - device_invalidate_state(device, STATE_STREAMSRC); } static void wined3d_buffer_destroy_object(void *object) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1bafd5e..a633a2d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4547,9 +4547,6 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) resource->resource_ops->resource_unload(resource); } } - - /* Invalidate stream sources, the buffer(s) may have been evicted. */ - device_invalidate_state(device, STATE_STREAMSRC); } static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d_swapchain *swapchain)

1 0

Henri Verbeet : wined3d: Rename wined3d_sample_destroy_object() to wined3d_sampler_destroy_object().
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 005ed85689344a5884fc7351b15c88ad5294691d URL: http://source.winehq.org/git/wine.git/?a=commit;h=005ed85689344a5884fc7351b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 5 12:38:59 2016 +0200 wined3d: Rename wined3d_sample_destroy_object() to wined3d_sampler_destroy_object(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/sampler.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 1a2e2a1..5902feb 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -33,7 +33,7 @@ ULONG CDECL wined3d_sampler_incref(struct wined3d_sampler *sampler) return refcount; } -static void wined3d_sample_destroy_object(void *object) +static void wined3d_sampler_destroy_object(void *object) { struct wined3d_sampler *sampler = object; const struct wined3d_gl_info *gl_info; @@ -54,7 +54,7 @@ ULONG CDECL wined3d_sampler_decref(struct wined3d_sampler *sampler) TRACE("%p decreasing refcount to %u.\n", sampler, refcount); if (!refcount) - wined3d_cs_emit_destroy_object(sampler->device->cs, wined3d_sample_destroy_object, sampler); + wined3d_cs_emit_destroy_object(sampler->device->cs, wined3d_sampler_destroy_object, sampler); return refcount; }

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in wined3d_texture_get_dc().
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 29d50a21b924db9885314f651d06745f227ab28e URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d50a21b924db9885314f651… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 5 12:38:58 2016 +0200 wined3d: Use wined3d_texture_load_location() in wined3d_texture_get_dc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 098b5d0..2dbb7f3 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2881,7 +2881,7 @@ HRESULT CDECL wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned i if (device->d3d_initialized) context = context_acquire(device, NULL); - surface_load_location(surface, context, texture->resource.map_binding); + wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding); wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); if (!surface->dc)

1 0

Nikolay Sivov : dsound: Fix its vs it's typos.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 9567813ec47d0601593a4ee367bad4c1c3256f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9567813ec47d0601593a4ee36… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 4 10:57:43 2016 +0300 dsound: Fix its vs it's typos. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/sound3d.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 840ab93..b416cdc 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -294,12 +294,12 @@ if(0) dsb->ds3db_ds3db.vVelocity.z == dsb->device->ds3dl.vVelocity.z)) { /* calculate length of ds3db_ds3db.vVelocity component which causes Doppler Effect - NOTE: if buffer moves TOWARDS the listener, it's velocity component is NEGATIVE - if buffer moves AWAY from listener, it's velocity component is POSITIVE */ + NOTE: if buffer moves TOWARDS the listener, its velocity component is NEGATIVE + if buffer moves AWAY from listener, its velocity component is POSITIVE */ flBufferVel = ProjectVector(&dsb->ds3db_ds3db.vVelocity, &vDistance); /* calculate length of ds3dl.vVelocity component which causes Doppler Effect - NOTE: if listener moves TOWARDS the buffer, it's velocity component is POSITIVE - if listener moves AWAY from buffer, it's velocity component is NEGATIVE */ + NOTE: if listener moves TOWARDS the buffer, its velocity component is POSITIVE + if listener moves AWAY from buffer, its velocity component is NEGATIVE */ flListenerVel = ProjectVector(&dsb->device->ds3dl.vVelocity, &vDistance); /* formula taken from Gianicoli D.: Physics, 4th edition: */ /* FIXME: replace dsb->freq with appropriate frequency ! */

1 0

Michael Stefaniuc : mmdevapi/tests: Make use of todo_wine_if().
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: d7b7bdae1db7baee933cb2a3aa6e6c64ea405734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7b7bdae1db7baee933cb2a3a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 4 23:43:27 2016 +0200 mmdevapi/tests: Make use of todo_wine_if(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/capture.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index e68c38d..749272a 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -244,10 +244,8 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); ok(frames2 == frames, "GetBuffer after ReleaseBuffer(0) %u/%u\n", frames2, frames); ok(pos2 == pos, "Position after ReleaseBuffer(0) %u/%u\n", (UINT)pos2, (UINT)pos); - if(qpc2 != qpc) + todo_wine_if(qpc2 != qpc) /* FIXME: Some drivers fail */ - todo_wine ok(qpc2 == qpc, "HPC after ReleaseBuffer(0) %u vs. %u\n", (UINT)qpc2, (UINT)qpc); - else ok(qpc2 == qpc, "HPC after ReleaseBuffer(0) %u vs. %u\n", (UINT)qpc2, (UINT)qpc); }

1 0

Michael Stefaniuc : d3d10core/tests: Make use of todo_wine_if().
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: e75df0210465f483521489717bf5bc9ae80f2fea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e75df0210465f483521489717… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 4 23:42:03 2016 +0200 d3d10core/tests: Make use of todo_wine_if(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f3c4ac8..e574005 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -4648,11 +4648,7 @@ float4 main(float4 color : COLOR) : SV_TARGET ID3D10Device_RSGetScissorRects(device, &count, tmp_rect); for (i = 0; i < D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ++i) { - if (!i) - todo_wine ok(!tmp_rect[i].left && !tmp_rect[i].top && !tmp_rect[i].right && !tmp_rect[i].bottom, - "Got unexpected scissor rect %s in slot %u.\n", - wine_dbgstr_rect(&tmp_rect[i]), i); - else + todo_wine_if(!i) ok(!tmp_rect[i].left && !tmp_rect[i].top && !tmp_rect[i].right && !tmp_rect[i].bottom, "Got unexpected scissor rect %s in slot %u.\n", wine_dbgstr_rect(&tmp_rect[i]), i); @@ -4664,13 +4660,7 @@ float4 main(float4 color : COLOR) : SV_TARGET ID3D10Device_RSGetViewports(device, &count, tmp_viewport); for (i = 0; i < D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ++i) { - if (!i) - todo_wine ok(!tmp_viewport[i].TopLeftX && !tmp_viewport[i].TopLeftY && !tmp_viewport[i].Width - && !tmp_viewport[i].Height && !tmp_viewport[i].MinDepth && !tmp_viewport[i].MaxDepth, - "Got unexpected viewport {%d, %d, %u, %u, %.8e, %.8e} in slot %u.\n", - tmp_viewport[i].TopLeftX, tmp_viewport[i].TopLeftY, tmp_viewport[i].Width, - tmp_viewport[i].Height, tmp_viewport[i].MinDepth, tmp_viewport[i].MaxDepth, i); - else + todo_wine_if(!i) ok(!tmp_viewport[i].TopLeftX && !tmp_viewport[i].TopLeftY && !tmp_viewport[i].Width && !tmp_viewport[i].Height && !tmp_viewport[i].MinDepth && !tmp_viewport[i].MaxDepth, "Got unexpected viewport {%d, %d, %u, %u, %.8e, %.8e} in slot %u.\n",

1 0

Józef Kucia : dxgi/tests: Add test for IDXGISwapChain_ResizeTarget().
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 37661a3bd192b9c24f0d15650554429703bb8259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37661a3bd192b9c24f0d15650… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 4 17:35:56 2016 +0200 dxgi/tests: Add test for IDXGISwapChain_ResizeTarget(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 369 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 312 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37661a3bd192b9c24f0d1…

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
78
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 August 2016