June 2020 - Wine-devel - list.winehq.org

[PATCH 07/10] wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in ffp_blit_supported().
by Henri Verbeet 03 Jun '20

03 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f0b25ce90da..fcb9ff8a1cf 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5211,7 +5211,7 @@ static bool ffp_blit_supported(enum wined3d_blit_op blit_op, const struct wined3 if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_format->id == src_format->id) { - if (dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + if (dst_format->depth_size || dst_format->stencil_size) blit_op = WINED3D_BLIT_OP_DEPTH_BLIT; else blit_op = WINED3D_BLIT_OP_COLOR_BLIT; -- 2.20.1

1 0

[PATCH 06/10] wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in glsl_blitter_supported().
by Henri Verbeet 03 Jun '20

03 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ddb76143b5c..66e90b17680 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12975,7 +12975,7 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_format->id == src_format->id) { - if (dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + if (dst_format->depth_size || dst_format->stencil_size) blit_op = WINED3D_BLIT_OP_DEPTH_BLIT; else blit_op = WINED3D_BLIT_OP_COLOR_BLIT; -- 2.20.1

1 0

[PATCH 05/10] wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in arbfp_blit_supported().
by Henri Verbeet 03 Jun '20

03 Jun '20

The idea is to get rid of the WINED3DFMT_FLAG_DEPTH and WINED3DFMT_FLAG_STENCIL format flags, and instead introduce a flag similar to WINED3DFMT_FLAG_RENDERTARGET that indicates whether the format can be used with WINED3D_BIND_DEPTH_STENCIL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e6daa88afd5..4724e5c959c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7722,7 +7722,7 @@ static BOOL arbfp_blit_supported(enum wined3d_blit_op blit_op, const struct wine if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_format->id == src_format->id) { - if (dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + if (dst_format->depth_size || dst_format->stencil_size) blit_op = WINED3D_BLIT_OP_DEPTH_BLIT; else blit_op = WINED3D_BLIT_OP_COLOR_BLIT; -- 2.20.1

1 0

[PATCH 04/10] wined3d: Get rid of the "d3d_initialized" check in wined3d_texture_update_map_binding().
by Henri Verbeet 03 Jun '20

03 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index bef2c4ec303..f0b25ce90da 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -769,11 +769,10 @@ static void wined3d_texture_update_map_binding(struct wined3d_texture *texture) unsigned int sub_count = texture->level_count * texture->layer_count; struct wined3d_device *device = texture->resource.device; DWORD map_binding = texture->update_map_binding; - struct wined3d_context *context = NULL; + struct wined3d_context *context; unsigned int i; - if (device->d3d_initialized) - context = context_acquire(device, NULL, 0); + context = context_acquire(device, NULL, 0); for (i = 0; i < sub_count; ++i) { @@ -784,8 +783,7 @@ static void wined3d_texture_update_map_binding(struct wined3d_texture *texture) wined3d_texture_remove_buffer_object(texture, i, wined3d_context_gl(context)->gl_info); } - if (context) - context_release(context); + context_release(context); texture->resource.map_binding = map_binding; texture->update_map_binding = 0; -- 2.20.1

1 0

[PATCH 03/10] wined3d: Get rid of the "d3d_initialized" check in device_resource_released().
by Henri Verbeet 03 Jun '20

03 Jun '20

This used to protect against accessing the framebuffer state on the no3d adapter; that's no longer a concern. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4544e28bc44..2ce3e346ef7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5493,18 +5493,15 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso TRACE("device %p, resource %p, type %s.\n", device, resource, debug_d3dresourcetype(type)); - if (device->d3d_initialized) + for (i = 0; i < ARRAY_SIZE(device->state.fb.render_targets); ++i) { - for (i = 0; i < ARRAY_SIZE(device->state.fb.render_targets); ++i) - { - if ((rtv = device->state.fb.render_targets[i]) && rtv->resource == resource) - ERR("Resource %p is still in use as render target %u.\n", resource, i); - } - - if ((rtv = device->state.fb.depth_stencil) && rtv->resource == resource) - ERR("Resource %p is still in use as depth/stencil buffer.\n", resource); + if ((rtv = device->state.fb.render_targets[i]) && rtv->resource == resource) + ERR("Resource %p is still in use as render target %u.\n", resource, i); } + if ((rtv = device->state.fb.depth_stencil) && rtv->resource == resource) + ERR("Resource %p is still in use as depth/stencil buffer.\n", resource); + switch (type) { case WINED3D_RTYPE_TEXTURE_1D: -- 2.20.1

1 0

[PATCH 02/10] wined3d: Get rid of the "d3d_initialized" check in context_resource_released().
by Henri Verbeet 03 Jun '20

03 Jun '20

When this was introduced in commit 401e99b0c074af848379b2602df37fb1e6c7536b, it protected against calling the equivalent of context_acquire() on the equivalent of the no3d adapter. Commit 94d33d3e861d8e01b4edcb940e8ab1aa98359520 removed the call in question. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7959199e1f4..3a263e1f6bd 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -36,9 +36,6 @@ void context_resource_released(const struct wined3d_device *device, struct wined { unsigned int i; - if (!device->d3d_initialized) - return; - for (i = 0; i < device->context_count; ++i) { struct wined3d_context *context = device->contexts[i]; -- 2.20.1

1 0

[PATCH 01/10] wined3d: Get rid of the "d3d_initialized" check in wined3d_device_reset().
by Henri Verbeet 03 Jun '20

03 Jun '20

We require an implicit swapchain, so "d3d_initialized" is always true. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9b59371bb21..4544e28bc44 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5385,8 +5385,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_cs_emit_unload_resource(device->cs, resource); } - if (device->d3d_initialized) - device->adapter->adapter_ops->adapter_uninit_3d(device); + device->adapter->adapter_ops->adapter_uninit_3d(device); memset(&device->state, 0, sizeof(device->state)); state_init(&device->state, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); @@ -5403,7 +5402,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_device_set_depth_stencil_view(device, view); } - if (device->d3d_initialized && reset_state) + if (reset_state) hr = device->adapter->adapter_ops->adapter_init_3d(device); /* All done. There is no need to reload resources or shaders, this will happen automatically on the -- 2.20.1

1 0

[PATCH 5/5 v2] vcruntime140_1: Unwind state 0.
by Piotr Caban 03 Jun '20

03 Jun '20

From: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/vcruntime140_1/except_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 4/5 v2] vcruntime140_1: Don't terminate on state of -1.
by Piotr Caban 03 Jun '20

03 Jun '20

From: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/vcruntime140_1/except_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 3/5 v2] vcruntime140_1: Skip unwind if already at last level.
by Piotr Caban 03 Jun '20

03 Jun '20

From: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - changed condition to be similar with cxx_local_unwind in msvcrt dlls/vcruntime140_1/except_x86_64.c | 2 ++ 1 file changed, 2 insertions(+)

1 0