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

[PATCH v4 2/2] ddraw: Allow to create managed textures with DDSCAPS_TEXTURE|DDSCAPS_3DDEVICE caps.
by Akihiro Sagawa April 2, 2020

April 2, 2020

In v4, nothing new (resend). In v3, add ddraw4 tests, too. In v2, revise commit message. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48844 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ddraw/surface.c | 1 + dlls/ddraw/tests/ddraw4.c | 2 -- dlls/ddraw/tests/ddraw7.c | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-)

2 1

[PATCH v4 1/2] ddraw/tests: Add more managed texture tests.
by Akihiro Sagawa April 2, 2020

April 2, 2020

In v4, fix expected value in ddraw4 tests. In v3, add ddraw4 tests, too. In v2, add render target tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ddraw/tests/ddraw4.c | 73 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 73 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 142 insertions(+), 4 deletions(-)

2 1

[PATCH 9/9] d3d9: Introduce helpers to convert between d3d9 and wined3d query types.
by Henri Verbeet April 2, 2020

April 2, 2020

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/query.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index e9180fb481f..207ad55e5a1 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -24,6 +24,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); +static D3DQUERYTYPE d3dquerytype_from_wined3d(enum wined3d_query_type type) +{ + return (D3DQUERYTYPE)type; +} + +static enum wined3d_query_type wined3d_query_type_from_d3d(D3DQUERYTYPE type) +{ + return (enum wined3d_query_type)type; +} + static inline struct d3d9_query *impl_from_IDirect3DQuery9(IDirect3DQuery9 *iface) { return CONTAINING_RECORD(iface, struct d3d9_query, IDirect3DQuery9_iface); @@ -98,7 +108,7 @@ static D3DQUERYTYPE WINAPI d3d9_query_GetType(IDirect3DQuery9 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - type = wined3d_query_get_type(query->wined3d_query); + type = d3dquerytype_from_wined3d(wined3d_query_get_type(query->wined3d_query)); wined3d_mutex_unlock(); return type; @@ -198,7 +208,7 @@ HRESULT query_init(struct d3d9_query *query, struct d3d9_device *device, D3DQUER query->refcount = 1; wined3d_mutex_lock(); - if (FAILED(hr = wined3d_query_create(device->wined3d_device, type, + if (FAILED(hr = wined3d_query_create(device->wined3d_device, wined3d_query_type_from_d3d(type), query, &d3d9_null_wined3d_parent_ops, &query->wined3d_query))) { wined3d_mutex_unlock(); -- 2.20.1

1 0

[PATCH 8/9] d3d9: Introduce a helper to convert d3d9 primitive types to wined3d types.
by Henri Verbeet April 2, 2020

April 2, 2020

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 07fb906e85d..2693b94ce71 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -571,6 +571,11 @@ static enum wined3d_sampler_state wined3d_sampler_state_from_d3d(D3DSAMPLERSTATE return (enum wined3d_sampler_state)type; } +static enum wined3d_primitive_type wined3d_primitive_type_from_d3d(D3DPRIMITIVETYPE type) +{ + return (enum wined3d_primitive_type)type; +} + static void device_reset_viewport_state(struct d3d9_device *device) { struct wined3d_viewport vp; @@ -3010,7 +3015,7 @@ static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface, vertex_count = vertex_count_from_primitive_count(primitive_type, primitive_count); d3d9_device_upload_sysmem_vertex_buffers(device, 0, start_vertex, vertex_count); d3d9_generate_auto_mipmaps(device); - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); hr = wined3d_device_draw_primitive(device->wined3d_device, start_vertex, vertex_count); if (SUCCEEDED(hr)) d3d9_rts_flag_auto_gen_mipmap(device); @@ -3044,7 +3049,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface d3d9_device_upload_sysmem_index_buffer(device, start_idx, index_count); d3d9_generate_auto_mipmaps(device); wined3d_stateblock_set_base_vertex_index(device->state, base_vertex_idx); - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx, index_count); if (SUCCEEDED(hr)) @@ -3153,7 +3158,7 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, goto done; d3d9_generate_auto_mipmaps(device); - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / stride, vtx_count); wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); @@ -3297,7 +3302,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa wined3d_stateblock_set_base_vertex_index(device->state, vb_pos / vertex_stride - min_vertex_idx); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count); wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); -- 2.20.1

1 0

[PATCH 7/9] d3d9: Introduce a helper to convert d3d9 sampler states to wined3d states.
by Henri Verbeet April 2, 2020

April 2, 2020

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 511496edd18..07fb906e85d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -566,6 +566,11 @@ static enum wined3d_render_state wined3d_render_state_from_d3d(D3DRENDERSTATETYP return (enum wined3d_render_state)type; } +static enum wined3d_sampler_state wined3d_sampler_state_from_d3d(D3DSAMPLERSTATETYPE type) +{ + return (enum wined3d_sampler_state)type; +} + static void device_reset_viewport_state(struct d3d9_device *device) { struct wined3d_viewport vp; @@ -2755,7 +2760,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetSamplerState(IDirect3DDev sampler -= D3DVERTEXTEXTURESAMPLER0 - WINED3D_VERTEX_SAMPLER_OFFSET; wined3d_mutex_lock(); - wined3d_stateblock_set_sampler_state(device->update_state, sampler, state, value); + wined3d_stateblock_set_sampler_state(device->update_state, sampler, wined3d_sampler_state_from_d3d(state), value); wined3d_mutex_unlock(); return D3D_OK; -- 2.20.1

1 0

[PATCH 6/9] d3d9: Introduce a helper to convert d3d9 render states to wined3d states.
by Henri Verbeet April 2, 2020

April 2, 2020

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 17d643a53c7..511496edd18 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -561,6 +561,11 @@ static enum wined3d_transform_state wined3d_transform_state_from_d3d(D3DTRANSFOR return (enum wined3d_transform_state)type; } +static enum wined3d_render_state wined3d_render_state_from_d3d(D3DRENDERSTATETYPE type) +{ + return (enum wined3d_render_state)type; +} + static void device_reset_viewport_state(struct d3d9_device *device) { struct wined3d_viewport vp; @@ -2404,7 +2409,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetRenderState(IDirect3DDevi TRACE("iface %p, state %#x, value %#x.\n", iface, state, value); wined3d_mutex_lock(); - wined3d_stateblock_set_render_state(device->update_state, state, value); + wined3d_stateblock_set_render_state(device->update_state, wined3d_render_state_from_d3d(state), value); if (state == D3DRS_POINTSIZE && value == D3D9_RESZ_CODE) resolve_depth_buffer(device); wined3d_mutex_unlock(); -- 2.20.1

1 0

[PATCH 5/9] d3d9: Introduce a helper to convert d3d9 transform states to wined3d states.
by Henri Verbeet April 2, 2020

April 2, 2020

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 434ec8fb8f9..17d643a53c7 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -556,6 +556,11 @@ static enum wined3d_texture_filter_type wined3d_texture_filter_type_from_d3d(D3D return (enum wined3d_texture_filter_type)type; } +static enum wined3d_transform_state wined3d_transform_state_from_d3d(D3DTRANSFORMSTATETYPE type) +{ + return (enum wined3d_transform_state)type; +} + static void device_reset_viewport_state(struct d3d9_device *device) { struct wined3d_viewport vp; @@ -2164,7 +2169,8 @@ static HRESULT WINAPI d3d9_device_SetTransform(IDirect3DDevice9Ex *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - wined3d_stateblock_set_transform(device->update_state, state, (const struct wined3d_matrix *)matrix); + wined3d_stateblock_set_transform(device->update_state, + wined3d_transform_state_from_d3d(state), (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); return D3D_OK; @@ -2194,7 +2200,8 @@ static HRESULT WINAPI d3d9_device_MultiplyTransform(IDirect3DDevice9Ex *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - wined3d_stateblock_multiply_transform(device->state, state, (const struct wined3d_matrix *)matrix); + wined3d_stateblock_multiply_transform(device->state, + wined3d_transform_state_from_d3d(state), (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); return D3D_OK; -- 2.20.1

1 0

[PATCH 4/9] d3d9: Introduce a helper to convert d3d9 texture filter types to wined3d types.
by Henri Verbeet April 2, 2020

April 2, 2020

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 993311e1124..434ec8fb8f9 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -551,6 +551,11 @@ void d3d9_caps_from_wined3dcaps(const struct d3d9 *d3d9, unsigned int adapter_or } } +static enum wined3d_texture_filter_type wined3d_texture_filter_type_from_d3d(D3DTEXTUREFILTERTYPE type) +{ + return (enum wined3d_texture_filter_type)type; +} + static void device_reset_viewport_state(struct d3d9_device *device) { struct wined3d_viewport vp; @@ -1829,8 +1834,8 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect } } - hr = wined3d_texture_blt(dst->wined3d_texture, dst->sub_resource_idx, dst_rect, - src->wined3d_texture, src->sub_resource_idx, src_rect, 0, NULL, filter); + hr = wined3d_texture_blt(dst->wined3d_texture, dst->sub_resource_idx, dst_rect, src->wined3d_texture, + src->sub_resource_idx, src_rect, 0, NULL, wined3d_texture_filter_type_from_d3d(filter)); if (hr == WINEDDERR_INVALIDRECT) hr = D3DERR_INVALIDCALL; if (SUCCEEDED(hr) && dst->texture) -- 2.20.1

1 0

[PATCH 3/9] d3d9: Introduce a helper to convert d3d9 device types to wined3d types.
by Henri Verbeet April 2, 2020

April 2, 2020

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/d3d9_private.h | 5 +++++ dlls/d3d9/device.c | 4 ++-- dlls/d3d9/directx.c | 21 +++++++++++---------- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index f9150384a33..e78ce75a2f0 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -399,6 +399,11 @@ static inline enum wined3d_multisample_type wined3d_multisample_type_from_d3d(D3 return (enum wined3d_multisample_type)type; } +static inline enum wined3d_device_type wined3d_device_type_from_d3d(D3DDEVTYPE type) +{ + return (enum wined3d_device_type)type; +} + static inline enum wined3d_scanline_ordering wined3d_scanline_ordering_from_d3d(D3DSCANLINEORDERING ordering) { return (enum wined3d_scanline_ordering)ordering; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index eb204ca088f..993311e1124 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -4681,7 +4681,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine wined3d_mutex_lock(); wined3d_adapter = wined3d_output_get_adapter(parent->wined3d_outputs[output_idx]); - if (FAILED(hr = wined3d_device_create(wined3d, wined3d_adapter, device_type, + if (FAILED(hr = wined3d_device_create(wined3d, wined3d_adapter, wined3d_device_type_from_d3d(device_type), focus_window, flags, 4, feature_levels, ARRAY_SIZE(feature_levels), &device->device_parent, &device->wined3d_device))) { @@ -4690,7 +4690,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine return hr; } - wined3d_get_device_caps(wined3d_adapter, device_type, &wined3d_caps); + wined3d_get_device_caps(wined3d_adapter, wined3d_device_type_from_d3d(device_type), &wined3d_caps); d3d9_caps_from_wined3dcaps(parent, adapter, &caps, &wined3d_caps); device->max_user_clip_planes = caps.MaxUserClipPlanes; device->vs_uniform_count = caps.MaxVertexShaderConst; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 41065796dd4..e176483f43e 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -268,8 +268,8 @@ static HRESULT WINAPI d3d9_CheckDeviceType(IDirect3D9Ex *iface, UINT adapter, D3 return WINED3DERR_NOTAVAILABLE; wined3d_mutex_lock(); - hr = wined3d_check_device_type(d3d9->wined3d, d3d9->wined3d_outputs[output_idx], device_type, - wined3dformat_from_d3dformat(display_format), + hr = wined3d_check_device_type(d3d9->wined3d, d3d9->wined3d_outputs[output_idx], + wined3d_device_type_from_d3d(device_type), wined3dformat_from_d3dformat(display_format), wined3dformat_from_d3dformat(backbuffer_format), windowed); wined3d_mutex_unlock(); @@ -334,13 +334,13 @@ static HRESULT WINAPI d3d9_CheckDeviceFormat(IDirect3D9Ex *iface, UINT adapter, { DWORD levels; - hr = wined3d_check_device_multisample_type(wined3d_adapter, device_type, + hr = wined3d_check_device_multisample_type(wined3d_adapter, wined3d_device_type_from_d3d(device_type), WINED3DFMT_D24_UNORM_S8_UINT, FALSE, WINED3D_MULTISAMPLE_NON_MASKABLE, &levels); if (SUCCEEDED(hr) && !levels) hr = D3DERR_NOTAVAILABLE; } else - hr = wined3d_check_device_format(d3d9->wined3d, wined3d_adapter, device_type, + hr = wined3d_check_device_format(d3d9->wined3d, wined3d_adapter, wined3d_device_type_from_d3d(device_type), wined3dformat_from_d3dformat(adapter_format), usage, bind_flags, wined3d_rtype, wined3dformat_from_d3dformat(format)); wined3d_mutex_unlock(); @@ -368,7 +368,8 @@ static HRESULT WINAPI d3d9_CheckDeviceMultiSampleType(IDirect3D9Ex *iface, UINT wined3d_mutex_lock(); wined3d_adapter = wined3d_output_get_adapter(d3d9->wined3d_outputs[output_idx]); - hr = wined3d_check_device_multisample_type(wined3d_adapter, device_type, wined3dformat_from_d3dformat(format), + hr = wined3d_check_device_multisample_type(wined3d_adapter, + wined3d_device_type_from_d3d(device_type), wined3dformat_from_d3dformat(format), windowed, wined3d_multisample_type_from_d3d(multisample_type), levels); wined3d_mutex_unlock(); if (hr == WINED3DERR_NOTAVAILABLE && levels) @@ -394,9 +395,9 @@ static HRESULT WINAPI d3d9_CheckDepthStencilMatch(IDirect3D9Ex *iface, UINT adap wined3d_mutex_lock(); wined3d_adapter = wined3d_output_get_adapter(d3d9->wined3d_outputs[output_idx]); - hr = wined3d_check_depth_stencil_match(wined3d_adapter, device_type, - wined3dformat_from_d3dformat(adapter_format), wined3dformat_from_d3dformat(rt_format), - wined3dformat_from_d3dformat(ds_format)); + hr = wined3d_check_depth_stencil_match(wined3d_adapter, + wined3d_device_type_from_d3d(device_type), wined3dformat_from_d3dformat(adapter_format), + wined3dformat_from_d3dformat(rt_format), wined3dformat_from_d3dformat(ds_format)); wined3d_mutex_unlock(); return hr; @@ -418,7 +419,7 @@ static HRESULT WINAPI d3d9_CheckDeviceFormatConversion(IDirect3D9Ex *iface, UINT wined3d_mutex_lock(); hr = wined3d_check_device_format_conversion(d3d9->wined3d_outputs[output_idx], - device_type, wined3dformat_from_d3dformat(src_format), + wined3d_device_type_from_d3d(device_type), wined3dformat_from_d3dformat(src_format), wined3dformat_from_d3dformat(dst_format)); wined3d_mutex_unlock(); @@ -446,7 +447,7 @@ static HRESULT WINAPI d3d9_GetDeviceCaps(IDirect3D9Ex *iface, UINT adapter, D3DD wined3d_mutex_lock(); wined3d_adapter = wined3d_output_get_adapter(d3d9->wined3d_outputs[output_idx]); - hr = wined3d_get_device_caps(wined3d_adapter, device_type, &wined3d_caps); + hr = wined3d_get_device_caps(wined3d_adapter, wined3d_device_type_from_d3d(device_type), &wined3d_caps); wined3d_mutex_unlock(); d3d9_caps_from_wined3dcaps(d3d9, adapter, caps, &wined3d_caps); -- 2.20.1

1 0

[PATCH 2/9] d3d9: Introduce helpers to convert between d3d9 and wined3d scanline ordering types.
by Henri Verbeet April 2, 2020

April 2, 2020

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/d3d9_private.h | 10 ++++++++++ dlls/d3d9/device.c | 4 ++-- dlls/d3d9/directx.c | 11 +++++------ dlls/d3d9/swapchain.c | 2 +- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 0d7ab0172a2..f9150384a33 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -341,6 +341,11 @@ static inline D3DMULTISAMPLE_TYPE d3dmultisample_type_from_wined3d(enum wined3d_ return (D3DMULTISAMPLE_TYPE)type; } +static inline D3DSCANLINEORDERING d3dscanlineordering_from_wined3d(enum wined3d_scanline_ordering ordering) +{ + return (D3DSCANLINEORDERING)ordering; +} + static inline unsigned int map_access_from_usage(unsigned int usage) { if (usage & D3DUSAGE_WRITEONLY) @@ -394,4 +399,9 @@ static inline enum wined3d_multisample_type wined3d_multisample_type_from_d3d(D3 return (enum wined3d_multisample_type)type; } +static inline enum wined3d_scanline_ordering wined3d_scanline_ordering_from_d3d(D3DSCANLINEORDERING ordering) +{ + return (enum wined3d_scanline_ordering)ordering; +} + #endif /* __WINE_D3D9_PRIVATE_H */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 3f81f1474aa..eb204ca088f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1030,7 +1030,7 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, wined3d_mode.height = mode->Height; wined3d_mode.refresh_rate = mode->RefreshRate; wined3d_mode.format_id = wined3dformat_from_d3dformat(mode->Format); - wined3d_mode.scanline_ordering = mode->ScanLineOrdering; + wined3d_mode.scanline_ordering = wined3d_scanline_ordering_from_d3d(mode->ScanLineOrdering); } if (!wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters, extended)) @@ -4370,7 +4370,7 @@ static HRESULT WINAPI d3d9_device_GetDisplayModeEx(IDirect3DDevice9Ex *iface, mode->Height = wined3d_mode.height; mode->RefreshRate = wined3d_mode.refresh_rate; mode->Format = d3dformat_from_wined3dformat(wined3d_mode.format_id); - mode->ScanLineOrdering = wined3d_mode.scanline_ordering; + mode->ScanLineOrdering = d3dscanlineordering_from_wined3d(wined3d_mode.scanline_ordering); } return hr; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 6a1745ee1cb..41065796dd4 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -525,7 +525,7 @@ static UINT WINAPI d3d9_GetAdapterModeCountEx(IDirect3D9Ex *iface, wined3d_mutex_lock(); count = wined3d_output_get_mode_count(d3d9->wined3d_outputs[output_idx], - wined3dformat_from_d3dformat(filter->Format), filter->ScanLineOrdering); + wined3dformat_from_d3dformat(filter->Format), wined3d_scanline_ordering_from_d3d(filter->ScanLineOrdering)); wined3d_mutex_unlock(); return count; @@ -550,9 +550,8 @@ static HRESULT WINAPI d3d9_EnumAdapterModesEx(IDirect3D9Ex *iface, return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - hr = wined3d_output_get_mode(d3d9->wined3d_outputs[output_idx], - wined3dformat_from_d3dformat(filter->Format), filter->ScanLineOrdering, mode_idx, - &wined3d_mode); + hr = wined3d_output_get_mode(d3d9->wined3d_outputs[output_idx], wined3dformat_from_d3dformat(filter->Format), + wined3d_scanline_ordering_from_d3d(filter->ScanLineOrdering), mode_idx, &wined3d_mode); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) @@ -561,7 +560,7 @@ static HRESULT WINAPI d3d9_EnumAdapterModesEx(IDirect3D9Ex *iface, mode->Height = wined3d_mode.height; mode->RefreshRate = wined3d_mode.refresh_rate; mode->Format = d3dformat_from_wined3dformat(wined3d_mode.format_id); - mode->ScanLineOrdering = wined3d_mode.scanline_ordering; + mode->ScanLineOrdering = d3dscanlineordering_from_wined3d(wined3d_mode.scanline_ordering); } return hr; @@ -596,7 +595,7 @@ static HRESULT WINAPI d3d9_GetAdapterDisplayModeEx(IDirect3D9Ex *iface, mode->Height = wined3d_mode.height; mode->RefreshRate = wined3d_mode.refresh_rate; mode->Format = d3dformat_from_wined3dformat(wined3d_mode.format_id); - mode->ScanLineOrdering = wined3d_mode.scanline_ordering; + mode->ScanLineOrdering = d3dscanlineordering_from_wined3d(wined3d_mode.scanline_ordering); } return hr; diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index be9c55ac3ef..8d6cff982d3 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -320,7 +320,7 @@ static HRESULT WINAPI d3d9_swapchain_GetDisplayModeEx(IDirect3DSwapChain9Ex *ifa mode->Height = wined3d_mode.height; mode->RefreshRate = wined3d_mode.refresh_rate; mode->Format = d3dformat_from_wined3dformat(wined3d_mode.format_id); - mode->ScanLineOrdering = wined3d_mode.scanline_ordering; + mode->ScanLineOrdering = d3dscanlineordering_from_wined3d(wined3d_mode.scanline_ordering); } return hr; -- 2.20.1

1 0