April 2020 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Add Vulkan format information for WINED3DFMT_R32_FLOAT_X8X24_TYPELESS.
by Alexandre Julliard 29 Apr '20

29 Apr '20

Module: wine Branch: master Commit: 4ecb026c49634396564b05c8d0c78e824a22d92a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ecb026c49634396564b05c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 29 03:04:57 2020 +0430 wined3d: Add Vulkan format information for WINED3DFMT_R32_FLOAT_X8X24_TYPELESS. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0397056441..b5df4a2b10 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4201,6 +4201,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_BC7_UNORM_SRGB, VK_FORMAT_BC7_SRGB_BLOCK, }, {WINED3DFMT_R9G9B9E5_SHAREDEXP, VK_FORMAT_E5B9G9R9_UFLOAT_PACK32, }, {WINED3DFMT_D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, + {WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, VK_FORMAT_D32_SFLOAT_S8_UINT, }, }; VkFormat vk_format = VK_FORMAT_UNDEFINED; VkImageFormatProperties image_properties;

1 0

Henri Verbeet : wined3d: Add Vulkan format information for WINED3DFMT_X32_TYPELESS_G8X24_UINT.
by Alexandre Julliard 29 Apr '20

29 Apr '20

Module: wine Branch: master Commit: 81cd4e21bf7c5f3951a8cd9554e00dc9bfb22da3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81cd4e21bf7c5f3951a8cd95… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 29 03:04:58 2020 +0430 wined3d: Add Vulkan format information for WINED3DFMT_X32_TYPELESS_G8X24_UINT. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b5df4a2b10..be3ad90107 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4202,6 +4202,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_R9G9B9E5_SHAREDEXP, VK_FORMAT_E5B9G9R9_UFLOAT_PACK32, }, {WINED3DFMT_D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, {WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, VK_FORMAT_D32_SFLOAT_S8_UINT, }, + {WINED3DFMT_X32_TYPELESS_G8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, }; VkFormat vk_format = VK_FORMAT_UNDEFINED; VkImageFormatProperties image_properties;

1 0

Henri Verbeet : wined3d: Add Vulkan format information for WINED3DFMT_D24_UNORM_S8_UINT.
by Alexandre Julliard 29 Apr '20

29 Apr '20

Module: wine Branch: master Commit: 359d53d4d1b89ea631c2f5bf7bed1c4c7c3351de URL: https://source.winehq.org/git/wine.git/?a=commit;h=359d53d4d1b89ea631c2f5bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 29 03:04:59 2020 +0430 wined3d: Add Vulkan format information for WINED3DFMT_D24_UNORM_S8_UINT. On some implementations we could use VK_FORMAT_D24_UNORM_S8_UINT instead, but that's not universally supported. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index be3ad90107..5e9673f2c7 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4203,6 +4203,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, {WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, VK_FORMAT_D32_SFLOAT_S8_UINT, }, {WINED3DFMT_X32_TYPELESS_G8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, + {WINED3DFMT_D24_UNORM_S8_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, }; VkFormat vk_format = VK_FORMAT_UNDEFINED; VkImageFormatProperties image_properties;

1 0

Henri Verbeet : wined3d: Implement WINED3D_MAP_DISCARD support in adapter_vk_map_bo_address().
by Alexandre Julliard 29 Apr '20

29 Apr '20

Module: wine Branch: master Commit: f2d733102d89b084ffdb8dd6541b887e863c3373 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2d733102d89b084ffdb8dd6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 29 03:05:00 2020 +0430 wined3d: Implement WINED3D_MAP_DISCARD support in adapter_vk_map_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index b6a0eea785..f9b3e4721a 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -813,8 +813,8 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, struct wined3d_device_vk *device_vk; VkCommandBuffer vk_command_buffer; VkBufferMemoryBarrier vk_barrier; + struct wined3d_bo_vk *bo, tmp; VkMappedMemoryRange range; - struct wined3d_bo_vk *bo; void *map_ptr; if (!(bo = (struct wined3d_bo_vk *)data->buffer_object)) @@ -826,6 +826,19 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, if (map_flags & WINED3D_MAP_NOOVERWRITE) goto map; + if ((map_flags & WINED3D_MAP_DISCARD) && bo->command_buffer_id > context_vk->completed_command_buffer_id) + { + if (wined3d_context_vk_create_bo(context_vk, bo->size, bo->usage, bo->memory_type, &tmp)) + { + wined3d_context_vk_destroy_bo(context_vk, bo); + *bo = tmp; + + goto map; + } + + ERR("Failed to create new buffer object.\n"); + } + if (map_flags & WINED3D_MAP_READ) { if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk)))

1 0

Henri Verbeet : wined3d: Use DISCARD maps in wined3d_buffer_vk_upload_ranges() if possible.
by Alexandre Julliard 29 Apr '20

29 Apr '20

Module: wine Branch: master Commit: b7e1fc96172ebface5b0af619a9bd4b72bf3be6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7e1fc96172ebface5b0af61… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 29 03:05:01 2020 +0430 wined3d: Use DISCARD maps in wined3d_buffer_vk_upload_ranges() if possible. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1444ac9b63..703a8aee70 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1649,6 +1649,7 @@ static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struc const struct wined3d_range *range; struct wined3d_bo_address dst; unsigned int i = range_count; + uint32_t flags; void *map_ptr; if (!range_count) @@ -1657,7 +1658,10 @@ static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struc dst.buffer_object = buffer->buffer_object; dst.addr = NULL; - if (!(map_ptr = wined3d_context_map_bo_address(context, &dst, resource->size, WINED3D_MAP_WRITE))) + flags = WINED3D_MAP_WRITE; + if (!ranges->offset && ranges->size == resource->size) + flags |= WINED3D_MAP_DISCARD; + if (!(map_ptr = wined3d_context_map_bo_address(context, &dst, resource->size, flags))) { FIXME("Failed to map buffer.\n"); return;

1 0

Biswapriyo Nath : include: Add d3d11 video processor capability flags.
by Alexandre Julliard 29 Apr '20

29 Apr '20

Module: wine Branch: master Commit: 88b9d1a5381918dcd9e555d1588be16a5ea98695 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88b9d1a5381918dcd9e555d1… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Apr 29 03:05:02 2020 +0430 include: Add d3d11 video processor capability flags. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 9ecb3af091..507cfd012a 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -360,6 +360,72 @@ typedef enum D3D11_VIDEO_PROCESSOR_ROTATION D3D11_VIDEO_PROCESSOR_ROTATION_270 = 3, } D3D11_VIDEO_PROCESSOR_ROTATION; +typedef enum D3D11_VIDEO_PROCESSOR_DEVICE_CAPS +{ + D3D11_VIDEO_PROCESSOR_DEVICE_CAPS_LINEAR_SPACE = 0x00000001, + D3D11_VIDEO_PROCESSOR_DEVICE_CAPS_xvYCC = 0x00000002, + D3D11_VIDEO_PROCESSOR_DEVICE_CAPS_RGB_RANGE_CONVERSION = 0x00000004, + D3D11_VIDEO_PROCESSOR_DEVICE_CAPS_YCbCr_MATRIX_CONVERSION = 0x00000008, + D3D11_VIDEO_PROCESSOR_DEVICE_CAPS_NOMINAL_RANGE = 0x00000010, +} D3D11_VIDEO_PROCESSOR_DEVICE_CAPS; + +typedef enum D3D11_VIDEO_PROCESSOR_FEATURE_CAPS +{ + D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_ALPHA_FILL = 0x00000001, + D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_CONSTRICTION = 0x00000002, + D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_LUMA_KEY = 0x00000004, + D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_ALPHA_PALETTE = 0x00000008, + D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_LEGACY = 0x00000010, + D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_STEREO = 0x00000020, + D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_ROTATION = 0x00000040, + D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_ALPHA_STREAM = 0x00000080, + D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_PIXEL_ASPECT_RATIO = 0x00000100, + D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_MIRROR = 0x00000200, + D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_SHADER_USAGE = 0x00000400, + D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_METADATA_HDR10 = 0x00000800, +} D3D11_VIDEO_PROCESSOR_FEATURE_CAPS; + +typedef enum D3D11_VIDEO_PROCESSOR_FILTER_CAPS +{ + D3D11_VIDEO_PROCESSOR_FILTER_CAPS_BRIGHTNESS = 0x00000001, + D3D11_VIDEO_PROCESSOR_FILTER_CAPS_CONTRAST = 0x00000002, + D3D11_VIDEO_PROCESSOR_FILTER_CAPS_HUE = 0x00000004, + D3D11_VIDEO_PROCESSOR_FILTER_CAPS_SATURATION = 0x00000008, + D3D11_VIDEO_PROCESSOR_FILTER_CAPS_NOISE_REDUCTION = 0x00000010, + D3D11_VIDEO_PROCESSOR_FILTER_CAPS_EDGE_ENHANCEMENT = 0x00000020, + D3D11_VIDEO_PROCESSOR_FILTER_CAPS_ANAMORPHIC_SCALING = 0x00000040, + D3D11_VIDEO_PROCESSOR_FILTER_CAPS_STEREO_ADJUSTMENT = 0x00000080, +} D3D11_VIDEO_PROCESSOR_FILTER_CAPS; + +typedef enum D3D11_VIDEO_PROCESSOR_FORMAT_CAPS +{ + D3D11_VIDEO_PROCESSOR_FORMAT_CAPS_RGB_INTERLACED = 0x00000001, + D3D11_VIDEO_PROCESSOR_FORMAT_CAPS_RGB_PROCAMP = 0x00000002, + D3D11_VIDEO_PROCESSOR_FORMAT_CAPS_RGB_LUMA_KEY = 0x00000004, + D3D11_VIDEO_PROCESSOR_FORMAT_CAPS_PALETTE_INTERLACED = 0x00000008, +} D3D11_VIDEO_PROCESSOR_FORMAT_CAPS; + +typedef enum D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS +{ + D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_DENOISE = 0x00000001, + D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_DERINGING = 0x00000002, + D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_EDGE_ENHANCEMENT = 0x00000004, + D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_COLOR_CORRECTION = 0x00000008, + D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_FLESH_TONE_MAPPING = 0x00000010, + D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_IMAGE_STABILIZATION = 0x00000020, + D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_SUPER_RESOLUTION = 0x00000040, + D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_ANAMORPHIC_SCALING = 0x00000080, +} D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS; + +typedef enum D3D11_VIDEO_PROCESSOR_STEREO_CAPS +{ + D3D11_VIDEO_PROCESSOR_STEREO_CAPS_MONO_OFFSET = 0x00000001, + D3D11_VIDEO_PROCESSOR_STEREO_CAPS_ROW_INTERLEAVED = 0x00000002, + D3D11_VIDEO_PROCESSOR_STEREO_CAPS_COLUMN_INTERLEAVED = 0x00000004, + D3D11_VIDEO_PROCESSOR_STEREO_CAPS_CHECKERBOARD = 0x00000008, + D3D11_VIDEO_PROCESSOR_STEREO_CAPS_FLIP_MODE = 0x00000010, +} D3D11_VIDEO_PROCESSOR_STEREO_CAPS; + typedef enum D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS { D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_BLEND = 0x01,

1 0

Zebediah Figura : quartz/vmr9: Don't expose IVMRSurfaceAllocatorNotify from the VMR9.
by Alexandre Julliard 29 Apr '20

29 Apr '20

Module: wine Branch: master Commit: 44386de52af1a0c8a4bded5555a32f8629364a45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44386de52af1a0c8a4bded55… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 28 17:44:43 2020 -0500 quartz/vmr9: Don't expose IVMRSurfaceAllocatorNotify from the VMR9. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/vmr9.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index e78d20a411..4bba6f7431 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -298,7 +298,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IVMRMixerControl, FALSE); todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); - todo_wine check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); check_interface(filter, &IID_IVMRWindowlessControl, FALSE); check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 389166db3e..c847b9c448 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -91,6 +91,11 @@ struct quartz_vmr HANDLE run_event; }; +static inline BOOL is_vmr9(const struct quartz_vmr *filter) +{ + return IsEqualGUID(&filter->renderer.filter.clsid, &CLSID_VideoMixingRenderer9); +} + static inline struct quartz_vmr *impl_from_video_window(struct video_window *iface) { return CONTAINING_RECORD(iface, struct quartz_vmr, baseControlWindow); @@ -435,7 +440,7 @@ static HRESULT VMR9_maybe_init(struct quartz_vmr *filter, BOOL force, const AM_M return E_FAIL; } - if (IsEqualGUID(&filter->renderer.filter.clsid, &CLSID_VideoMixingRenderer)) + if (!is_vmr9(filter)) { switch (filter->bmiheader.biBitCount) { @@ -621,7 +626,8 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IVMRMonitorConfig_iface; else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig9)) *out = &filter->IVMRMonitorConfig9_iface; - else if (IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorNotify) && filter->mode == (VMR9Mode)VMRMode_Renderless) + else if (IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorNotify) + && filter->mode == (VMR9Mode)VMRMode_Renderless && !is_vmr9(filter)) *out = &filter->IVMRSurfaceAllocatorNotify_iface; else if (IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorNotify9) && filter->mode == VMR9Mode_Renderless) *out = &filter->IVMRSurfaceAllocatorNotify9_iface;

1 0

Zebediah Figura : quartz/vmr9: Don't expose IVMRSurfaceAllocatorNotify9 from the VMR7.
by Alexandre Julliard 29 Apr '20

29 Apr '20

Module: wine Branch: master Commit: ab99701a7938640c3f437fe6bcb0146066a38cac URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab99701a7938640c3f437fe6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 28 17:44:44 2020 -0500 quartz/vmr9: Don't expose IVMRSurfaceAllocatorNotify9 from the VMR7. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 2 +- dlls/quartz/vmr9.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index f4b26db554..c242854659 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -300,7 +300,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IVMRMixerControl, FALSE); todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); - todo_wine check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); check_interface(filter, &IID_IVMRWindowlessControl, FALSE); check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index c847b9c448..aa125ddb89 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -629,7 +629,8 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, else if (IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorNotify) && filter->mode == (VMR9Mode)VMRMode_Renderless && !is_vmr9(filter)) *out = &filter->IVMRSurfaceAllocatorNotify_iface; - else if (IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorNotify9) && filter->mode == VMR9Mode_Renderless) + else if (IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorNotify9) + && filter->mode == VMR9Mode_Renderless && is_vmr9(filter)) *out = &filter->IVMRSurfaceAllocatorNotify9_iface; else if (IsEqualGUID(iid, &IID_IVMRWindowlessControl) && filter->mode == (VMR9Mode)VMRMode_Windowless) *out = &filter->IVMRWindowlessControl_iface;

1 0

Zebediah Figura : quartz/vmr9: Don't expose IVMRWindowlessControl from the VMR9.
by Alexandre Julliard 29 Apr '20

29 Apr '20

Module: wine Branch: master Commit: dd6a8d1daea7a290a396311606224130677f4df0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd6a8d1daea7a290a3963116… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 28 17:44:45 2020 -0500 quartz/vmr9: Don't expose IVMRWindowlessControl from the VMR9. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/vmr9.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 4bba6f7431..442145ac6a 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -271,7 +271,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IVMRMixerControl, FALSE); check_interface(filter, &IID_IVMRMixerControl9, FALSE); todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); - todo_wine check_interface(filter, &IID_IVMRWindowlessControl, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl, FALSE); IBaseFilter_FindPin(filter, L"VMR Input0", &pin); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index aa125ddb89..ea19977de4 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -632,7 +632,8 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, else if (IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorNotify9) && filter->mode == VMR9Mode_Renderless && is_vmr9(filter)) *out = &filter->IVMRSurfaceAllocatorNotify9_iface; - else if (IsEqualGUID(iid, &IID_IVMRWindowlessControl) && filter->mode == (VMR9Mode)VMRMode_Windowless) + else if (IsEqualGUID(iid, &IID_IVMRWindowlessControl) + && filter->mode == (VMR9Mode)VMRMode_Windowless && !is_vmr9(filter)) *out = &filter->IVMRWindowlessControl_iface; else if (IsEqualGUID(iid, &IID_IVMRWindowlessControl9) && filter->mode == VMR9Mode_Windowless) *out = &filter->IVMRWindowlessControl9_iface;

1 0

Zebediah Figura : quartz/vmr9: Don't expose IVMRWindowlessControl9 from the VMR7.
by Alexandre Julliard 29 Apr '20

29 Apr '20

Module: wine Branch: master Commit: a0b6c65df8424eedcfc3f58332a95879d324bd86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0b6c65df8424eedcfc3f583… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 28 17:44:46 2020 -0500 quartz/vmr9: Don't expose IVMRWindowlessControl9 from the VMR7. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 2 +- dlls/quartz/vmr9.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index c242854659..26324a36b1 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -273,7 +273,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IVMRMixerControl, FALSE); check_interface(filter, &IID_IVMRMixerControl9, FALSE); todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); - todo_wine check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); IBaseFilter_FindPin(filter, L"VMR Input0", &pin); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index ea19977de4..771e90050d 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -635,7 +635,8 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, else if (IsEqualGUID(iid, &IID_IVMRWindowlessControl) && filter->mode == (VMR9Mode)VMRMode_Windowless && !is_vmr9(filter)) *out = &filter->IVMRWindowlessControl_iface; - else if (IsEqualGUID(iid, &IID_IVMRWindowlessControl9) && filter->mode == VMR9Mode_Windowless) + else if (IsEqualGUID(iid, &IID_IVMRWindowlessControl9) + && filter->mode == VMR9Mode_Windowless && is_vmr9(filter)) *out = &filter->IVMRWindowlessControl9_iface; else return E_NOINTERFACE;

1 0