wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Alistair Leslie-Hughes : include/ddk: Add wsk.h file.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 7382ec9071b5fd2d36d96e79db59b0d02e56a43e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7382ec9071b5fd2d36d96e79… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 3 00:11:34 2020 +0300 include/ddk: Add wsk.h file. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/ddk/wsk.h | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 9796dd8e5d..a4563920f6 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -188,6 +188,7 @@ SOURCES = \ ddk/wdm.h \ ddk/winddiui.h \ ddk/winsplp.h \ + ddk/wsk.h \ ddraw.h \ ddrawgdi.h \ ddrawi.h \ diff --git a/include/ddk/wsk.h b/include/ddk/wsk.h new file mode 100644 index 0000000000..c7100bb799 --- /dev/null +++ b/include/ddk/wsk.h @@ -0,0 +1,116 @@ +/* + * Copyright 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef _INC_WSK +#define _INC_WSK + +#include <winsock2.h> + +#ifdef __cplusplus +extern "C" +{ +#endif + +struct _WSK_CLIENT; +typedef struct _WSK_CLIENT WSK_CLIENT, *PWSK_CLIENT; +typedef struct _WSK_CLIENT_CONNECTION_DISPATCH WSK_CLIENT_CONNECTION_DISPATCH, *PWSK_CLIENT_CONNECTION_DISPATCH; + +typedef struct _WSK_BUF +{ + PMDL Mdl; + ULONG Offset; + SIZE_T Length; +} WSK_BUF, *PWSK_BUF; + +typedef struct _WSK_DATA_INDICATION +{ + struct _WSK_DATA_INDICATION *Next; + WSK_BUF Buffer; +} WSK_DATA_INDICATION, *PWSK_DATA_INDICATION; + +typedef NTSTATUS (WINAPI *PFN_WSK_CLIENT_EVENT)(void *context, ULONG event, void *info, SIZE_T length); +typedef NTSTATUS (WINAPI *PFN_WSK_DISCONNECT_EVENT)(void *context, ULONG flags); +typedef NTSTATUS (WINAPI *PFN_WSK_SEND_BACKLOG_EVENT)(void *socket_context, SIZE_T ideal_backlog_size); +typedef NTSTATUS (WINAPI *PFN_WSK_SOCKET)(WSK_CLIENT *client, ADDRESS_FAMILY family, + USHORT type, ULONG protocol, ULONG flags, void *context, const void *dispatch, + PEPROCESS process, PETHREAD thread, SECURITY_DESCRIPTOR *security, IRP *irp); +typedef NTSTATUS (WINAPI *PFN_WSK_SOCKET_CONNECT)(WSK_CLIENT *client, USHORT type, + ULONG protocol, SOCKADDR *local, SOCKADDR *remote, ULONG flags, void *context, + const WSK_CLIENT_CONNECTION_DISPATCH *dispatch, PEPROCESS process, PETHREAD owning, + SECURITY_DESCRIPTOR *descriptor, IRP *irp); +typedef NTSTATUS (WINAPI *PFN_WSK_CONTROL_CLIENT)(WSK_CLIENT *client, ULONG control, + SIZE_T input_size, void *input, SIZE_T output_size, void *output, SIZE_T *returned, + IRP *irp); +typedef NTSTATUS (WINAPI *PFN_WSK_GET_ADDRESS_INFO)(WSK_CLIENT *client, UNICODE_STRING *node_name, + UNICODE_STRING *service_name, ULONG name_space, GUID *provider, ADDRINFOEXW *hints, + ADDRINFOEXW **result, PEPROCESS process, PETHREAD thread, IRP *irp); +typedef void (WINAPI *PFN_WSK_FREE_ADDRESS_INFO)(WSK_CLIENT *client, ADDRINFOEXW *addrinfo); +typedef NTSTATUS (WINAPI *PFN_WSK_GET_NAME_INFO)(WSK_CLIENT *client, SOCKADDR *addr, + ULONG length, UNICODE_STRING *node_name, UNICODE_STRING *service_name, + ULONG flags, PEPROCESS process, PETHREAD thread, IRP *irp); +typedef NTSTATUS (WINAPI* PFN_WSK_RECEIVE_EVENT)(void *context, ULONG flags, + WSK_DATA_INDICATION *indication, SIZE_T size, SIZE_T *accepted); + +typedef struct _WSK_PROVIDER_DISPATCH +{ + USHORT Version; + USHORT Reserved; + PFN_WSK_SOCKET WskSocket; + PFN_WSK_SOCKET_CONNECT WskSocketConnect; + PFN_WSK_CONTROL_CLIENT WskControlClient; + PFN_WSK_GET_ADDRESS_INFO WskGetAddressInfo; + PFN_WSK_FREE_ADDRESS_INFO WskFreeAddressInfo; + PFN_WSK_GET_NAME_INFO WskGetNameInfo; +} WSK_PROVIDER_DISPATCH, *PWSK_PROVIDER_DISPATCH; + +typedef struct _WSK_CLIENT_CONNECTION_DISPATCH +{ + PFN_WSK_RECEIVE_EVENT WskReceiveEvent; + PFN_WSK_DISCONNECT_EVENT WskDisconnectEvent; + PFN_WSK_SEND_BACKLOG_EVENT WskSendBacklogEvent; +} WSK_CLIENT_CONNECTION_DISPATCH, *PWSK_CLIENT_CONNECTION_DISPATCH; + +typedef struct _WSK_CLIENT_DISPATCH +{ + USHORT Version; + USHORT Reserved; + PFN_WSK_CLIENT_EVENT WskClientEvent; +} WSK_CLIENT_DISPATCH, *PWSK_CLIENT_DISPATCH; + +typedef struct _WSK_CLIENT_NPI +{ + void *ClientContext; + const WSK_CLIENT_DISPATCH *Dispatch; +} WSK_CLIENT_NPI, *PWSK_CLIENT_NPI; + +typedef struct _WSK_REGISTRATION +{ + ULONGLONG ReservedRegistrationState; + void *ReservedRegistrationContext; + KSPIN_LOCK ReservedRegistrationLock; +} WSK_REGISTRATION, *PWSK_REGISTRATION; + +typedef struct _WSK_PROVIDER_NPI +{ + PWSK_CLIENT Client; + const WSK_PROVIDER_DISPATCH *Dispatch; +} WSK_PROVIDER_NPI, *PWSK_PROVIDER_NPI; + +#ifdef __cplusplus +} +#endif +#endif

1 0

Paul Gofman : netio.sys: Add driver stub.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 8fe1c9e1bb39aabd8e4e25278952a6ead96531d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fe1c9e1bb39aabd8e4e2527… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 3 00:11:33 2020 +0300 netio.sys: Add driver stub. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/netio.sys/Makefile.in | 7 + dlls/netio.sys/netio.c | 47 +++++ dlls/netio.sys/netio.sys.spec | 391 ++++++++++++++++++++++++++++++++++++++++++ loader/wine.inf.in | 2 + 6 files changed, 450 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8fe1c9e1bb39aabd8e4e…

1 0

Paul Gofman : ntoskrnl.exe/tests: Avoid race condition in test driver.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: d0d1601e6c08116d9813f9899aafdde2df40209a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0d1601e6c08116d9813f989… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 3 14:29:44 2020 +0300 ntoskrnl.exe/tests: Avoid race condition in test driver. Might fix random driver crash on testbot Win8 machine. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index f51064986b..beac9c2c25 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -2194,7 +2194,9 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st main_test_work_item = IoAllocateWorkItem(lower_device); ok(main_test_work_item != NULL, "main_test_work_item = NULL\n"); + IoMarkIrpPending(irp); IoQueueWorkItem(main_test_work_item, main_test_task, DelayedWorkQueue, irp); + return STATUS_PENDING; } @@ -2380,7 +2382,6 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.Status = status; IoCompleteRequest(irp, IO_NO_INCREMENT); } - else IoMarkIrpPending(irp); return status; }

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in texture2d_depth_blt_fbo().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 8d7c39b860f203d623d5a47ee8a00991114f9fdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d7c39b860f203d623d5a47e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:12 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in texture2d_depth_blt_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index eb43f9975e..cd3d4b4912 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -450,7 +450,7 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct { struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context_gl->gl_info; - DWORD src_mask, dst_mask; + GLbitfield src_mask, dst_mask; GLbitfield gl_mask; TRACE("device %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_rect %s, " @@ -458,8 +458,17 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct src_texture, src_sub_resource_idx, wined3d_debug_location(src_location), wine_dbgstr_rect(src_rect), dst_texture, dst_sub_resource_idx, wined3d_debug_location(dst_location), wine_dbgstr_rect(dst_rect)); - src_mask = src_texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); - dst_mask = dst_texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); + src_mask = 0; + if (src_texture->resource.format->depth_size) + src_mask |= GL_DEPTH_BUFFER_BIT; + if (src_texture->resource.format->stencil_size) + src_mask |= GL_STENCIL_BUFFER_BIT; + + dst_mask = 0; + if (dst_texture->resource.format->depth_size) + dst_mask |= GL_DEPTH_BUFFER_BIT; + if (dst_texture->resource.format->stencil_size) + dst_mask |= GL_STENCIL_BUFFER_BIT; if (src_mask != dst_mask) { @@ -475,12 +484,7 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct debug_d3dformat(src_texture->resource.format->id)); return; } - - gl_mask = 0; - if (src_mask & WINED3DFMT_FLAG_DEPTH) - gl_mask |= GL_DEPTH_BUFFER_BIT; - if (src_mask & WINED3DFMT_FLAG_STENCIL) - gl_mask |= GL_STENCIL_BUFFER_BIT; + gl_mask = src_mask; /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. */

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in texture2d_blt().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 2ae6de5287541fea1f24b206b54b94fae6e06573 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ae6de5287541fea1f24b206… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:11 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in texture2d_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0c95f7a43a..652f6070b9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1483,11 +1483,11 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ struct wined3d_swapchain *src_swapchain, *dst_swapchain; const struct wined3d_color_key *colour_key = NULL; DWORD src_location, dst_location, valid_locations; - DWORD src_ds_flags, dst_ds_flags; struct wined3d_context *context; enum wined3d_blit_op blit_op; BOOL scale, convert, resolve; RECT src_rect, dst_rect; + bool src_ds, dst_ds; static const DWORD simple_blit = WINED3D_BLT_SRC_CKEY | WINED3D_BLT_SRC_CKEY_OVERRIDE @@ -1561,12 +1561,10 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ convert = src_texture->resource.format->id != dst_texture->resource.format->id; resolve = src_texture->resource.multisample_type != dst_texture->resource.multisample_type; - dst_ds_flags = dst_texture->resource.format_flags - & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); - src_ds_flags = src_texture->resource.format_flags - & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); + dst_ds = dst_texture->resource.format->depth_size || dst_texture->resource.format->stencil_size; + src_ds = src_texture->resource.format->depth_size || src_texture->resource.format->stencil_size; - if (src_ds_flags || dst_ds_flags) + if (src_ds || dst_ds) { TRACE("Depth/stencil blit.\n");

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in wined3d_texture_blt().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 97a250075ad440b75c7ea9e4e2b413385a13edbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=97a250075ad440b75c7ea9e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:10 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in wined3d_texture_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index fcb9ff8a1c..eb43f9975e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3829,7 +3829,6 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned { struct wined3d_box src_box = {src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, 0, 1}; struct wined3d_box dst_box = {dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, 0, 1}; - unsigned int dst_format_flags, src_format_flags = 0; HRESULT hr; TRACE("dst_texture %p, dst_sub_resource_idx %u, dst_rect %s, src_texture %p, " @@ -3849,12 +3848,10 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned && filter != WINED3D_TEXF_LINEAR) return WINED3DERR_INVALIDCALL; - dst_format_flags = dst_texture->resource.format_flags; if (FAILED(hr = wined3d_texture_check_box_dimensions(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_box))) return hr; - src_format_flags = src_texture->resource.format_flags; if (FAILED(hr = wined3d_texture_check_box_dimensions(src_texture, src_sub_resource_idx % src_texture->level_count, &src_box))) return hr; @@ -3866,8 +3863,8 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned return WINEDDERR_SURFACEBUSY; } - if ((src_format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) - != (dst_format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) + if (!src_texture->resource.format->depth_size != !dst_texture->resource.format->depth_size + || !src_texture->resource.format->stencil_size != !dst_texture->resource.format->stencil_size) { WARN("Rejecting depth/stencil blit between incompatible formats.\n"); return WINED3DERR_INVALIDCALL;

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in ffp_blit_supported().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 2b2a6ebdd1fad8fa050ff9d59cfb11f7f6e8d3ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b2a6ebdd1fad8fa050ff9d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:09 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in ffp_blit_supported(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 f0b25ce90d..fcb9ff8a1c 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;

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in glsl_blitter_supported().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: ce4b63dc8802e93bd72a4bd967845a9bfc447144 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce4b63dc8802e93bd72a4bd9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:08 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in glsl_blitter_supported(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 ddb76143b5..66e90b1768 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;

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in arbfp_blit_supported().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 9af34f9aea2e4f0d6064450b64fb162affca5561 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9af34f9aea2e4f0d6064450b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:07 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in arbfp_blit_supported(). 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 e6daa88afd..4724e5c959 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;

1 0

Henri Verbeet : wined3d: Get rid of the "d3d_initialized" check in wined3d_texture_update_map_binding().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 4616867798788f47624292031a1b906e2a119eaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=4616867798788f4762429203… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:06 2020 +0430 wined3d: Get rid of the "d3d_initialized" check in wined3d_texture_update_map_binding(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 bef2c4ec30..f0b25ce90d 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;

1 0

← Newer
1
...
73
74
75
76
77
78
79
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2020