June 2019 - Wine-commits - list.winehq.org

Zebediah Figura : strmbase/renderer: Share pin and filter reference counts.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 6f7d1065d50185f9db0f8b8a1189b5ec94ef0f8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f7d1065d50185f9db0f8b8a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 17 20:41:55 2019 -0500 strmbase/renderer: Share pin and filter reference counts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/nullrenderer.c | 10 +++++----- dlls/quartz/tests/dsoundrender.c | 8 +++----- dlls/quartz/tests/videorenderer.c | 8 +++----- dlls/quartz/tests/vmr7.c | 4 ++-- dlls/quartz/tests/vmr9.c | 4 ++-- dlls/strmbase/renderer.c | 18 +++++++++++++++--- 6 files changed, 30 insertions(+), 22 deletions(-) diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index a45f30a..d39b28d 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -122,9 +122,9 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); IPin_Release(pins[0]); @@ -226,7 +226,7 @@ static void test_pin_info(void) hr = IBaseFilter_FindPin(filter, sink_id, &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - todo_wine ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); ok(ref == 2, "Got unexpected refcount %d.\n", ref); @@ -236,9 +236,9 @@ static void test_pin_info(void) ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); ok(!lstrcmpW(info.achName, sink_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); ref = get_refcount(filter); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir); diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 44c7119..cf7b0e3 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -288,10 +288,8 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -399,7 +397,7 @@ static void test_pin_info(void) hr = IBaseFilter_FindPin(filter, sink_id, &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - todo_wine ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); ok(ref == 2, "Got unexpected refcount %d.\n", ref); @@ -409,9 +407,9 @@ static void test_pin_info(void) ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); ok(!lstrcmpW(info.achName, sink_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); ref = get_refcount(filter); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir); diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index fdd4dfb..0b9ea3f 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -221,10 +221,8 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -329,7 +327,7 @@ static void test_pin_info(void) hr = IBaseFilter_FindPin(filter, sink_id, &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - todo_wine ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); ok(ref == 2, "Got unexpected refcount %d.\n", ref); @@ -340,9 +338,9 @@ static void test_pin_info(void) todo_wine ok(!lstrcmpW(info.achName, sink_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); ref = get_refcount(filter); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index ee80590..e702be7 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -427,9 +427,9 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); IPin_Release(pins[0]); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 13f6e19..d14a970 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -435,9 +435,9 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); IPin_Release(pins[0]); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index b1b318f..36e934f 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -45,6 +45,18 @@ static const IQualityControlVtbl Renderer_QualityControl_Vtbl = { QualityControlImpl_SetSink }; +static ULONG WINAPI BaseRenderer_InputPin_AddRef(IPin *iface) +{ + BaseInputPin *pin = impl_BaseInputPin_from_IPin(iface); + return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter); +} + +static ULONG WINAPI BaseRenderer_InputPin_Release(IPin *iface) +{ + BaseInputPin *pin = impl_BaseInputPin_from_IPin(iface); + return IBaseFilter_Release(pin->pin.pinInfo.pFilter); +} + static HRESULT WINAPI BaseRenderer_InputPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) { BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); @@ -164,8 +176,8 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface) static const IPinVtbl BaseRenderer_InputPin_Vtbl = { BaseInputPinImpl_QueryInterface, - BasePinImpl_AddRef, - BaseInputPinImpl_Release, + BaseRenderer_InputPin_AddRef, + BaseRenderer_InputPin_Release, BaseInputPinImpl_Connect, BaseRenderer_InputPin_ReceiveConnection, BaseRenderer_InputPin_Disconnect, @@ -298,7 +310,7 @@ void strmbase_renderer_cleanup(BaseRenderer *filter) IPin_Release(peer); } IPin_Disconnect(&filter->pInputPin->pin.IPin_iface); - IPin_Release(&filter->pInputPin->pin.IPin_iface); + BaseInputPin_Destroy(filter->pInputPin); if (filter->pPosition) IUnknown_Release(filter->pPosition);

1 0

Zebediah Figura : qcap/vfwcapture: Share pin and filter reference counts.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: dae86f1e5ef2db9d079caa33f3df4029066b18be URL: https://source.winehq.org/git/wine.git/?a=commit;h=dae86f1e5ef2db9d079caa33… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 17 20:41:56 2019 -0500 qcap/vfwcapture: Share pin and filter reference counts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/vfwcapture.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 0bf8c45..2cb1f7d 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -97,6 +97,11 @@ typedef struct VfwPinImpl VfwCapture *parent; } VfwPinImpl; +static inline VfwPinImpl *impl_from_IPin(IPin *iface) +{ + return CONTAINING_RECORD(iface, VfwPinImpl, pin.pin.IPin_iface); +} + static IPin *vfw_capture_get_pin(BaseFilter *iface, unsigned int index) { VfwCapture *This = impl_from_BaseFilter(iface); @@ -125,7 +130,7 @@ static void vfw_capture_destroy(BaseFilter *iface) IPin_Disconnect(filter->pOutputPin); IPin_Release(peer); } - IPin_Release(filter->pOutputPin); + BaseOutputPin_Destroy(&impl_from_IPin(filter->pOutputPin)->pin); strmbase_filter_cleanup(&filter->filter); CoTaskMemFree(filter); ObjectRefCount(FALSE); @@ -648,11 +653,6 @@ VfwPin_Construct( IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, return hr; } -static inline VfwPinImpl *impl_from_IPin(IPin *iface) -{ - return CONTAINING_RECORD(iface, VfwPinImpl, pin.pin.IPin_iface); -} - static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { VfwPinImpl *This = impl_from_IPin(iface); @@ -677,20 +677,17 @@ static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * return E_NOINTERFACE; } +static ULONG WINAPI VfwPin_AddRef(IPin *iface) +{ + VfwPinImpl *pin = impl_from_IPin(iface); + return IBaseFilter_AddRef(pin->pin.pin.pinInfo.pFilter); +} + static ULONG WINAPI VfwPin_Release(IPin * iface) { - VfwPinImpl *This = impl_from_IPin(iface); - ULONG refCount = InterlockedDecrement(&This->pin.pin.refCount); - - TRACE("() -> new refcount: %u\n", refCount); - - if (!refCount) - { - BaseOutputPin_Destroy(&This->pin); - ObjectRefCount(FALSE); - } - return refCount; + VfwPinImpl *pin = impl_from_IPin(iface); + return IBaseFilter_Release(pin->pin.pin.pinInfo.pFilter); } static HRESULT WINAPI @@ -719,7 +716,7 @@ VfwPin_QueryInternalConnections(IPin * iface, IPin ** apPin, ULONG * cPin) static const IPinVtbl VfwPin_Vtbl = { VfwPin_QueryInterface, - BasePinImpl_AddRef, + VfwPin_AddRef, VfwPin_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection,

1 0

Zebediah Figura : winegstreamer: Share sink pin and filter reference counts.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 8d249e1863f3aee2b52633b199215103876880e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d249e1863f3aee2b52633b1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 17 20:41:57 2019 -0500 winegstreamer: Share sink pin and filter reference counts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 45 +++++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 2ec540a..3640fd9 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1211,7 +1211,6 @@ static void gstdemux_destroy(BaseFilter *iface) { GSTImpl *filter = impl_from_IBaseFilter(&iface->IBaseFilter_iface); IPin *connected = NULL; - ULONG pinref; HRESULT hr; CloseHandle(filter->no_more_pads_event); @@ -1227,16 +1226,16 @@ static void gstdemux_destroy(BaseFilter *iface) hr = IPin_Disconnect(&filter->pInputPin.pin.IPin_iface); assert(hr == S_OK); } - pinref = IPin_Release(&filter->pInputPin.pin.IPin_iface); - if (pinref) - { - /* Valgrind could find this, if I kill it here */ - ERR("pinref should be null, is %u, destroying anyway\n", pinref); - assert((LONG)pinref > 0); - while (pinref) - pinref = IPin_Release(&filter->pInputPin.pin.IPin_iface); - } + FreeMediaType(&filter->pInputPin.pin.mtCurrent); + if (filter->pInputPin.pAlloc) + IMemAllocator_Release(filter->pInputPin.pAlloc); + filter->pInputPin.pAlloc = NULL; + if (filter->pInputPin.pReader) + IAsyncReader_Release(filter->pInputPin.pReader); + filter->pInputPin.pReader = NULL; + filter->pInputPin.pin.IPin_iface.lpVtbl = NULL; + if (filter->bus) { gst_bus_set_sync_handler(filter->bus, NULL, NULL, NULL); @@ -1892,24 +1891,16 @@ static inline GSTInPin *impl_sink_from_IPin(IPin *iface) return CONTAINING_RECORD(iface, GSTInPin, pin.IPin_iface); } -static ULONG WINAPI GSTInPin_Release(IPin *iface) +static ULONG WINAPI GSTInPin_AddRef(IPin *iface) { - GSTInPin *This = impl_sink_from_IPin(iface); - ULONG refCount = InterlockedDecrement(&This->pin.refCount); + GSTInPin *pin = impl_sink_from_IPin(iface); + return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter); +} - TRACE("(%p)->() Release from %d\n", iface, refCount + 1); - if (!refCount) { - FreeMediaType(&This->pin.mtCurrent); - if (This->pAlloc) - IMemAllocator_Release(This->pAlloc); - This->pAlloc = NULL; - if (This->pReader) - IAsyncReader_Release(This->pReader); - This->pReader = NULL; - This->pin.IPin_iface.lpVtbl = NULL; - return 0; - } else - return refCount; +static ULONG WINAPI GSTInPin_Release(IPin *iface) +{ + GSTInPin *pin = impl_sink_from_IPin(iface); + return IBaseFilter_Release(pin->pin.pinInfo.pFilter); } static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) @@ -2094,7 +2085,7 @@ static HRESULT WINAPI GSTInPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppE static const IPinVtbl GST_InputPin_Vtbl = { GSTInPin_QueryInterface, - BasePinImpl_AddRef, + GSTInPin_AddRef, GSTInPin_Release, BaseInputPinImpl_Connect, GSTInPin_ReceiveConnection,

1 0

Zebediah Figura : winegstreamer: Share source pin and filter reference counts.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 8983528f6050c39305107f79b5aaf14d728bf8ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=8983528f6050c39305107f79… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 17 20:41:58 2019 -0500 winegstreamer: Share source pin and filter reference counts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 99 +++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 55 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3640fd9..bc2cb2b 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1688,41 +1688,16 @@ static HRESULT WINAPI GSTOutPin_QueryInterface(IPin *iface, REFIID riid, void ** return E_NOINTERFACE; } -static ULONG WINAPI GSTOutPin_Release(IPin *iface) +static ULONG WINAPI GSTOutPin_AddRef(IPin *iface) { - GSTOutPin *This = impl_source_from_IPin(iface); - ULONG refCount = InterlockedDecrement(&This->pin.pin.refCount); - - TRACE("(%p)->() Release from %d\n", This, refCount + 1); - - mark_wine_thread(); + GSTOutPin *pin = impl_source_from_IPin(iface); + return IBaseFilter_AddRef(pin->pin.pin.pinInfo.pFilter); +} - if (!refCount) { - if (This->their_src) { - if (This->flipfilter) { - gst_pad_unlink(This->their_src, This->flip_sink); - gst_pad_unlink(This->flip_src, This->my_sink); - gst_object_unref(This->flip_src); - gst_object_unref(This->flip_sink); - This->flipfilter = NULL; - This->flip_src = This->flip_sink = NULL; - } else - gst_pad_unlink(This->their_src, This->my_sink); - gst_object_unref(This->their_src); - } - gst_object_unref(This->my_sink); - CloseHandle(This->caps_event); - DeleteMediaType(This->pmt); - FreeMediaType(&This->pin.pin.mtCurrent); - gst_segment_free(This->segment); - if(This->gstpool) - gst_object_unref(This->gstpool); - if (This->pin.pAllocator) - IMemAllocator_Release(This->pin.pAllocator); - CoTaskMemFree(This); - return 0; - } - return refCount; +static ULONG WINAPI GSTOutPin_Release(IPin *iface) +{ + GSTOutPin *pin = impl_source_from_IPin(iface); + return IBaseFilter_Release(pin->pin.pin.pinInfo.pFilter); } static HRESULT WINAPI GSTOutPin_CheckMediaType(BasePin *base, const AM_MEDIA_TYPE *amt) @@ -1780,30 +1755,47 @@ static HRESULT WINAPI GSTOutPin_DecideAllocator(BaseOutputPin *base, IMemInputPi return hr; } -static HRESULT break_source_connection(BaseOutputPin *This) +static void free_source_pin(GSTOutPin *pin) { - HRESULT hr; - - TRACE("(%p)->()\n", This); - - EnterCriticalSection(This->pin.pCritSec); - if (!This->pin.pConnectedTo || !This->pMemInputPin) - hr = VFW_E_NOT_CONNECTED; - else + EnterCriticalSection(pin->pin.pin.pCritSec); + if (pin->pin.pin.pConnectedTo) { - hr = IMemAllocator_Decommit(This->pAllocator); - if (SUCCEEDED(hr)) - hr = IPin_Disconnect(This->pin.pConnectedTo); - IPin_Disconnect((IPin *)This); + if (SUCCEEDED(IMemAllocator_Decommit(pin->pin.pAllocator))) + IPin_Disconnect(pin->pin.pin.pConnectedTo); + IPin_Disconnect(&pin->pin.pin.IPin_iface); } - LeaveCriticalSection(This->pin.pCritSec); + LeaveCriticalSection(pin->pin.pin.pCritSec); - return hr; + if (pin->their_src) + { + if (pin->flipfilter) + { + gst_pad_unlink(pin->their_src, pin->flip_sink); + gst_pad_unlink(pin->flip_src, pin->my_sink); + gst_object_unref(pin->flip_src); + gst_object_unref(pin->flip_sink); + pin->flipfilter = NULL; + pin->flip_src = pin->flip_sink = NULL; + } + else + gst_pad_unlink(pin->their_src, pin->my_sink); + gst_object_unref(pin->their_src); + } + gst_object_unref(pin->my_sink); + CloseHandle(pin->caps_event); + DeleteMediaType(pin->pmt); + FreeMediaType(&pin->pin.pin.mtCurrent); + gst_segment_free(pin->segment); + if (pin->gstpool) + gst_object_unref(pin->gstpool); + if (pin->pin.pAllocator) + IMemAllocator_Release(pin->pin.pAllocator); + CoTaskMemFree(pin); } static const IPinVtbl GST_OutputPin_Vtbl = { GSTOutPin_QueryInterface, - BasePinImpl_AddRef, + GSTOutPin_AddRef, GSTOutPin_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, @@ -1857,7 +1849,6 @@ static HRESULT GST_AddPin(GSTImpl *This, const PIN_INFO *piOutput, const AM_MEDI static HRESULT GST_RemoveOutputPins(GSTImpl *This) { - HRESULT hr; ULONG i; TRACE("(%p)\n", This); @@ -1871,11 +1862,9 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) gst_object_unref(This->their_sink); This->my_src = This->their_sink = NULL; - for (i = 0; i < This->cStreams; i++) { - hr = break_source_connection(&This->ppPins[i]->pin); - TRACE("Disconnect: %08x\n", hr); - IPin_Release(&This->ppPins[i]->pin.pin.IPin_iface); - } + for (i = 0; i < This->cStreams; ++i) + free_source_pin(This->ppPins[i]); + This->cStreams = 0; CoTaskMemFree(This->ppPins); This->ppPins = NULL;

1 0

Zebediah Figura : wineqtdecoder: Share sink pin and filter reference counts.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: f194d99d20a9d8c8e228a4230962d405feda0aa4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f194d99d20a9d8c8e228a423… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 17 20:41:59 2019 -0500 wineqtdecoder: Share sink pin and filter reference counts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 45 ++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 3dd530f..8a88729 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -225,7 +225,6 @@ static void qt_splitter_destroy(BaseFilter *iface) { QTSplitter *filter = impl_from_BaseFilter(iface); IPin *peer = NULL; - ULONG pinref; EnterCriticalSection(&filter->csReceive); /* Don't need to clean up output pins, disconnecting input pin will do that */ @@ -235,15 +234,15 @@ static void qt_splitter_destroy(BaseFilter *iface) IPin_Disconnect(peer); IPin_Release(peer); } - pinref = IPin_Release(&filter->pInputPin.pin.IPin_iface); - if (pinref) - { - ERR("pinref should be null, is %u, destroying anyway\n", pinref); - assert((LONG)pinref > 0); - while (pinref) - pinref = IPin_Release(&filter->pInputPin.pin.IPin_iface); - } + FreeMediaType(&filter->pInputPin.pin.mtCurrent); + if (filter->pInputPin.pAlloc) + IMemAllocator_Release(filter->pInputPin.pAlloc); + filter->pInputPin.pAlloc = NULL; + if (filter->pInputPin.pReader) + IAsyncReader_Release(filter->pInputPin.pReader); + filter->pInputPin.pReader = NULL; + filter->pInputPin.pin.IPin_iface.lpVtbl = NULL; if (filter->pQTMovie) { @@ -833,26 +832,16 @@ static inline QTInPin *impl_from_IPin( IPin *iface ) return CONTAINING_RECORD(iface, QTInPin, pin.IPin_iface); } -static ULONG WINAPI QTInPin_Release(IPin *iface) +static ULONG WINAPI QTInPin_AddRef(IPin *iface) { - QTInPin *This = impl_from_IPin(iface); - ULONG refCount = InterlockedDecrement(&This->pin.refCount); + QTInPin *pin = impl_from_IPin(iface); + return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter); +} - TRACE("(%p)->() Release from %d\n", iface, refCount + 1); - if (!refCount) - { - FreeMediaType(&This->pin.mtCurrent); - if (This->pAlloc) - IMemAllocator_Release(This->pAlloc); - This->pAlloc = NULL; - if (This->pReader) - IAsyncReader_Release(This->pReader); - This->pReader = NULL; - This->pin.IPin_iface.lpVtbl = NULL; - return 0; - } - else - return refCount; +static ULONG WINAPI QTInPin_Release(IPin *iface) +{ + QTInPin *pin = impl_from_IPin(iface); + return IBaseFilter_Release(pin->pin.pinInfo.pFilter); } static HRESULT QT_Process_Video_Track(QTSplitter* filter, Track trk) @@ -1288,7 +1277,7 @@ static HRESULT WINAPI QTInPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppEn static const IPinVtbl QT_InputPin_Vtbl = { QTInPin_QueryInterface, - BasePinImpl_AddRef, + QTInPin_AddRef, QTInPin_Release, BaseInputPinImpl_Connect, QTInPin_ReceiveConnection,

1 0

Alexandre Julliard : olecli: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: c9ca990627b45733a0adfd6a102c324d2c35480e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9ca990627b45733a0adfd6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 08:59:19 2019 +0200 olecli: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/olecli.dll16/Makefile.in | 2 +- dlls/olecli.dll16/olecli.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/olecli.dll16/Makefile.in b/dlls/olecli.dll16/Makefile.in index 40a2446..de3e902 100644 --- a/dlls/olecli.dll16/Makefile.in +++ b/dlls/olecli.dll16/Makefile.in @@ -1,5 +1,5 @@ MODULE = olecli.dll16 IMPORTS = gdi32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,olecli32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,olecli32.dll C_SRCS = olecli.c diff --git a/dlls/olecli.dll16/olecli.c b/dlls/olecli.dll16/olecli.c index ad59fa3..599312e 100644 --- a/dlls/olecli.dll16/olecli.c +++ b/dlls/olecli.dll16/olecli.c @@ -21,8 +21,6 @@ /* At the moment, these are only empty stubs. */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : olecli32: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 4263bfb485cbb9e17322db3a997426ce6b3dfd5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4263bfb485cbb9e17322db3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 08:59:33 2019 +0200 olecli32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/olecli32/Makefile.in | 2 ++ dlls/olecli32/olecli_main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/olecli32/Makefile.in b/dlls/olecli32/Makefile.in index 0eca46f..bc17a01 100644 --- a/dlls/olecli32/Makefile.in +++ b/dlls/olecli32/Makefile.in @@ -2,5 +2,7 @@ MODULE = olecli32.dll IMPORTLIB = olecli32 IMPORTS = ole32 gdi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ olecli_main.c diff --git a/dlls/olecli32/olecli_main.c b/dlls/olecli32/olecli_main.c index 7abd438..ebffc0f 100644 --- a/dlls/olecli32/olecli_main.c +++ b/dlls/olecli32/olecli_main.c @@ -21,8 +21,6 @@ /* At the moment, these are only empty stubs. */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : oledb32: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: ff91ac6403b1eedf69b87a6db1aefded23b6230c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff91ac6403b1eedf69b87a6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 08:59:55 2019 +0200 oledb32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/Makefile.in | 2 ++ dlls/oledb32/datainit.c | 47 +++++++++++++++++++++++------------------------ dlls/oledb32/errorinfo.c | 1 - 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/oledb32/Makefile.in b/dlls/oledb32/Makefile.in index a32e9b1..b55a66c 100644 --- a/dlls/oledb32/Makefile.in +++ b/dlls/oledb32/Makefile.in @@ -1,6 +1,8 @@ MODULE = oledb32.dll IMPORTS = uuid oleaut32 ole32 user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ convert.c \ datainit.c \ diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 6b05ef6..2acd23e 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -31,7 +31,6 @@ #include "wine/debug.h" #include "wine/heap.h" #include "wine/list.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(oledb); @@ -299,11 +298,11 @@ struct mode_propval DWORD value; }; -static int dbmodeprop_compare(const void *a, const void *b) +static int __cdecl dbmodeprop_compare(const void *a, const void *b) { const WCHAR *src = a; const struct mode_propval *propval = b; - return strcmpiW(src, propval->name); + return wcsicmp(src, propval->name); } static HRESULT convert_dbproperty_mode(const WCHAR *src, VARIANT *dest) @@ -447,7 +446,7 @@ static HRESULT parse_init_string(const WCHAR *initstring, struct dbprops *props) props->count = 0; start = initstring; - while (start && (eq = strchrW(start, '='))) + while (start && (eq = wcschr(start, '='))) { static const WCHAR providerW[] = {'P','r','o','v','i','d','e','r',0}; WCHAR *delim, quote; @@ -462,10 +461,10 @@ static HRESULT parse_init_string(const WCHAR *initstring, struct dbprops *props) { /* for quoted value string, skip opening mark, look for terminating one */ eq++; - delim = strchrW(eq, quote); + delim = wcschr(eq, quote); } else - delim = strchrW(eq, ';'); + delim = wcschr(eq, ';'); if (delim) value = SysAllocStringLen(eq, delim - eq); @@ -482,7 +481,7 @@ static HRESULT parse_init_string(const WCHAR *initstring, struct dbprops *props) } start = delim; - if (!strcmpiW(name, providerW)) + if (!wcsicmp(name, providerW)) { SysFreeString(name); SysFreeString(value); @@ -519,7 +518,7 @@ static const struct dbproperty *get_known_dprop_descr(BSTR name) n = (min+max)/2; - r = strcmpiW(dbproperties[n].name, name); + r = wcsicmp(dbproperties[n].name, name); if (!r) break; @@ -565,9 +564,9 @@ static HRESULT get_dbpropset_from_proplist(struct dbprops *props, DBPROPSET **pr /* provider specific property is always VT_BSTR */ len = SysStringLen(pair->name) + SysStringLen(pair->value) + 1 /* for '=' */; str = SysAllocStringLen(NULL, len); - strcpyW(str, pair->name); - strcatW(str, eqW); - strcatW(str, pair->value); + lstrcpyW(str, pair->name); + lstrcatW(str, eqW); + lstrcatW(str, pair->value); (*propset)->cProperties++; (*propset)->guidPropertySet = DBPROPSET_DBINIT; @@ -624,9 +623,9 @@ static inline WCHAR *strdupW(const WCHAR *src) { WCHAR *dest; if (!src) return NULL; - dest = heap_alloc((strlenW(src)+1)*sizeof(WCHAR)); + dest = heap_alloc((lstrlenW(src)+1)*sizeof(WCHAR)); if (dest) - strcpyW(dest, src); + lstrcpyW(dest, src); return dest; } @@ -635,7 +634,7 @@ static WCHAR *strstriW(const WCHAR *str, const WCHAR *sub) LPWSTR strlower, sublower, r; strlower = CharLowerW(strdupW(str)); sublower = CharLowerW(strdupW(sub)); - r = strstrW(strlower, sublower); + r = wcsstr(strlower, sublower); if (r) r = (LPWSTR)str + (r - strlower); heap_free(strlower); @@ -818,7 +817,7 @@ static void write_propvalue_str(WCHAR *str, DBPROP *prop) if (V_VT(v) == VT_BSTR) { - strcatW(str, V_BSTR(v)); + lstrcatW(str, V_BSTR(v)); return; } @@ -826,7 +825,7 @@ static void write_propvalue_str(WCHAR *str, DBPROP *prop) hr = VariantChangeType(&vstr, v, VARIANT_ALPHABOOL, VT_BSTR); if (hr == S_OK) { - strcatW(str, V_BSTR(&vstr)); + lstrcatW(str, V_BSTR(&vstr)); VariantClear(&vstr); } } @@ -917,14 +916,14 @@ static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, I IDBProperties_Release(props); /* check if we need to skip password */ - len = strlenW(progid) + strlenW(provW) + 1; /* including ';' */ + len = lstrlenW(progid) + lstrlenW(provW) + 1; /* including ';' */ for (i = 0; i < count; i++) { WCHAR *descr = get_propinfo_descr(&propset->rgProperties[i], propinfoset); if (descr) { /* include '=' and ';' */ - len += strlenW(descr) + 2; + len += lstrlenW(descr) + 2; len += get_propvalue_length(&propset->rgProperties[i]); } @@ -938,9 +937,9 @@ static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, I *init_string[0] = 0; /* provider name */ - strcatW(*init_string, provW); - strcatW(*init_string, progid); - strcatW(*init_string, colW); + lstrcatW(*init_string, provW); + lstrcatW(*init_string, progid); + lstrcatW(*init_string, colW); CoTaskMemFree(progid); for (i = 0; i < count; i++) @@ -953,10 +952,10 @@ static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, I if (descr) { static const WCHAR eqW[] = {'=',0}; - strcatW(*init_string, descr); - strcatW(*init_string, eqW); + lstrcatW(*init_string, descr); + lstrcatW(*init_string, eqW); write_propvalue_str(*init_string, &propset->rgProperties[i]); - strcatW(*init_string, colW); + lstrcatW(*init_string, colW); } } diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index 6249167..985d583 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -31,7 +31,6 @@ #include "oledb_private.h" -#include "wine/unicode.h" #include "wine/heap.h" #include "wine/list.h"

1 0

Józef Kucia : vkd3d: Implement D3D12_RESOURCE_STATE_PREDICATION resource barriers.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: vkd3d Branch: master Commit: ed8bd8cd59702b602d972243510656fb979a3044 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ed8bd8cd59702b602d97224… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 18 10:07:52 2019 +0200 vkd3d: Implement D3D12_RESOURCE_STATE_PREDICATION resource barriers. 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> --- libs/vkd3d/command.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 99f607a..47f7a13 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1870,7 +1870,7 @@ static void d3d12_command_list_invalidate_bindings(struct d3d12_command_list *li } static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, - const struct d3d12_resource *resource, VkQueueFlags vk_queue_flags, + const struct d3d12_resource *resource, VkQueueFlags vk_queue_flags, const struct vkd3d_vulkan_info *vk_info, VkAccessFlags *access_mask, VkPipelineStageFlags *stage_flags, VkImageLayout *image_layout) { bool is_swapchain_image = resource && (resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION); @@ -1909,7 +1909,7 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, else if (resource->present_state != D3D12_RESOURCE_STATE_COMMON) { vk_barrier_parameters_from_d3d12_resource_state(resource->present_state, - resource, vk_queue_flags, access_mask, stage_flags, image_layout); + resource, vk_queue_flags, vk_info, access_mask, stage_flags, image_layout); return true; } } @@ -2044,6 +2044,11 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, { *access_mask |= VK_ACCESS_INDIRECT_COMMAND_READ_BIT; *stage_flags |= VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT; + if (vk_info->EXT_conditional_rendering) + { + *access_mask |= VK_ACCESS_CONDITIONAL_RENDERING_READ_BIT_EXT; + *stage_flags |= VK_PIPELINE_STAGE_CONDITIONAL_RENDERING_BIT_EXT; + } state &= ~D3D12_RESOURCE_STATE_INDIRECT_ARGUMENT; } @@ -2066,6 +2071,7 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 struct d3d12_resource *resource) { const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + const struct vkd3d_vulkan_info *vk_info = &list->device->vk_info; VkPipelineStageFlags src_stage_mask, dst_stage_mask; const struct vkd3d_format *format; VkImageMemoryBarrier barrier; @@ -2088,7 +2094,7 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 VK_IMAGE_LAYOUT_PREINITIALIZED : VK_IMAGE_LAYOUT_UNDEFINED; if (!vk_barrier_parameters_from_d3d12_resource_state(resource->initial_state, - resource, list->vk_queue_flags, &barrier.dstAccessMask, &dst_stage_mask, &barrier.newLayout)) + resource, list->vk_queue_flags, vk_info, &barrier.dstAccessMask, &dst_stage_mask, &barrier.newLayout)) { FIXME("Unhandled state %#x.\n", resource->initial_state); return; @@ -3710,11 +3716,13 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); bool have_aliasing_barriers = false, have_split_barriers = false; const struct vkd3d_vk_device_procs *vk_procs; + const struct vkd3d_vulkan_info *vk_info; unsigned int i; TRACE("iface %p, barrier_count %u, barriers %p.\n", iface, barrier_count, barriers); vk_procs = &list->device->vk_procs; + vk_info = &list->device->vk_info; d3d12_command_list_end_current_render_pass(list); @@ -3762,13 +3770,13 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC sub_resource_idx = transition->Subresource; if (!vk_barrier_parameters_from_d3d12_resource_state(transition->StateBefore, - resource, list->vk_queue_flags, &src_access_mask, &src_stage_mask, &layout_before)) + resource, list->vk_queue_flags, vk_info, &src_access_mask, &src_stage_mask, &layout_before)) { FIXME("Unhandled state %#x.\n", transition->StateBefore); continue; } if (!vk_barrier_parameters_from_d3d12_resource_state(transition->StateAfter, - resource, list->vk_queue_flags, &dst_access_mask, &dst_stage_mask, &layout_after)) + resource, list->vk_queue_flags, vk_info, &dst_access_mask, &dst_stage_mask, &layout_after)) { FIXME("Unhandled state %#x.\n", transition->StateAfter); continue; @@ -3788,7 +3796,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC resource = unsafe_impl_from_ID3D12Resource(uav->pResource); vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, - resource, list->vk_queue_flags, &access_mask, &stage_mask, &image_layout); + resource, list->vk_queue_flags, vk_info, &access_mask, &stage_mask, &image_layout); src_access_mask = dst_access_mask = access_mask; src_stage_mask = dst_stage_mask = stage_mask; layout_before = layout_after = image_layout; @@ -4658,6 +4666,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); const struct vkd3d_vk_device_procs *vk_procs; + const struct vkd3d_vulkan_info *vk_info; const struct d3d12_desc *cpu_descriptor; struct d3d12_resource *resource_impl; VkBufferMemoryBarrier buffer_barrier; @@ -4670,6 +4679,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID iface, gpu_handle.ptr, cpu_handle.ptr, resource, values, rect_count, rects); vk_procs = &list->device->vk_procs; + vk_info = &list->device->vk_info; resource_impl = unsafe_impl_from_ID3D12Resource(resource); @@ -4706,7 +4716,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID buffer_barrier.size = cpu_descriptor->uav.buffer.size; vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, - resource_impl, list->vk_queue_flags, &buffer_barrier.dstAccessMask, &stage_mask, NULL); + resource_impl, list->vk_queue_flags, vk_info, &buffer_barrier.dstAccessMask, &stage_mask, NULL); VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, stage_mask, 0, @@ -4739,7 +4749,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID image_barrier.subresourceRange = range; vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, - resource_impl, list->vk_queue_flags, &image_barrier.dstAccessMask, &stage_mask, NULL); + resource_impl, list->vk_queue_flags, vk_info, &image_barrier.dstAccessMask, &stage_mask, NULL); VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, stage_mask, 0,

1 0

Józef Kucia : tests: Add test to confirm predicate must not be read before every rendering command.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: vkd3d Branch: master Commit: b59b6b87f00e6da5d9392141d5fb975a7b3e3c50 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b59b6b87f00e6da5d939214… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 18 10:07:53 2019 +0200 tests: Add test to confirm predicate must not be read before every rendering command. In Vulkan both behaviors are allowed. 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> --- tests/d3d12.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index a077c60..c2d5bb5 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -31047,6 +31047,39 @@ static void test_conditional_rendering(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + /* Direct3D latches the value of the predicate upon beginning predicated rendering. */ + buffer = create_default_buffer(context.device, sizeof(predicate_args), + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + transition_resource_state(command_list, conditions, + D3D12_RESOURCE_STATE_PREDICATION, D3D12_RESOURCE_STATE_COPY_SOURCE); + ID3D12GraphicsCommandList_CopyResource(command_list, buffer, conditions); + transition_resource_state(command_list, + buffer, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PREDICATION); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + prepare_instanced_draw(&context); + ID3D12GraphicsCommandList_SetPredication(command_list, buffer, 0, D3D12_PREDICATION_OP_NOT_EQUAL_ZERO); + + transition_resource_state(command_list, buffer, + D3D12_RESOURCE_STATE_PREDICATION, D3D12_RESOURCE_STATE_COPY_DEST); + ID3D12GraphicsCommandList_CopyBufferRegion(command_list, buffer, 0, conditions, sizeof(uint64_t), sizeof(uint64_t)); + transition_resource_state(command_list, + buffer, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PREDICATION); + transition_resource_state(command_list, + conditions, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_PREDICATION); + + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + ID3D12Resource_Release(buffer); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + /* ExecuteIndirect(). */ buffer = create_upload_buffer(context.device, sizeof(draw_args), &draw_args);

1 0