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

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_reacquire().
by Alexandre Julliard June 6, 2019

June 6, 2019

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 "needs_set" field from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard June 6, 2019

June 6, 2019

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: Create a blitter for the Vulkan adapter.
by Alexandre Julliard June 6, 2019

June 6, 2019

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

Nikolay Sivov : mf: Implement clock-synchronized mode for ProcessSample() in sample grabber sink.
by Alexandre Julliard June 6, 2019

June 6, 2019

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

Alistair Leslie-Hughes : dbghelp: Support S_HEAPALLOCSITE entry.
by Alexandre Julliard June 6, 2019

June 6, 2019

Module: wine Branch: master Commit: 48a74277f5f9e0c87d8c01457236a89d94cb71d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48a74277f5f9e0c87d8c0145… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 3 23:55:46 2019 +0000 dbghelp: Support S_HEAPALLOCSITE entry. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 5 +++++ include/wine/mscvpdb.h | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 54fbe36..4be0cb2 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2011,6 +2011,11 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* roo case S_ALIGN_V1: TRACE("S-Align V1\n"); break; + case S_HEAPALLOCSITE: + TRACE("heap site: offset=0x%08x at sect_idx 0x%04x, inst_len 0x%08x, index 0x%08x\n", + sym->heap_alloc_site.offset, sym->heap_alloc_site.sect_idx, + sym->heap_alloc_site.inst_len, sym->heap_alloc_site.index); + break; /* the symbols we can safely ignore for now */ case S_TRAMPOLINE: diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index a44331b..2301e80 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1644,6 +1644,16 @@ union codeview_symbol unsigned short eh_sect; /* section for exception handler */ unsigned int flags; } frame_info_v2; + + struct + { + unsigned short len; + unsigned short id; + unsigned int offset; + unsigned short sect_idx; + unsigned short inst_len; + unsigned int index; + } heap_alloc_site; }; #define S_COMPILAND_V1 0x0001

1 0

Zebediah Figura : hidclass.sys: Get rid of unused minidriver parameter to HID_DeleteDevice().
by Alexandre Julliard June 6, 2019

June 6, 2019

Module: wine Branch: master Commit: 3d011fcdffe39ae856cbb0915938fe158b60742a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d011fcdffe39ae856cbb091… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 6 11:12:50 2019 -0400 hidclass.sys: Get rid of unused minidriver parameter to HID_DeleteDevice(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 3 +-- dlls/hidclass.sys/hid.h | 2 +- dlls/hidclass.sys/pnp.c | 14 +++++++------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 93187b5..e961772 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -174,8 +174,7 @@ static void WINAPI read_cancel_routine(DEVICE_OBJECT *device, IRP *irp) IoCompleteRequest(irp, IO_NO_INCREMENT); } - -void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device) +void HID_DeleteDevice(DEVICE_OBJECT *device) { BASE_DEVICE_EXTENSION *ext; IRP *irp; diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index b9bf135..0f82323 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -94,7 +94,7 @@ minidriver* find_minidriver(DRIVER_OBJECT* driver) DECLSPEC_HIDDEN; /* Internal device functions */ NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT **device) DECLSPEC_HIDDEN; NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; -void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device) DECLSPEC_HIDDEN; +void HID_DeleteDevice(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; void HID_StartDeviceThread(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 826ade9..8265efd 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -122,7 +122,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) if (status != STATUS_SUCCESS) { ERR("Minidriver AddDevice failed (%x)\n",status); - HID_DeleteDevice(&minidriver->minidriver, device); + HID_DeleteDevice(device); return status; } @@ -132,7 +132,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) if (status != STATUS_SUCCESS) { ERR("Minidriver failed to get Attributes(%x)\n",status); - HID_DeleteDevice(&minidriver->minidriver, device); + HID_DeleteDevice(device); return status; } @@ -146,7 +146,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) if (status != STATUS_SUCCESS) { ERR("Cannot get Device Descriptor(%x)\n",status); - HID_DeleteDevice(&minidriver->minidriver, device); + HID_DeleteDevice(device); return status; } for (i = 0; i < descriptor.bNumDescriptors; i++) @@ -156,7 +156,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) if (i >= descriptor.bNumDescriptors) { ERR("No Report Descriptor found in reply\n"); - HID_DeleteDevice(&minidriver->minidriver, device); + HID_DeleteDevice(device); return status; } @@ -166,7 +166,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) if (status != STATUS_SUCCESS) { ERR("Cannot get Report Descriptor(%x)\n",status); - HID_DeleteDevice(&minidriver->minidriver, device); + HID_DeleteDevice(device); HeapFree(GetProcessHeap(), 0, reportDescriptor); return status; } @@ -177,7 +177,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) if (!ext->preparseData) { ERR("Cannot parse Report Descriptor\n"); - HID_DeleteDevice(&minidriver->minidriver, device); + HID_DeleteDevice(device); return STATUS_NOT_SUPPORTED; } @@ -217,7 +217,7 @@ NTSTATUS PNP_RemoveDevice(minidriver *minidriver, DEVICE_OBJECT *device, IRP *ir if (irp) rc = minidriver->PNPDispatch(device, irp); - HID_DeleteDevice(&minidriver->minidriver, device); + HID_DeleteDevice(device); LIST_FOR_EACH_ENTRY(hiddev, &minidriver->device_list, hid_device, entry) { if (hiddev->device == device)

1 0

Zebediah Figura : qcap/avico: Use BaseFilterImpl_QueryVendorInfo().
by Alexandre Julliard June 6, 2019

June 6, 2019

Module: wine Branch: master Commit: eab720d35d794c58625bfccc586035c57fb14822 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eab720d35d794c58625bfccc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 6 11:22:56 2019 -0400 qcap/avico: Use BaseFilterImpl_QueryVendorInfo(). 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 6ebe0fd..684a332 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_QueryVendorInfo(IBaseFilter *iface, LPWSTR *pVendorInfo) -{ - AVICompressor *This = impl_from_IBaseFilter(iface); - FIXME("(%p)->(%p)\n", This, pVendorInfo); - return E_NOTIMPL; -} - static const IBaseFilterVtbl AVICompressorVtbl = { BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, @@ -182,7 +175,7 @@ static const IBaseFilterVtbl AVICompressorVtbl = { BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, - AVICompressor_QueryVendorInfo + BaseFilterImpl_QueryVendorInfo, }; static IPin *avi_compressor_get_pin(BaseFilter *iface, unsigned int index)

1 0

Zebediah Figura : strmbase: Get rid of BaseRendererImpl_QueryInterface().
by Alexandre Julliard June 6, 2019

June 6, 2019

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

Zebediah Figura : qedit/samplegrabber: Use BaseFilterImpl_FindPin().
by Alexandre Julliard June 6, 2019

June 6, 2019

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

Henri Verbeet : wined3d: Move the material tracking fields from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard June 6, 2019

June 6, 2019

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