wine-commits June 2019

wine-commits@winehq.org

1 participants
865 discussions

Zebediah Figura : qcap/avico: Use BaseFilterImpl_QueryFilterInfo().
by Alexandre Julliard 06 Jun '19

06 Jun '19

Module: wine Branch: master Commit: ca77a7e0c16b9ae2e2dfc440fbae234a9fe99412 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca77a7e0c16b9ae2e2dfc440… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 6 11:22:55 2019 -0400 qcap/avico: Use BaseFilterImpl_QueryFilterInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 40bc82b..6ebe0fd 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -160,13 +160,6 @@ static HRESULT WINAPI AVICompressor_Run(IBaseFilter *iface, REFERENCE_TIME tStar return S_OK; } -static HRESULT WINAPI AVICompressor_QueryFilterInfo(IBaseFilter *iface, FILTER_INFO *pInfo) -{ - AVICompressor *This = impl_from_IBaseFilter(iface); - FIXME("(%p)->(%p)\n", This, pInfo); - return E_NOTIMPL; -} - static HRESULT WINAPI AVICompressor_QueryVendorInfo(IBaseFilter *iface, LPWSTR *pVendorInfo) { AVICompressor *This = impl_from_IBaseFilter(iface); @@ -187,7 +180,7 @@ static const IBaseFilterVtbl AVICompressorVtbl = { BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, BaseFilterImpl_FindPin, - AVICompressor_QueryFilterInfo, + BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, AVICompressor_QueryVendorInfo };

1 0

Zebediah Figura : qedit/samplegrabber: Use BaseFilterImpl_FindPin().
by Alexandre Julliard 06 Jun '19

06 Jun '19

Module: wine Branch: master Commit: 32fd95befe43a14b35c616f7132bd472144a16d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32fd95befe43a14b35c616f7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 6 11:22:54 2019 -0400 qedit/samplegrabber: Use BaseFilterImpl_FindPin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 0385ebb..517c7fe 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -408,30 +408,6 @@ SampleGrabber_IBaseFilter_Run(IBaseFilter *iface, REFERENCE_TIME tStart) /* IBaseFilter */ static HRESULT WINAPI -SampleGrabber_IBaseFilter_FindPin(IBaseFilter *iface, LPCWSTR id, IPin **pin) -{ - SG_Impl *This = impl_from_IBaseFilter(iface); - TRACE("(%p)->(%s, %p)\n", This, debugstr_w(id), pin); - if (!id || !pin) - return E_POINTER; - if (!lstrcmpiW(id,pin_in_name)) - { - *pin = &This->pin_in.IPin_iface; - IPin_AddRef(*pin); - return S_OK; - } - else if (!lstrcmpiW(id,pin_out_name)) - { - *pin = &This->pin_out.IPin_iface; - IPin_AddRef(*pin); - return S_OK; - } - *pin = NULL; - return VFW_E_NOT_FOUND; -} - -/* IBaseFilter */ -static HRESULT WINAPI SampleGrabber_IBaseFilter_JoinFilterGraph(IBaseFilter *iface, IFilterGraph *graph, LPCWSTR name) { SG_Impl *This = impl_from_IBaseFilter(iface); @@ -1082,7 +1058,7 @@ static const IBaseFilterVtbl IBaseFilter_VTable = BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, - SampleGrabber_IBaseFilter_FindPin, + BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, SampleGrabber_IBaseFilter_JoinFilterGraph, SampleGrabber_IBaseFilter_QueryVendorInfo,

1 0

Zebediah Figura : strmbase: Support aggregation in the base transform filter.
by Alexandre Julliard 06 Jun '19

06 Jun '19

Module: wine Branch: master Commit: f500b1dc196e709da666c5045ca8e0da8242f8a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f500b1dc196e709da666c504… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 6 11:22:53 2019 -0400 strmbase: Support aggregation in the base transform filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 13 ++++--------- dlls/quartz/avidec.c | 13 ++++--------- dlls/quartz/tests/acmwrapper.c | 3 +-- dlls/quartz/tests/avidec.c | 3 +-- dlls/strmbase/transform.c | 8 ++++---- dlls/winegstreamer/gsttffilter.c | 9 ++++----- dlls/wineqtdecoder/qtvdecoder.c | 14 +++----------- include/wine/strmbase.h | 2 +- 8 files changed, 22 insertions(+), 43 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index b38f435..adfb022 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -375,25 +375,20 @@ static const TransformFilterFuncTable ACMWrapper_FuncsTable = { NULL }; -HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) +HRESULT ACMWrapper_create(IUnknown *outer, void **out) { HRESULT hr; ACMWrapperImpl* This; - TRACE("(%p, %p)\n", pUnkOuter, ppv); + *out = NULL; - *ppv = NULL; - - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - - hr = strmbase_transform_create(sizeof(ACMWrapperImpl), &CLSID_ACMWrapper, + hr = strmbase_transform_create(sizeof(ACMWrapperImpl), outer, &CLSID_ACMWrapper, &ACMWrapper_FuncsTable, (IBaseFilter **)&This); if (FAILED(hr)) return hr; - *ppv = &This->tf.filter.IBaseFilter_iface; + *out = &This->tf.filter.IUnknown_inner; This->lasttime_real = This->lasttime_sent = -1; return hr; diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index a12cad1..4aefd35 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -390,19 +390,14 @@ static const TransformFilterFuncTable AVIDec_FuncsTable = { AVIDec_NotifyDrop }; -HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv) +HRESULT AVIDec_create(IUnknown *outer, void **out) { HRESULT hr; AVIDecImpl * This; - TRACE("(%p, %p)\n", pUnkOuter, ppv); + *out = NULL; - *ppv = NULL; - - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - - hr = strmbase_transform_create(sizeof(AVIDecImpl), &CLSID_AVIDec, + hr = strmbase_transform_create(sizeof(AVIDecImpl), outer, &CLSID_AVIDec, &AVIDec_FuncsTable, (IBaseFilter **)&This); if (FAILED(hr)) @@ -412,7 +407,7 @@ HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv) This->pBihIn = NULL; This->pBihOut = NULL; - *ppv = &This->tf.filter.IBaseFilter_iface; + *out = &This->tf.filter.IUnknown_inner; return hr; } diff --git a/dlls/quartz/tests/acmwrapper.c b/dlls/quartz/tests/acmwrapper.c index 48451f80..1c41872 100644 --- a/dlls/quartz/tests/acmwrapper.c +++ b/dlls/quartz/tests/acmwrapper.c @@ -158,8 +158,7 @@ static void test_aggregation(void) hr = CoCreateInstance(&CLSID_ACMWrapper, &test_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (FAILED(hr)) return; + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); ref = get_refcount(unk); diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index fe86d33..0183e0b 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -183,8 +183,7 @@ static void test_aggregation(void) hr = CoCreateInstance(&CLSID_AVIDec, &test_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (FAILED(hr)) return; + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); ref = get_refcount(unk); diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index bfe87a1..a7c47b5 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -281,14 +281,14 @@ static const IBaseFilterVtbl transform_vtbl = BaseFilterImpl_QueryVendorInfo }; -static HRESULT strmbase_transform_init(const CLSID *clsid, +static HRESULT strmbase_transform_init(IUnknown *outer, const CLSID *clsid, const TransformFilterFuncTable *func_table, TransformFilter *filter) { HRESULT hr; PIN_INFO piInput; PIN_INFO piOutput; - strmbase_filter_init(&filter->filter, &transform_vtbl, NULL, clsid, + strmbase_filter_init(&filter->filter, &transform_vtbl, outer, clsid, (DWORD_PTR)(__FILE__ ": TransformFilter.csFilter"), &tfBaseFuncTable); InitializeCriticalSection(&filter->csReceive); @@ -349,7 +349,7 @@ static HRESULT strmbase_transform_init(const CLSID *clsid, return hr; } -HRESULT strmbase_transform_create(LONG filter_size, const CLSID *pClsid, +HRESULT strmbase_transform_create(LONG filter_size, IUnknown *outer, const CLSID *pClsid, const TransformFilterFuncTable *pFuncsTable, IBaseFilter **ppTransformFilter) { TransformFilter* pTf; @@ -365,7 +365,7 @@ HRESULT strmbase_transform_create(LONG filter_size, const CLSID *pClsid, ZeroMemory(pTf, filter_size); - if (SUCCEEDED(strmbase_transform_init(pClsid, pFuncsTable, pTf))) + if (SUCCEEDED(strmbase_transform_init(outer, pClsid, pFuncsTable, pTf))) { *ppTransformFilter = &pTf->filter.IBaseFilter_iface; return S_OK; diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index b45d844..60697e5 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -489,17 +489,16 @@ static HRESULT WINAPI Gstreamer_transform_QOS(TransformFilter *iface, IBaseFilte return TransformFilterImpl_Notify(iface, sender, qm); } -static HRESULT Gstreamer_transform_create(IUnknown *punkouter, const CLSID *clsid, const char *name, const TransformFilterFuncTable *vtbl, void **obj) +static HRESULT Gstreamer_transform_create(IUnknown *outer, const CLSID *clsid, + const char *name, const TransformFilterFuncTable *vtbl, void **obj) { GstTfImpl *This; - TRACE("%p, %p, %p, %p, %p\n", punkouter, clsid, name, vtbl, obj); - - if (FAILED(strmbase_transform_create(sizeof(GstTfImpl), clsid, vtbl, (IBaseFilter **)&This))) + if (FAILED(strmbase_transform_create(sizeof(GstTfImpl), outer, clsid, vtbl, (IBaseFilter **)&This))) return E_OUTOFMEMORY; This->gstreamer_name = name; - *obj = This; + *obj = &This->tf.filter.IUnknown_inner; TRACE("returning %p\n", This); diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 4ad73d8..57101d4 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -518,22 +518,14 @@ static const TransformFilterFuncTable QTVDecoder_FuncsTable = { NULL }; -IUnknown * CALLBACK QTVDecoder_create(IUnknown * pUnkOuter, HRESULT* phr) +IUnknown * CALLBACK QTVDecoder_create(IUnknown *outer, HRESULT* phr) { HRESULT hr; QTVDecoderImpl * This; - TRACE("(%p, %p)\n", pUnkOuter, phr); - *phr = S_OK; - if (pUnkOuter) - { - *phr = CLASS_E_NOAGGREGATION; - return NULL; - } - - hr = strmbase_transform_create(sizeof(QTVDecoderImpl), &CLSID_QTVDecoder, + hr = strmbase_transform_create(sizeof(QTVDecoderImpl), outer, &CLSID_QTVDecoder, &QTVDecoder_FuncsTable, (IBaseFilter **)&This); if (FAILED(hr)) @@ -543,5 +535,5 @@ IUnknown * CALLBACK QTVDecoder_create(IUnknown * pUnkOuter, HRESULT* phr) } *phr = hr; - return (IUnknown*)This; + return &This->tf.filter.IUnknown_inner; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 7ee8be6..56560ed 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -249,7 +249,7 @@ typedef struct TransformFilterFuncTable { HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *iface, IBaseFilter *sender, Quality qm); -HRESULT strmbase_transform_create(LONG filter_size, const CLSID *clsid, +HRESULT strmbase_transform_create(LONG filter_size, IUnknown *outer, const CLSID *clsid, const TransformFilterFuncTable *func_table, IBaseFilter **filter); /* Source Seeking */

1 0

Zebediah Figura : strmbase: Get rid of BaseRendererImpl_QueryInterface().
by Alexandre Julliard 06 Jun '19

06 Jun '19

Module: wine Branch: master Commit: 0d0f1e0ff72b8a8f043fb95dae5e012537eff50c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d0f1e0ff72b8a8f043fb95d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 6 11:22:52 2019 -0400 strmbase: Get rid of BaseRendererImpl_QueryInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 16 ---------------- include/wine/strmbase.h | 1 - 2 files changed, 17 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 6f0bc2d..1017c8c 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -289,22 +289,6 @@ HRESULT WINAPI strmbase_renderer_init(BaseRenderer *This, const IBaseFilterVtbl return hr; } -HRESULT WINAPI BaseRendererImpl_QueryInterface(IBaseFilter* iface, REFIID riid, LPVOID * ppv) -{ - BaseRenderer *This = impl_from_IBaseFilter(iface); - - if (IsEqualIID(riid, &IID_IMediaSeeking) || IsEqualIID(riid, &IID_IMediaPosition)) - return IUnknown_QueryInterface(This->pPosition, riid, ppv); - else if (IsEqualIID(riid, &IID_IQualityControl)) - { - *ppv = &This->qcimpl->IQualityControl_iface; - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - else - return BaseFilterImpl_QueryInterface(iface, riid, ppv); -} - void strmbase_renderer_cleanup(BaseRenderer *filter) { IPin *peer; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 87396fd..7ee8be6 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -611,7 +611,6 @@ typedef struct BaseRendererFuncTable { HRESULT (*renderer_query_interface)(BaseRenderer *iface, REFIID iid, void **out); } BaseRendererFuncTable; -HRESULT WINAPI BaseRendererImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv); HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSample); HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface); HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart);

1 0

Nikolay Sivov : mf: Implement clock-synchronized mode for ProcessSample() in sample grabber sink.
by Alexandre Julliard 06 Jun '19

06 Jun '19

Module: wine Branch: master Commit: 54e45dbf7dad31fbd621fb72a2e64c94d521545a URL: https://source.winehq.org/git/wine.git/?a=commit;h=54e45dbf7dad31fbd621fb72… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 6 16:18:35 2019 +0300 mf: Implement clock-synchronized mode for ProcessSample() in sample grabber sink. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 228 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 209 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54e45dbf7dad31fbd621…

1 0

Henri Verbeet : wined3d: Create a blitter for the Vulkan adapter.
by Alexandre Julliard 06 Jun '19

06 Jun '19

Module: wine Branch: master Commit: 59ddd605842252da8406d94334302c494defa615 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59ddd605842252da8406d943… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 6 17:39:08 2019 +0430 wined3d: Create a blitter for the Vulkan adapter. The CPU blitter isn't the fastest, but it should work. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 0009818..0dc6458 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -416,12 +416,14 @@ static BOOL adapter_vk_check_format(const struct wined3d_adapter *adapter, static HRESULT adapter_vk_init_3d(struct wined3d_device *device) { + struct wined3d_device_vk *device_vk; struct wined3d_context *context_vk; HRESULT hr; TRACE("device %p.\n", device); - context_vk = &wined3d_device_vk(device)->context_vk; + device_vk = wined3d_device_vk(device); + context_vk = &device_vk->context_vk; if (FAILED(hr = wined3d_context_vk_init(context_vk, device->swapchains[0]))) { WARN("Failed to initialise context.\n"); @@ -437,6 +439,14 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) TRACE("Initialised context %p.\n", context_vk); + if (!(device_vk->d.blitter = wined3d_cpu_blitter_create())) + { + ERR("Failed to create CPU blitter.\n"); + device_context_remove(device, context_vk); + wined3d_context_cleanup(context_vk); + return E_FAIL; + } + return WINED3D_OK; } @@ -446,6 +456,8 @@ static void adapter_vk_uninit_3d(struct wined3d_device *device) TRACE("device %p.\n", device); + device->blitter->ops->blitter_destroy(device->blitter, NULL); + context_vk = &wined3d_device_vk(device)->context_vk; device_context_remove(device, context_vk); wined3d_context_cleanup(context_vk);

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_reacquire().
by Alexandre Julliard 06 Jun '19

06 Jun '19

Module: wine Branch: master Commit: bfbc5f56b1812fcfe9e6dca1de4a0dea54fdeb3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfbc5f56b1812fcfe9e6dca1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 6 17:39:07 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_reacquire(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 25 +++---- dlls/wined3d/query.c | 148 ++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 3 +- 3 files changed, 86 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bfbc5f56b1812fcfe9e6…

1 0

Henri Verbeet : wined3d: Move the "valid" field from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard 06 Jun '19

06 Jun '19

Module: wine Branch: master Commit: e0d9bc3a874827a01655b2842533e57d7e105462 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0d9bc3a874827a01655b284… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 6 17:39:06 2019 +0430 wined3d: Move the "valid" field from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 54 ++++++++++++++++++++---------------------- dlls/wined3d/cs.c | 10 ++++---- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/wined3d_private.h | 34 +++++++++++++------------- 6 files changed, 53 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e0d9bc3a874827a01655…

1 0

Henri Verbeet : wined3d: Move the "needs_set" field from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard 06 Jun '19

06 Jun '19

Module: wine Branch: master Commit: 64bc86ab3cf64f09f77db198dcd131aad540881e URL: https://source.winehq.org/git/wine.git/?a=commit;h=64bc86ab3cf64f09f77db198… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 6 17:39:05 2019 +0430 wined3d: Move the "needs_set" field from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 129d4da..fb745e2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1282,7 +1282,7 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context context_gl->c.valid = 1; } - context_gl->c.needs_set = 0; + context_gl->needs_set = 0; return TRUE; } @@ -1314,7 +1314,7 @@ static void wined3d_context_gl_update_window(struct wined3d_context_gl *context_ context_gl->window = context_gl->c.swapchain->win_handle; context_gl->dc_is_private = FALSE; context_gl->dc_has_format = FALSE; - context_gl->c.needs_set = 1; + context_gl->needs_set = 1; context_gl->c.valid = 1; if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE))) @@ -1583,7 +1583,7 @@ void wined3d_context_gl_release(struct wined3d_context_gl *context_gl) if (!--context->level) { if (wined3d_context_gl_restore_pixel_format(context_gl)) - context->needs_set = 1; + context_gl->needs_set = 1; if (context_gl->restore_ctx) { TRACE("Restoring GL context %p on device context %p.\n", context_gl->restore_ctx, context_gl->restore_dc); @@ -1629,11 +1629,11 @@ static void wined3d_context_gl_enter(struct wined3d_context_gl *context_gl) current_gl, wglGetCurrentDC()); context_gl->restore_ctx = current_gl; context_gl->restore_dc = wglGetCurrentDC(); - context_gl->c.needs_set = 1; + context_gl->needs_set = 1; } - else if (!context_gl->c.needs_set && !(context_gl->dc_is_private && context_gl->dc_has_format) + else if (!context_gl->needs_set && !(context_gl->dc_is_private && context_gl->dc_has_format) && context_gl->pixel_format != context_gl->c.gl_info->gl_ops.wgl.p_wglGetPixelFormat(context_gl->dc)) - context_gl->c.needs_set = 1; + context_gl->needs_set = 1; } } @@ -2133,7 +2133,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi context_gl->gl_ctx = ctx; context_gl->dc_has_format = TRUE; - context->needs_set = 1; + context_gl->needs_set = 1; /* Set up the context defaults */ if (!context_set_current(context)) @@ -4191,7 +4191,7 @@ static void wined3d_context_gl_activate(struct wined3d_context_gl *context_gl, if (!context_set_current(&context_gl->c)) ERR("Failed to activate the new context.\n"); } - else if (context_gl->c.needs_set) + else if (context_gl->needs_set) { wined3d_context_gl_set_gl_context(context_gl); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6652794..5b37e96 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1926,7 +1926,7 @@ struct wined3d_context DWORD fixed_function_usage_map : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD lowest_disabled_stage : 4; /* Max WINED3D_MAX_TEXTURES, 8 */ DWORD use_immediate_mode_draw : 1; - DWORD needs_set : 1; + DWORD uses_uavs : 1; DWORD transform_feedback_active : 1; DWORD transform_feedback_paused : 1; @@ -1934,10 +1934,9 @@ struct wined3d_context DWORD update_compute_shader_resource_bindings : 1; DWORD update_unordered_access_view_bindings : 1; DWORD update_compute_unordered_access_view_bindings : 1; - DWORD uses_uavs : 1; DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ - DWORD padding : 13; + DWORD padding : 14; DWORD constant_update_mask; DWORD numbered_array_mask; @@ -1975,7 +1974,8 @@ struct wined3d_context_gl uint32_t diffuse_attrib_to_1 : 1; uint32_t rebind_fbo : 1; uint32_t untracked_material_count : 2; /* Max value 2 */ - uint32_t padding : 25; + uint32_t needs_set : 1; + uint32_t padding : 24; uint32_t default_attrib_value_set;

1 0

Henri Verbeet : wined3d: Move the material tracking fields from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard 06 Jun '19

06 Jun '19

Module: wine Branch: master Commit: b1c5c9b2262db3d64e7c6f65dfa9c136bfe02d0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1c5c9b2262db3d64e7c6f65… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 6 17:39:04 2019 +0430 wined3d: Move the material tracking fields from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 8 ++++--- dlls/wined3d/state.c | 49 +++++++++++++++--------------------------- dlls/wined3d/wined3d_private.h | 14 ++++++------ 3 files changed, 29 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9784a48..129d4da 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4552,7 +4552,7 @@ static void draw_primitive_immediate_mode(struct wined3d_context_gl *context_gl, else gl_info->gl_ops.gl.p_glNormal3f(0.0f, 0.0f, 0.0f); - untracked_material_count = context_gl->c.num_untracked_materials; + untracked_material_count = context_gl->untracked_material_count; if (si->use_map & (1u << WINED3D_FFP_DIFFUSE)) { element = &si->elements[WINED3D_FFP_DIFFUSE]; @@ -4665,7 +4665,7 @@ static void draw_primitive_immediate_mode(struct wined3d_context_gl *context_gl, for (i = 0; i < untracked_material_count; ++i) { gl_info->gl_ops.gl.p_glMaterialfv(GL_FRONT_AND_BACK, - context_gl->c.untracked_materials[i], &color.r); + context_gl->untracked_materials[i], &color.r); } } } @@ -4794,6 +4794,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s struct wined3d_stream_info si_emulated; struct wined3d_fence *ib_fence = NULL; const struct wined3d_gl_info *gl_info; + struct wined3d_context_gl *context_gl; struct wined3d_context *context; unsigned int i, idx_size = 0; const void *idx_data = NULL; @@ -4820,6 +4821,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s WARN("Invalid context, skipping draw.\n"); return; } + context_gl = wined3d_context_gl(context); gl_info = context->gl_info; if (!use_transform_feedback(state)) @@ -4898,7 +4900,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (!use_vs(state)) { - if (!stream_info->position_transformed && context->num_untracked_materials + if (!stream_info->position_transformed && context_gl->untracked_material_count && state->render_states[WINED3D_RS_LIGHTING]) { static BOOL warned; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b2fcbdd..c52e25d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1297,19 +1297,18 @@ void state_fogdensity(struct wined3d_context *context, const struct wined3d_stat static void state_colormat(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GLenum Parm = 0; - /* Depends on the decoded vertex declaration to read the existence of diffuse data. - * The vertex declaration will call this function if the fixed function pipeline is used. - */ - - if(isStateDirty(context, STATE_VDECL)) { + /* Depends on the decoded vertex declaration to read the existence of + * diffuse data. The vertex declaration will call this function if the + * fixed function pipeline is used. */ + if (isStateDirty(&context_gl->c, STATE_VDECL)) return; - } - context->num_untracked_materials = 0; - if ((context->stream_info.use_map & (1u << WINED3D_FFP_DIFFUSE)) + context_gl->untracked_material_count = 0; + if ((context_gl->c.stream_info.use_map & (1u << WINED3D_FFP_DIFFUSE)) && state->render_states[WINED3D_RS_COLORVERTEX]) { TRACE("diff %d, amb %d, emis %d, spec %d\n", @@ -1325,38 +1324,23 @@ static void state_colormat(struct wined3d_context *context, const struct wined3d else Parm = GL_DIFFUSE; if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3D_MCS_COLOR1) - { - context->untracked_materials[context->num_untracked_materials] = GL_EMISSION; - context->num_untracked_materials++; - } + context_gl->untracked_materials[context_gl->untracked_material_count++] = GL_EMISSION; if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3D_MCS_COLOR1) - { - context->untracked_materials[context->num_untracked_materials] = GL_SPECULAR; - context->num_untracked_materials++; - } + context_gl->untracked_materials[context_gl->untracked_material_count++] = GL_SPECULAR; } else if (state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE] == WINED3D_MCS_COLOR1) { Parm = GL_AMBIENT; if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3D_MCS_COLOR1) - { - context->untracked_materials[context->num_untracked_materials] = GL_EMISSION; - context->num_untracked_materials++; - } + context_gl->untracked_materials[context_gl->untracked_material_count++] = GL_EMISSION; if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3D_MCS_COLOR1) - { - context->untracked_materials[context->num_untracked_materials] = GL_SPECULAR; - context->num_untracked_materials++; - } + context_gl->untracked_materials[context_gl->untracked_material_count++] = GL_SPECULAR; } else if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3D_MCS_COLOR1) { Parm = GL_EMISSION; if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3D_MCS_COLOR1) - { - context->untracked_materials[context->num_untracked_materials] = GL_SPECULAR; - context->num_untracked_materials++; - } + context_gl->untracked_materials[context_gl->untracked_material_count++] = GL_SPECULAR; } else if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3D_MCS_COLOR1) { @@ -1365,7 +1349,8 @@ static void state_colormat(struct wined3d_context *context, const struct wined3d } /* Nothing changed, return. */ - if (Parm == context->tracking_parm) return; + if (Parm == context_gl->tracking_parm) + return; if (!Parm) { @@ -1382,7 +1367,7 @@ static void state_colormat(struct wined3d_context *context, const struct wined3d /* Apparently calls to glMaterialfv are ignored for properties we're * tracking with glColorMaterial, so apply those here. */ - switch (context->tracking_parm) + switch (context_gl->tracking_parm) { case GL_AMBIENT_AND_DIFFUSE: gl_info->gl_ops.gl.p_glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float *)&state->material.ambient); @@ -1421,7 +1406,7 @@ static void state_colormat(struct wined3d_context *context, const struct wined3d break; } - context->tracking_parm = Parm; + context_gl->tracking_parm = Parm; } static void state_linepattern(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 89d3272..6652794 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1927,23 +1927,20 @@ struct wined3d_context DWORD lowest_disabled_stage : 4; /* Max WINED3D_MAX_TEXTURES, 8 */ DWORD use_immediate_mode_draw : 1; DWORD needs_set : 1; - DWORD num_untracked_materials : 2; /* Max value 2 */ + DWORD transform_feedback_active : 1; + DWORD transform_feedback_paused : 1; DWORD update_shader_resource_bindings : 1; DWORD update_compute_shader_resource_bindings : 1; DWORD update_unordered_access_view_bindings : 1; DWORD update_compute_unordered_access_view_bindings : 1; DWORD uses_uavs : 1; - DWORD transform_feedback_active : 1; - DWORD transform_feedback_paused : 1; DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ - DWORD padding : 11; + DWORD padding : 13; DWORD constant_update_mask; DWORD numbered_array_mask; - GLenum tracking_parm; /* Which source is tracking current colour */ - GLenum untracked_materials[2]; enum fogsource fog_source; UINT instance_count; @@ -1977,10 +1974,13 @@ struct wined3d_context_gl uint32_t fog_enabled : 1; uint32_t diffuse_attrib_to_1 : 1; uint32_t rebind_fbo : 1; - uint32_t padding : 27; + uint32_t untracked_material_count : 2; /* Max value 2 */ + uint32_t padding : 25; uint32_t default_attrib_value_set; + GLenum tracking_parm; /* Which source is tracking current colour. */ + GLenum untracked_materials[2]; SIZE blit_size; unsigned int active_texture;

1 0

← Newer
1
...
68
69
70
71
72
73
74
...
87
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 June 2019