- Wine-Devel - list.winehq.org

[PATCH 1/7] mshtml: Initialize DOMRange object with compat mode.
by Jacek Caban March 16, 2021

March 16, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/range.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH v2] windowscodecs: Add stub implementation for DDS encoder.
by Ziqing Hui March 16, 2021

March 16, 2021

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: * Get rid of encoder_info. * Use FIXME in QueryInterface. dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/ddsformat.c | 198 ++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 1 + dlls/windowscodecs/windowscodecs_wincodec.idl | 7 + 4 files changed, 207 insertions(+)

2 1

[PATCH] mscoree: Remove redundant NULL check before HeapFree()
by Michael Stefaniuc March 16, 2021

March 16, 2021

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mscoree/metahost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 907d8af9791..acefb2887ca 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1809,7 +1809,7 @@ static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname TRACE("skipping Windows GAC search due to override setting\n"); done: - if (cultureW) HeapFree(GetProcessHeap(), 0, cultureW); + HeapFree(GetProcessHeap(), 0, cultureW); mono_free(stringname); return result; -- 2.26.2

2 1

[PATCH] include: Include x86intrin.h in msvcrt/intrin.h.
by Rémi Bernon March 16, 2021

March 16, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes: 201370 AFAIU x86intrin.h is a GCC/Clang specific header, but I think __i386__ and __x86_64__ are too so we don't need _MSC_VER guard here? But the same seems to be true for __arm__ so I'm not sure why there's such guard around __dmb intrinsics below. I'm not resending the previous patches (201367-201369,201372) because they should be quite independent, and would also make Marvin do a full build again. I'm interested to know if there's anything to fix on them. Patch 201371 has some rounding errors that I will fix. include/msvcrt/intrin.h | 4 ++++ include/msvcrt/stdlib.h | 8 ++++++++ tools/makedep.c | 1 + 3 files changed, 13 insertions(+) diff --git a/include/msvcrt/intrin.h b/include/msvcrt/intrin.h index 781c6fac823..8b84929bc02 100644 --- a/include/msvcrt/intrin.h +++ b/include/msvcrt/intrin.h @@ -7,6 +7,10 @@ #ifndef _INC_INTRIN #define _INC_INTRIN +#if defined(__i386__) || defined(__x86_64__) +# include <x86intrin.h> +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index ed6560bc318..287e4030669 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -164,15 +164,23 @@ _ACRTIMP char* __cdecl _itoa(int,char*,int); _ACRTIMP errno_t __cdecl _itoa_s(int,char*,size_t,int); _ACRTIMP char* __cdecl _ltoa(__msvcrt_long,char*,int); _ACRTIMP errno_t __cdecl _ltoa_s(__msvcrt_long, char*, size_t, int); +#ifndef _lrotl _ACRTIMP __msvcrt_ulong __cdecl _lrotl(__msvcrt_ulong,int); +#endif +#ifndef _lrotr _ACRTIMP __msvcrt_ulong __cdecl _lrotr(__msvcrt_ulong,int); +#endif _ACRTIMP void __cdecl _makepath(char*,const char*,const char*,const char*,const char*); _ACRTIMP int __cdecl _makepath_s(char*,size_t,const char*,const char*,const char*,const char*); _ACRTIMP size_t __cdecl _mbstrlen(const char*); _ACRTIMP _onexit_t __cdecl _onexit(_onexit_t); _ACRTIMP int __cdecl _putenv(const char*); +#ifndef _rotl _ACRTIMP unsigned int __cdecl _rotl(unsigned int,int); +#endif +#ifndef _rotr _ACRTIMP unsigned int __cdecl _rotr(unsigned int,int); +#endif _ACRTIMP void __cdecl _searchenv(const char*,const char*,char*); _ACRTIMP int __cdecl _set_error_mode(int); _ACRTIMP void __cdecl _seterrormode(int); diff --git a/tools/makedep.c b/tools/makedep.c index 913854c7f05..8245a324279 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1570,6 +1570,7 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ if (pFile->type == INCL_SYSTEM && pFile->use_msvcrt) { if (!strcmp( pFile->name, "stdarg.h" )) return NULL; + if (!strcmp( pFile->name, "x86intrin.h" )) return NULL; fprintf( stderr, "%s:%d: error: system header %s cannot be used with msvcrt\n", pFile->included_by->file->name, pFile->included_line, pFile->name ); exit(1); -- 2.30.2

2 3

[PATCH 3/5] d3d11: Store the feature level in the d3d_device_context_state structure.
by Henri Verbeet March 16, 2021

March 16, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/buffer.c | 2 +- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/device.c | 36 ++++++++++++++++++++---------------- dlls/d3d11/shader.c | 8 ++++---- dlls/d3d11/texture.c | 2 +- 5 files changed, 27 insertions(+), 23 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index b33be57d439..09d495c3f61 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -443,7 +443,7 @@ static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *dev buffer->refcount = 1; buffer->desc = *desc; - if (!validate_buffer_desc(&buffer->desc, device->feature_level)) + if (!validate_buffer_desc(&buffer->desc, device->state->feature_level)) return E_INVALIDARG; wined3d_desc.byte_width = buffer->desc.ByteWidth; diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 5a812e1b254..7f050f5af6f 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -529,6 +529,7 @@ struct d3d_device_context_state LONG refcount, private_refcount; struct wined3d_private_store private_store; + D3D_FEATURE_LEVEL feature_level; GUID emulated_interface; struct d3d_device_context_state_entry *entries; @@ -562,7 +563,6 @@ struct d3d_device IUnknown *outer_unk; LONG refcount; - D3D_FEATURE_LEVEL feature_level; BOOL d3d11_only; struct d3d_device_context_state *state; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 16a1027beb9..8453419cf52 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -62,6 +62,11 @@ static inline BOOL d3d_device_is_d3d10_active(struct d3d_device *device) || IsEqualGUID(&device->state->emulated_interface, &IID_ID3D10Device1); } +static D3D_FEATURE_LEVEL d3d_feature_level_from_wined3d(enum wined3d_feature_level level) +{ + return (D3D_FEATURE_LEVEL)level; +} + /* ID3DDeviceContextState methods */ static inline struct d3d_device_context_state *impl_from_ID3DDeviceContextState(ID3DDeviceContextState *iface) @@ -296,7 +301,7 @@ static struct wined3d_state *d3d_device_context_state_get_wined3d_state(struct d return entry->wined3d_state; if (FAILED(wined3d_state_create(device->wined3d_device, - (enum wined3d_feature_level *)&device->feature_level, 1, &wined3d_state))) + (enum wined3d_feature_level *)&state->feature_level, 1, &wined3d_state))) return NULL; if (!d3d_device_context_state_add_entry(state, device, wined3d_state)) @@ -308,14 +313,15 @@ static struct wined3d_state *d3d_device_context_state_get_wined3d_state(struct d return wined3d_state; } -static void d3d_device_context_state_init(struct d3d_device_context_state *state, struct d3d_device *device, - REFIID emulated_interface) +static void d3d_device_context_state_init(struct d3d_device_context_state *state, + struct d3d_device *device, D3D_FEATURE_LEVEL feature_level, REFIID emulated_interface) { state->ID3DDeviceContextState_iface.lpVtbl = &d3d_device_context_state_vtbl; state->refcount = state->private_refcount = 0; wined3d_private_store_init(&state->private_store); + state->feature_level = feature_level; state->emulated_interface = *emulated_interface; wined3d_device_incref(state->wined3d_device = device->wined3d_device); state->device = &device->ID3D11Device2_iface; @@ -3651,7 +3657,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * *format_support = 0; wined3d_mutex_lock(); - feature_level = device->feature_level; + feature_level = device->state->feature_level; wined3d = wined3d_device_get_wined3d(device->wined3d_device); wined3d_device_get_creation_parameters(device->wined3d_device, &params); wined3d_adapter = wined3d_get_adapter(wined3d, params.adapter_idx); @@ -3984,7 +3990,7 @@ static D3D_FEATURE_LEVEL STDMETHODCALLTYPE d3d11_device_GetFeatureLevel(ID3D11De TRACE("iface %p.\n", iface); - return device->feature_level; + return device->state->feature_level; } static UINT STDMETHODCALLTYPE d3d11_device_GetCreationFlags(ID3D11Device2 *iface) @@ -4067,6 +4073,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Dev { struct d3d_device *device = impl_from_ID3D11Device2(iface); struct d3d_device_context_state *state_impl; + D3D_FEATURE_LEVEL feature_level; HRESULT hr = E_INVALIDARG; FIXME("iface %p, flags %#x, feature_levels %p, feature_level_count %u, sdk_version %u, " @@ -4088,7 +4095,9 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Dev goto fail; } - d3d_device_context_state_init(state_impl, device, emulated_interface); + feature_level = d3d_feature_level_from_wined3d(wined3d_state_get_feature_level( + wined3d_device_get_state(device->wined3d_device))); + d3d_device_context_state_init(state_impl, device, feature_level, emulated_interface); *state = &state_impl->ID3DDeviceContextState_iface; } @@ -6218,7 +6227,7 @@ static D3D10_FEATURE_LEVEL1 STDMETHODCALLTYPE d3d10_device_GetFeatureLevel(ID3D1 TRACE("iface %p.\n", iface); - return d3d10_feature_level1_from_d3d_feature_level(device->feature_level); + return d3d10_feature_level1_from_d3d_feature_level(device->state->feature_level); } static const struct ID3D10Device1Vtbl d3d10_device1_vtbl = @@ -6457,16 +6466,12 @@ static inline struct d3d_device *device_from_wined3d_device_parent(struct wined3 return CONTAINING_RECORD(device_parent, struct d3d_device, device_parent); } -static D3D_FEATURE_LEVEL d3d_feature_level_from_wined3d(enum wined3d_feature_level level) -{ - return (D3D_FEATURE_LEVEL)level; -} - static void CDECL device_parent_wined3d_device_created(struct wined3d_device_parent *device_parent, struct wined3d_device *wined3d_device) { struct d3d_device *device = device_from_wined3d_device_parent(device_parent); struct wined3d_state *wined3d_state; + D3D_FEATURE_LEVEL feature_level; ID3DDeviceContextState *state; HRESULT hr; @@ -6477,11 +6482,10 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par device->immediate_context.wined3d_context = wined3d_device_get_immediate_context(wined3d_device); wined3d_state = wined3d_device_get_state(device->wined3d_device); - device->feature_level = d3d_feature_level_from_wined3d(wined3d_state_get_feature_level(wined3d_state)); + feature_level = d3d_feature_level_from_wined3d(wined3d_state_get_feature_level(wined3d_state)); - if (FAILED(hr = d3d11_device_CreateDeviceContextState(&device->ID3D11Device2_iface, 0, &device->feature_level, - 1, D3D11_SDK_VERSION, device->d3d11_only ? &IID_ID3D11Device2 : &IID_ID3D10Device1, NULL, - &state))) + if (FAILED(hr = d3d11_device_CreateDeviceContextState(&device->ID3D11Device2_iface, 0, &feature_level, 1, + D3D11_SDK_VERSION, device->d3d11_only ? &IID_ID3D11Device2 : &IID_ID3D10Device1, NULL, &state))) { ERR("Failed to create the initial device context state, hr %#x.\n", hr); return; diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index d51d8e4e60b..0d19b74ff0b 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -1120,24 +1120,24 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, WARN("Invalid rasterizer stream %u.\n", rasterizer_stream); return E_INVALIDARG; } - if (device->feature_level < D3D_FEATURE_LEVEL_11_0) + if (device->state->feature_level < D3D_FEATURE_LEVEL_11_0) { if (rasterizer_stream) { WARN("Invalid rasterizer stream %u for feature level %#x.\n", - rasterizer_stream, device->feature_level); + rasterizer_stream, device->state->feature_level); return E_INVALIDARG; } if (buffer_stride_count && buffer_stride_count != 1) { WARN("Invalid buffer stride count %u for feature level %#x.\n", - buffer_stride_count, device->feature_level); + buffer_stride_count, device->state->feature_level); return E_INVALIDARG; } } if (FAILED(hr = validate_stream_output_entries(so_entries, so_entry_count, - buffer_strides, buffer_stride_count, device->feature_level))) + buffer_strides, buffer_stride_count, device->state->feature_level))) return hr; desc.byte_code = byte_code; diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 1682aa05d99..061bbb09795 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -987,7 +987,7 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE DWORD flags = 0; HRESULT hr; - if (!validate_texture2d_desc(desc, device->feature_level)) + if (!validate_texture2d_desc(desc, device->state->feature_level)) { WARN("Failed to validate texture desc.\n"); return E_INVALIDARG; -- 2.20.1

2 1

[PATCH 1/6] wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_viewports().
by Zebediah Figura March 16, 2021

March 16, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/cs.c | 8 ++++---- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 886a76284ff..d7a413057c9 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1147,18 +1147,18 @@ static void wined3d_cs_exec_set_viewports(struct wined3d_cs *cs, const void *dat device_invalidate_state(cs->c.device, STATE_VIEWPORT); } -void wined3d_cs_emit_set_viewports(struct wined3d_cs *cs, unsigned int viewport_count, +void wined3d_device_context_emit_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, const struct wined3d_viewport *viewports) { struct wined3d_cs_set_viewports *op; - op = wined3d_device_context_require_space(&cs->c, FIELD_OFFSET(struct wined3d_cs_set_viewports, viewports[viewport_count]), - WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, + FIELD_OFFSET(struct wined3d_cs_set_viewports,viewports[viewport_count]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_VIEWPORTS; memcpy(op->viewports, viewports, viewport_count * sizeof(*viewports)); op->viewport_count = viewport_count; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_scissor_rects(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ca179c753ab..62a3e990cf1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1698,7 +1698,7 @@ void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned memset(state->viewports, 0, sizeof(state->viewports)); state->viewport_count = viewport_count; - wined3d_cs_emit_set_viewports(device->cs, viewport_count, viewports); + wined3d_device_context_emit_set_viewports(&device->cs->c, viewport_count, viewports); } void CDECL wined3d_device_get_viewports(const struct wined3d_device *device, unsigned int *viewport_count, @@ -1983,7 +1983,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 wined3d_cs_emit_set_material(device->cs, &state->material); - wined3d_cs_emit_set_viewports(device->cs, state->viewport_count, state->viewports); + wined3d_device_context_emit_set_viewports(context, state->viewport_count, state->viewports); wined3d_cs_emit_set_scissor_rects(device->cs, state->scissor_rect_count, state->scissor_rects); for (i = 0; i < LIGHTMAP_SIZE; ++i) @@ -5191,7 +5191,7 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device state->viewports[0].min_z = 0.0f; state->viewports[0].max_z = 1.0f; state->viewport_count = 1; - wined3d_cs_emit_set_viewports(device->cs, 1, state->viewports); + wined3d_device_context_emit_set_viewports(&device->cs->c, 1, state->viewports); SetRect(&state->scissor_rects[0], 0, 0, view->width, view->height); state->scissor_rect_count = 1; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a8947f444cd..524b6ae7ce3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4793,7 +4793,6 @@ void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined unsigned int initial_count) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_viewports(struct wined3d_cs *cs, unsigned int viewport_count, const struct wined3d_viewport *viewports) DECLSPEC_HIDDEN; void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, @@ -4827,6 +4826,8 @@ void wined3d_device_context_emit_set_rasterizer_state(struct wined3d_device_cont struct wined3d_rasterizer_state *rasterizer_state) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type, struct wined3d_shader *shader) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, + const struct wined3d_viewport *viewports) DECLSPEC_HIDDEN; static inline void wined3d_resource_wait_idle(struct wined3d_resource *resource) { -- 2.20.1

2 11

[PATCH 5/5] d3d11: Replace the FIXME in d3d11_immediate_context_SwapDeviceContextState() with a TRACE.
by Henri Verbeet March 16, 2021

March 16, 2021

This is implemented. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c938e0df883..e053cf1c0a5 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2844,7 +2844,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_SwapDeviceContextState(ID3 struct d3d_device_context_state *state_impl, *prev_impl; struct wined3d_state *wined3d_state; - FIXME("iface %p, state %p, prev %p semi-stub!\n", iface, state, prev); + TRACE("iface %p, state %p, prev %p.\n", iface, state, prev); if (!state) { -- 2.20.1

1 0

[PATCH 4/5] d3d11: Use the supplied feature levels in d3d11_device_CreateDeviceContextState().
by Henri Verbeet March 16, 2021

March 16, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/device.c | 76 +++++++++++++++++++++++++++++---------------- 1 file changed, 50 insertions(+), 26 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8453419cf52..c938e0df883 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4073,39 +4073,62 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Dev { struct d3d_device *device = impl_from_ID3D11Device2(iface); struct d3d_device_context_state *state_impl; + struct wined3d_state *wined3d_state; D3D_FEATURE_LEVEL feature_level; HRESULT hr = E_INVALIDARG; - FIXME("iface %p, flags %#x, feature_levels %p, feature_level_count %u, sdk_version %u, " - "emulated_interface %s, chosen_feature_level %p, state %p semi-stub!\n", - iface, flags, feature_levels, feature_level_count, sdk_version, - debugstr_guid(emulated_interface), chosen_feature_level, state); + TRACE("iface %p, flags %#x, feature_levels %p, feature_level_count %u, " + "sdk_version %u, emulated_interface %s, chosen_feature_level %p, state %p.\n", + iface, flags, feature_levels, feature_level_count, + sdk_version, debugstr_guid(emulated_interface), chosen_feature_level, state); + + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + wined3d_mutex_lock(); if (!feature_level_count) goto fail; + if (FAILED(hr = wined3d_state_create(device->wined3d_device, + (const enum wined3d_feature_level *)feature_levels, feature_level_count, &wined3d_state))) + goto fail; + feature_level = d3d_feature_level_from_wined3d(wined3d_state_get_feature_level(wined3d_state)); + if (chosen_feature_level) - FIXME("Device context state feature level not implemented yet.\n"); + *chosen_feature_level = feature_level; - if (state) + if (!state) { - if (!(state_impl = heap_alloc_zero(sizeof(*state_impl)))) - { - hr = E_OUTOFMEMORY; - goto fail; - } + wined3d_state_destroy(wined3d_state); + wined3d_mutex_unlock(); + return S_FALSE; + } - feature_level = d3d_feature_level_from_wined3d(wined3d_state_get_feature_level( - wined3d_device_get_state(device->wined3d_device))); - d3d_device_context_state_init(state_impl, device, feature_level, emulated_interface); - *state = &state_impl->ID3DDeviceContextState_iface; + if (!(state_impl = heap_alloc_zero(sizeof(*state_impl)))) + { + wined3d_state_destroy(wined3d_state); + hr = E_OUTOFMEMORY; + goto fail; + } + + d3d_device_context_state_init(state_impl, device, feature_level, emulated_interface); + if (!d3d_device_context_state_add_entry(state_impl, device, wined3d_state)) + { + wined3d_state_destroy(wined3d_state); + ID3DDeviceContextState_Release(&state_impl->ID3DDeviceContextState_iface); + hr = E_FAIL; + goto fail; } + *state = &state_impl->ID3DDeviceContextState_iface; device->d3d11_only = FALSE; - if (chosen_feature_level) *chosen_feature_level = ID3D11Device2_GetFeatureLevel(iface); - return state ? S_OK : S_FALSE; + wined3d_mutex_unlock(); + + return S_OK; fail: + wined3d_mutex_unlock(); if (chosen_feature_level) *chosen_feature_level = 0; if (state) @@ -6470,10 +6493,9 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par struct wined3d_device *wined3d_device) { struct d3d_device *device = device_from_wined3d_device_parent(device_parent); + struct d3d_device_context_state *state; struct wined3d_state *wined3d_state; D3D_FEATURE_LEVEL feature_level; - ID3DDeviceContextState *state; - HRESULT hr; TRACE("device_parent %p, wined3d_device %p.\n", device_parent, wined3d_device); @@ -6484,19 +6506,21 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par wined3d_state = wined3d_device_get_state(device->wined3d_device); feature_level = d3d_feature_level_from_wined3d(wined3d_state_get_feature_level(wined3d_state)); - if (FAILED(hr = d3d11_device_CreateDeviceContextState(&device->ID3D11Device2_iface, 0, &feature_level, 1, - D3D11_SDK_VERSION, device->d3d11_only ? &IID_ID3D11Device2 : &IID_ID3D10Device1, NULL, &state))) + if (!(state = heap_alloc_zero(sizeof(*state)))) { - ERR("Failed to create the initial device context state, hr %#x.\n", hr); + ERR("Failed to create the initial device context state.\n"); return; } - device->state = impl_from_ID3DDeviceContextState(state); - if (!d3d_device_context_state_add_entry(device->state, device, wined3d_state)) + d3d_device_context_state_init(state, device, feature_level, + device->d3d11_only ? &IID_ID3D11Device2 : &IID_ID3D10Device1); + + device->state = state; + if (!d3d_device_context_state_add_entry(state, device, wined3d_state)) ERR("Failed to add entry for wined3d state %p, device %p.\n", wined3d_state, device); - d3d_device_context_state_private_addref(device->state); - ID3DDeviceContextState_Release(state); + d3d_device_context_state_private_addref(state); + ID3DDeviceContextState_Release(&state->ID3DDeviceContextState_iface); } static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent) -- 2.20.1

1 0

[PATCH 2/5] wined3d: Take the layer index into account in wined3d_shader_resource_view_gl_generate_mipmap().
by Henri Verbeet March 16, 2021

March 16, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/view.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index fec7e950a64..cd13da02078 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1197,7 +1197,7 @@ static void shader_resource_view_gl_bind_and_dirtify(struct wined3d_shader_resou void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resource_view_gl *view_gl, struct wined3d_context_gl *context_gl) { - unsigned int i, j, layer_count, level_count, base_level, max_level; + unsigned int i, j, layer_count, level_count, base_level, base_layer; const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_texture_gl *texture_gl; struct gl_texture *gl_tex; @@ -1209,14 +1209,16 @@ void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resou layer_count = view_gl->v.desc.u.texture.layer_count; level_count = view_gl->v.desc.u.texture.level_count; base_level = view_gl->v.desc.u.texture.level_idx; - max_level = base_level + level_count - 1; + base_layer = view_gl->v.desc.u.texture.layer_idx; texture_gl = wined3d_texture_gl(texture_from_resource(view_gl->v.resource)); srgb = !!(texture_gl->t.flags & WINED3D_TEXTURE_IS_SRGB); location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; for (i = 0; i < layer_count; ++i) { - wined3d_texture_load_location(&texture_gl->t, i * level_count + base_level, &context_gl->c, location); + if (!wined3d_texture_load_location(&texture_gl->t, + (base_layer + i) * level_count + base_level, &context_gl->c, location)) + ERR("Failed to load source layer %u.\n", base_layer + i); } if (view_gl->gl_view.name) @@ -1227,7 +1229,7 @@ void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resou { wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, srgb); gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_BASE_LEVEL, base_level); - gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_MAX_LEVEL, max_level); + gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_MAX_LEVEL, base_level + level_count - 1); } if (gl_info->supported[ARB_SAMPLER_OBJECTS]) @@ -1245,10 +1247,12 @@ void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resou for (i = 0; i < layer_count; ++i) { - for (j = base_level + 1; j <= max_level; ++j) + for (j = 1; j < level_count; ++j) { - wined3d_texture_validate_location(&texture_gl->t, i * level_count + j, location); - wined3d_texture_invalidate_location(&texture_gl->t, i * level_count + j, ~location); + wined3d_texture_validate_location(&texture_gl->t, + (base_layer + i) * level_count + base_level + j, location); + wined3d_texture_invalidate_location(&texture_gl->t, + (base_layer + i) * level_count + base_level + j, ~location); } } -- 2.20.1

1 0

[PATCH 1/5] wined3d: Add a missing barrier to wined3d_shader_resource_view_vk_generate_mipmap().
by Henri Verbeet March 16, 2021

March 16, 2021

Specifically, the one for using the new destination as blit target. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/view.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 74a100405aa..fec7e950a64 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1369,14 +1369,20 @@ void wined3d_shader_resource_view_vk_generate_mipmap(struct wined3d_shader_resou } else { + region.srcSubresource.mipLevel = ++vk_src_range.baseMipLevel; + region.dstSubresource.mipLevel = ++vk_dst_range.baseMipLevel; + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + texture_vk->vk_image, &vk_src_range); + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, + VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, + vk_access_mask_from_bind_flags(texture_vk->t.resource.bind_flags), + VK_ACCESS_TRANSFER_WRITE_BIT, + texture_vk->layout, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, texture_vk->vk_image, &vk_dst_range); - - region.srcSubresource.mipLevel = ++vk_src_range.baseMipLevel; - region.dstSubresource.mipLevel = ++vk_dst_range.baseMipLevel; } } -- 2.20.1

1 0