January 2022 - Wine-commits

Rémi Bernon : winexinput.sys: Fix warnings from long integer types.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: cd30bf64d6da2b9373c96f0903379233f92ed6a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd30bf64d6da2b9373c96f09… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 28 10:46:47 2022 +0100 winexinput.sys: Fix warnings from long integer types. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winexinput.sys/Makefile.in | 1 - dlls/winexinput.sys/main.c | 42 ++++++++++++++++++++--------------------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/winexinput.sys/Makefile.in b/dlls/winexinput.sys/Makefile.in index ce98960de9b..e115235920a 100644 --- a/dlls/winexinput.sys/Makefile.in +++ b/dlls/winexinput.sys/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winexinput.sys IMPORTS = ntoskrnl hidparse EXTRADLLFLAGS = -Wl,--subsystem,native diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index 339db17817c..e0ffb71440f 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -124,7 +124,7 @@ struct device { BOOL is_fdo; BOOL is_gamepad; - BOOL removed; + LONG removed; WCHAR device_id[MAX_DEVICE_ID_LEN]; }; @@ -204,28 +204,28 @@ static void translate_report_to_xinput_state(struct func_device *fdo) count = ARRAY_SIZE(usages); status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usages, &count, preparsed, fdo->report_buf, fdo->report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetUsages returned %#x\n", status); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetUsages returned %#lx\n", status); status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, &hat, preparsed, fdo->report_buf, fdo->report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetUsageValue hat returned %#x\n", status); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetUsageValue hat returned %#lx\n", status); status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &lx, preparsed, fdo->report_buf, fdo->report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetUsageValue x returned %#x\n", status); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetUsageValue x returned %#lx\n", status); status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &ly, preparsed, fdo->report_buf, fdo->report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetUsageValue y returned %#x\n", status); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetUsageValue y returned %#lx\n", status); status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &lt, preparsed, fdo->report_buf, fdo->report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetUsageValue z returned %#x\n", status); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetUsageValue z returned %#lx\n", status); status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &rx, preparsed, fdo->report_buf, fdo->report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetUsageValue rx returned %#x\n", status); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetUsageValue rx returned %#lx\n", status); status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &ry, preparsed, fdo->report_buf, fdo->report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetUsageValue ry returned %#x\n", status); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetUsageValue ry returned %#lx\n", status); status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &rt, preparsed, fdo->report_buf, fdo->report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetUsageValue rz returned %#x\n", status); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetUsageValue rz returned %#lx\n", status); if (hat < 1 || hat > 8) fdo->xinput_state.buttons = 0; else fdo->xinput_state.buttons = hat << 10; @@ -322,7 +322,7 @@ static NTSTATUS WINAPI gamepad_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) ULONG code = stack->Parameters.DeviceIoControl.IoControlCode; struct func_device *fdo = fdo_from_DEVICE_OBJECT(device); - TRACE("device %p, irp %p, code %#x, bus_device %p.\n", device, irp, code, fdo->bus_device); + TRACE("device %p, irp %p, code %#lx, bus_device %p.\n", device, irp, code, fdo->bus_device); switch (code) { @@ -397,7 +397,7 @@ static NTSTATUS WINAPI internal_ioctl(DEVICE_OBJECT *device, IRP *irp) return STATUS_DELETE_PENDING; } - TRACE("device %p, irp %p, code %#x, bus_device %p.\n", device, irp, code, fdo->bus_device); + TRACE("device %p, irp %p, code %#lx, bus_device %p.\n", device, irp, code, fdo->bus_device); if (code == IOCTL_HID_READ_REPORT) return try_complete_pending_read(device, irp); if (impl->is_gamepad) return gamepad_internal_ioctl(device, irp); @@ -465,7 +465,7 @@ static NTSTATUS WINAPI pdo_pnp(DEVICE_OBJECT *device, IRP *irp) IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); struct func_device *fdo = fdo_from_DEVICE_OBJECT(device); struct device *impl = impl_from_DEVICE_OBJECT(device); - ULONG code = stack->MinorFunction; + UCHAR code = stack->MinorFunction; NTSTATUS status; IRP *pending; @@ -568,7 +568,7 @@ static NTSTATUS create_child_pdos(DEVICE_OBJECT *device) if ((status = IoCreateDevice(device->DriverObject, sizeof(struct phys_device), &name_str, 0, 0, FALSE, &gamepad_device))) { - ERR("failed to create gamepad device, status %#x.\n", status); + ERR("failed to create gamepad device, status %#lx.\n", status); return status; } @@ -579,7 +579,7 @@ static NTSTATUS create_child_pdos(DEVICE_OBJECT *device) if ((status = IoCreateDevice(device->DriverObject, sizeof(struct phys_device), &name_str, 0, 0, FALSE, &xinput_device))) { - ERR("failed to create xinput device, status %#x.\n", status); + ERR("failed to create xinput device, status %#lx.\n", status); IoDeleteDevice(gamepad_device); return status; } @@ -641,7 +641,7 @@ static void check_value_caps(struct func_device *fdo, USHORT usage, HIDP_VALUE_C static NTSTATUS initialize_device(DEVICE_OBJECT *device) { struct func_device *fdo = fdo_from_DEVICE_OBJECT(device); - ULONG i, u, button_count, report_desc_len, report_count; + UINT i, u, button_count, report_desc_len, report_count; PHIDP_REPORT_DESCRIPTOR report_desc; PHIDP_PREPARSED_DATA preparsed; HIDP_BUTTON_CAPS *button_caps; @@ -669,7 +669,7 @@ static NTSTATUS initialize_device(DEVICE_OBJECT *device) button_count = 0; if (!(button_caps = malloc(sizeof(*button_caps) * caps.NumberInputButtonCaps))) return STATUS_NO_MEMORY; status = HidP_GetButtonCaps(HidP_Input, button_caps, &caps.NumberInputButtonCaps, preparsed); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetButtonCaps returned %#x\n", status); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetButtonCaps returned %#lx\n", status); else for (i = 0; i < caps.NumberInputButtonCaps; i++) { if (button_caps[i].UsagePage != HID_USAGE_PAGE_BUTTON) continue; @@ -682,7 +682,7 @@ static NTSTATUS initialize_device(DEVICE_OBJECT *device) if (!(value_caps = malloc(sizeof(*value_caps) * caps.NumberInputValueCaps))) return STATUS_NO_MEMORY; status = HidP_GetValueCaps(HidP_Input, value_caps, &caps.NumberInputValueCaps, preparsed); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetValueCaps returned %#x\n", status); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetValueCaps returned %#lx\n", status); else for (i = 0; i < caps.NumberInputValueCaps; i++) { HIDP_VALUE_CAPS *caps = value_caps + i; @@ -721,7 +721,7 @@ static NTSTATUS WINAPI fdo_pnp(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); struct func_device *fdo = fdo_from_DEVICE_OBJECT(device); - ULONG code = stack->MinorFunction; + UCHAR code = stack->MinorFunction; DEVICE_RELATIONS *devices; DEVICE_OBJECT *child; NTSTATUS status; @@ -839,7 +839,7 @@ static NTSTATUS WINAPI add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *bus_devi if ((status = get_device_id(bus_device, BusQueryDeviceID, bus_id))) { - ERR("failed to get bus device id, status %#x.\n", status); + ERR("failed to get bus device id, status %#lx.\n", status); return status; } @@ -852,14 +852,14 @@ static NTSTATUS WINAPI add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *bus_devi if ((status = get_device_id(bus_device, BusQueryInstanceID, instance_id))) { - ERR("failed to get bus device instance id, status %#x.\n", status); + ERR("failed to get bus device instance id, status %#lx.\n", status); return status; } if ((status = IoCreateDevice(driver, sizeof(struct func_device), NULL, FILE_DEVICE_BUS_EXTENDER, 0, FALSE, &device))) { - ERR("failed to create bus FDO, status %#x.\n", status); + ERR("failed to create bus FDO, status %#lx.\n", status); return status; }

1 0

Henri Verbeet : wined3d: Use wined3d_bit_scan() in shader_glsl_load_constants_i().
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 6f150854e7b2fad37c9140be16d9952d493ac14e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f150854e7b2fad37c9140be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 28 15:47:19 2022 +0100 wined3d: Use wined3d_bit_scan() in shader_glsl_load_constants_i(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c812b2d8b08..1ebd067ae56 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1211,16 +1211,15 @@ static void shader_glsl_load_constants_f(const struct wined3d_shader *shader, co /* Context activation is done by the caller. */ static void shader_glsl_load_constants_i(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, - const struct wined3d_ivec4 *constants, const GLint locations[WINED3D_MAX_CONSTS_I], WORD constants_set) + const struct wined3d_ivec4 *constants, const GLint locations[WINED3D_MAX_CONSTS_I], uint32_t constants_set) { unsigned int i; struct list* ptr; - for (i = 0; constants_set; constants_set >>= 1, ++i) + while (constants_set) { - if (!(constants_set & 1)) continue; - /* We found this uniform name in the program - go ahead and send the data */ + i = wined3d_bit_scan(&constants_set); GL_EXTCALL(glUniform4iv(locations[i], 1, &constants[i].x)); }

1 0

Henri Verbeet : wined3d: Use wined3d_bit_scan() in shader_glsl_load_constantsB().
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: bbb7d41eae2762afae97aeb52459eb0b579779c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbb7d41eae2762afae97aeb5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 28 15:47:20 2022 +0100 wined3d: Use wined3d_bit_scan() in shader_glsl_load_constantsB(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1ebd067ae56..aa3c8780269 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1239,16 +1239,15 @@ static void shader_glsl_load_constants_i(const struct wined3d_shader *shader, co } /* Context activation is done by the caller. */ -static void shader_glsl_load_constantsB(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, - const GLint locations[WINED3D_MAX_CONSTS_B], const BOOL *constants, WORD constants_set) +static void shader_glsl_load_constants_b(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, + const BOOL *constants, const GLint locations[WINED3D_MAX_CONSTS_B], uint32_t constants_set) { unsigned int i; struct list* ptr; - for (i = 0; constants_set; constants_set >>= 1, ++i) + while (constants_set) { - if (!(constants_set & 1)) continue; - + i = wined3d_bit_scan(&constants_set); GL_EXTCALL(glUniform1iv(locations[i], 1, &constants[i])); } @@ -1546,8 +1545,8 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context prog->vs.uniform_i_locations, vshader->reg_maps.integer_constants); if (update_mask & WINED3D_SHADER_CONST_VS_B) - shader_glsl_load_constantsB(vshader, gl_info, prog->vs.uniform_b_locations, state->vs_consts_b, - vshader->reg_maps.boolean_constants); + shader_glsl_load_constants_b(vshader, gl_info, state->vs_consts_b, + prog->vs.uniform_b_locations, vshader->reg_maps.boolean_constants); if (update_mask & WINED3D_SHADER_CONST_VS_CLIP_PLANES) { @@ -1699,8 +1698,8 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context prog->ps.uniform_i_locations, pshader->reg_maps.integer_constants); if (update_mask & WINED3D_SHADER_CONST_PS_B) - shader_glsl_load_constantsB(pshader, gl_info, prog->ps.uniform_b_locations, state->ps_consts_b, - pshader->reg_maps.boolean_constants); + shader_glsl_load_constants_b(pshader, gl_info, state->ps_consts_b, + prog->ps.uniform_b_locations, pshader->reg_maps.boolean_constants); if (update_mask & WINED3D_SHADER_CONST_PS_BUMP_ENV) {

1 0

Henri Verbeet : wined3d: Use wined3d_bit_scan() in shader_generate_glsl_declarations().
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 1a7dbab1c45129ace79b21ca6165fa72c05fa8fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a7dbab1c45129ace79b21ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 28 15:47:21 2022 +0100 wined3d: Use wined3d_bit_scan() in shader_generate_glsl_declarations(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index aa3c8780269..5a2111e46a7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2168,7 +2168,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c const struct wined3d_shader_lconst *lconst; const char *prefix; unsigned int i; - DWORD map; + uint32_t map; if (wined3d_settings.strict_shader_math) shader_addline(buffer, "#pragma optionNV(fastmath off)\n"); @@ -2176,9 +2176,11 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c prefix = shader_glsl_get_prefix(version->type); /* Prototype the subroutines */ - for (i = 0, map = reg_maps->labels; map; map >>= 1, ++i) + map = reg_maps->labels; + while (map) { - if (map & 1) shader_addline(buffer, "void subroutine%u();\n", i); + i = wined3d_bit_scan(&map); + shader_addline(buffer, "void subroutine%u();\n", i); } if (version->type != WINED3D_SHADER_TYPE_PIXEL && version->type != WINED3D_SHADER_TYPE_COMPUTE) @@ -2500,9 +2502,11 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c } /* Declare address variables */ - for (i = 0, map = reg_maps->address; map; map >>= 1, ++i) + map = reg_maps->address; + while (map) { - if (map & 1) shader_addline(buffer, "ivec4 A%u;\n", i); + i = wined3d_bit_scan(&map); + shader_addline(buffer, "ivec4 A%u;\n", i); } /* Declare output register temporaries */ @@ -2517,10 +2521,11 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c } else if (version->major < 4) { - for (i = 0, map = reg_maps->temporary; map; map >>= 1, ++i) + map = reg_maps->temporary; + while (map) { - if (map & 1) - shader_addline(buffer, "vec4 R%u;\n", i); + i = wined3d_bit_scan(&map); + shader_addline(buffer, "vec4 R%u;\n", i); } }

1 0

Henri Verbeet : wined3d: Use wined3d_bit_scan() in shader_glsl_generate_fragment_shader().
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 4946471bec0e2ae93f2e552f33095a48ed3f11f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4946471bec0e2ae93f2e552f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 28 15:47:22 2022 +0100 wined3d: Use wined3d_bit_scan() in shader_glsl_generate_fragment_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5a2111e46a7..d10b84a9e05 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7643,7 +7643,7 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ unsigned int i, extra_constants_needed = 0; struct shader_glsl_ctx_priv priv_ctx; GLuint shader_id; - DWORD map; + uint32_t map; memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.gl_info = gl_info; @@ -7762,11 +7762,10 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count); } - for (i = 0, map = reg_maps->bumpmat; map; map >>= 1, ++i) + map = reg_maps->bumpmat; + while (map) { - if (!(map & 1)) - continue; - + i = wined3d_bit_scan(&map); shader_addline(buffer, "uniform mat2 bumpenv_mat%u;\n", i); if (reg_maps->luminanceparams & (1u << i)) @@ -7903,7 +7902,6 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ if (reg_maps->shader_version.major < 3 || args->vp_mode != WINED3D_VP_MODE_SHADER) { unsigned int i; - WORD map = reg_maps->texcoord; if (legacy_syntax) { @@ -7913,19 +7911,18 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ shader_addline(buffer, "ffp_varying_specular = gl_SecondaryColor;\n"); } - for (i = 0; map; map >>= 1, ++i) + map = reg_maps->texcoord; + while (map) { - if (map & 1) - { - if (args->pointsprite) - shader_addline(buffer, "ffp_texcoord[%u] = vec4(gl_PointCoord.xy, 0.0, 0.0);\n", i); - else if (args->texcoords_initialized & (1u << i)) - shader_addline(buffer, "ffp_texcoord[%u] = %s[%u];\n", i, - legacy_syntax ? "gl_TexCoord" : "ffp_varying_texcoord", i); - else - shader_addline(buffer, "ffp_texcoord[%u] = vec4(0.0);\n", i); - shader_addline(buffer, "vec4 T%u = ffp_texcoord[%u];\n", i, i); - } + i = wined3d_bit_scan(&map); + if (args->pointsprite) + shader_addline(buffer, "ffp_texcoord[%u] = vec4(gl_PointCoord.xy, 0.0, 0.0);\n", i); + else if (args->texcoords_initialized & (1u << i)) + shader_addline(buffer, "ffp_texcoord[%u] = %s[%u];\n", i, + legacy_syntax ? "gl_TexCoord" : "ffp_varying_texcoord", i); + else + shader_addline(buffer, "ffp_texcoord[%u] = vec4(0.0);\n", i); + shader_addline(buffer, "vec4 T%u = ffp_texcoord[%u];\n", i, i); } if (legacy_syntax)

1 0

Henri Verbeet : wined3d: Use wined3d_bit_scan() in shader_arb_load_np2fixup_constants().
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 837e60507652fca9cbce482d2a5f050650256646 URL: https://source.winehq.org/git/wine.git/?a=commit;h=837e60507652fca9cbce482d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 28 15:47:23 2022 +0100 wined3d: Use wined3d_bit_scan() in shader_arb_load_np2fixup_constants(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 820ba0199e8..54a90a690ac 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -497,27 +497,26 @@ static void shader_arb_load_np2fixup_constants(const struct arb_ps_np2fixup_info const struct wined3d_gl_info *gl_info, const struct wined3d_state *state) { GLfloat np2fixup_constants[4 * WINED3D_MAX_FRAGMENT_SAMPLERS]; - WORD active = fixup->super.active; - UINT i; + uint32_t active = fixup->super.active; + const struct wined3d_texture *tex; + unsigned char idx; + GLfloat *tex_dim; + unsigned int i; if (!active) return; - for (i = 0; active; active >>= 1, ++i) + while (active) { - const struct wined3d_texture *tex = state->textures[i]; - unsigned char idx = fixup->super.idx[i]; - GLfloat *tex_dim = &np2fixup_constants[(idx >> 1) * 4]; - - if (!(active & 1)) - continue; - - if (!tex) + i = wined3d_bit_scan(&active); + if (!(tex = state->textures[i])) { ERR("Nonexistent texture is flagged for NP2 texcoord fixup.\n"); continue; } + idx = fixup->super.idx[i]; + tex_dim = &np2fixup_constants[(idx >> 1) * 4]; if (idx % 2) { tex_dim[2] = tex->pow2_matrix[0];

1 0

Zebediah Figura : wined3d: Use wined3d_buffer_load_location() in wined3d_buffer_get_memory().
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 287bfc775828762e4b8212157cabf05d38b3f237 URL: https://source.winehq.org/git/wine.git/?a=commit;h=287bfc775828762e4b821215… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 28 15:47:24 2022 +0100 wined3d: Use wined3d_buffer_load_location() in wined3d_buffer_get_memory(). wined3d_buffer_load_location() can handle loading from WINED3D_LOCATION_DISCARDED just fine, so use it instead of duplicating the functionality here. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b42c7bd919a..3d66af3e5e6 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -653,14 +653,12 @@ DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_co if (locations & WINED3D_LOCATION_DISCARDED) { locations = ((buffer->flags & WINED3D_BUFFER_USE_BO) ? WINED3D_LOCATION_BUFFER : WINED3D_LOCATION_SYSMEM); - if (!wined3d_buffer_prepare_location(buffer, context, locations)) + if (!wined3d_buffer_load_location(buffer, context, locations)) { data->buffer_object = 0; data->addr = NULL; return 0; } - wined3d_buffer_validate_location(buffer, locations); - wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_DISCARDED); } if (locations & WINED3D_LOCATION_BUFFER) {

1 0

Zebediah Figura : wined3d: Prefer mapping a BO if the buffer has WINED3D_BUFFER_USE_BO set.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 6b96021a1cfa1680482a99123f594fe5b87a0c88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b96021a1cfa1680482a9912… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 27 20:22:50 2022 -0600 wined3d: Prefer mapping a BO if the buffer has WINED3D_BUFFER_USE_BO set. Instead of checking whether a BO already exists. This will end up allocating a BO earlier in some cases. This is not particularly impactful by itself, since we already would have sysmem available and thus could use it without a performance penalty. However, we would like to avoid ever allocating sysmem where not necessary, in particular by deferring allocation of any location at all until the resource is written to. This also has the side effect of fixing test_map_synchronization() on 64-bit architectures, broken since 194b47b4fd92dda8ebf24e88ca7a14fc926c84ab. The test creates a buffer, maps it once, then maps it again with NOOVERWRITE while the GPU is still drawing, expecting the new data to be read by the GPU during the draw. On 32-bit machines, and 64-bit machines before the offending commit, we do the following: First map: uses SYSMEM since the BO is not created yet Draw: upload to VBO Second map: map the existing VBO with GL_MAP_UNSYNCHRONIZED_BIT After 194b47b4fd9, we don't use GL_MAP_UNSYNCHRONIZED_BIT since the buffer has READ access, which means that the second map will be synchronized and wait for the draw to complete. After this patch, we do the following: First map: create and map a VBO (not unsynchronized, but coherent and persistently mapped) Draw: use mapped VBO Second map: write to existing (coherent) VBO, which is unsynchronized Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 139 ++++++++++++++++++++++++++------------------------ 1 file changed, 72 insertions(+), 67 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3d66af3e5e6..abbef0fac41 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -911,105 +911,110 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc void **map_ptr, const struct wined3d_box *box, uint32_t flags) { struct wined3d_buffer *buffer = buffer_from_resource(resource); + unsigned int offset, size, dirty_offset, dirty_size; struct wined3d_device *device = resource->device; struct wined3d_context *context; - unsigned int offset, size; + struct wined3d_bo_address addr; uint8_t *base; LONG count; TRACE("resource %p, sub_resource_idx %u, map_ptr %p, box %s, flags %#x.\n", resource, sub_resource_idx, map_ptr, debug_box(box), flags); - offset = box->left; - size = box->right - box->left; + dirty_offset = offset = box->left; + dirty_size = size = box->right - box->left; count = ++resource->map_count; - if (buffer->buffer_object) + /* DISCARD invalidates the entire buffer, regardless of the specified + * offset and size. Some applications also depend on the entire buffer + * being uploaded in that case. Two such applications are Port Royale + * and Darkstar One. */ + if (flags & WINED3D_MAP_DISCARD) { - unsigned int dirty_offset = offset, dirty_size = size; - struct wined3d_bo_address addr; + dirty_offset = 0; + dirty_size = 0; + } - /* DISCARD invalidates the entire buffer, regardless of the specified - * offset and size. Some applications also depend on the entire buffer - * being uploaded in that case. Two such applications are Port Royale - * and Darkstar One. */ - if (flags & WINED3D_MAP_DISCARD) + if (((flags & WINED3D_MAP_WRITE) && !(flags & (WINED3D_MAP_NOOVERWRITE | WINED3D_MAP_DISCARD))) + || (!(flags & WINED3D_MAP_WRITE) && (buffer->locations & WINED3D_LOCATION_SYSMEM)) + || buffer->flags & WINED3D_BUFFER_PIN_SYSMEM + || !(buffer->flags & WINED3D_BUFFER_USE_BO)) + { + if (!(buffer->locations & WINED3D_LOCATION_SYSMEM)) { - dirty_offset = 0; - dirty_size = 0; + context = context_acquire(device, NULL, 0); + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); + context_release(context); } - if (((flags & WINED3D_MAP_WRITE) && !(flags & (WINED3D_MAP_NOOVERWRITE | WINED3D_MAP_DISCARD))) - || (!(flags & WINED3D_MAP_WRITE) && (buffer->locations & WINED3D_LOCATION_SYSMEM)) - || buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) + if (flags & WINED3D_MAP_WRITE) + wined3d_buffer_invalidate_range(buffer, WINED3D_LOCATION_BUFFER, dirty_offset, dirty_size); + } + else + { + context = context_acquire(device, NULL, 0); + + if (flags & WINED3D_MAP_DISCARD) { - if (!(buffer->locations & WINED3D_LOCATION_SYSMEM)) + if (!wined3d_buffer_prepare_location(buffer, context, WINED3D_LOCATION_BUFFER)) { - context = context_acquire(device, NULL, 0); - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); context_release(context); + return E_OUTOFMEMORY; } - - if (flags & WINED3D_MAP_WRITE) - wined3d_buffer_invalidate_range(buffer, WINED3D_LOCATION_BUFFER, dirty_offset, dirty_size); + wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); } else { - context = context_acquire(device, NULL, 0); + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); + } - if (flags & WINED3D_MAP_DISCARD) - wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); - else - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); + if (flags & WINED3D_MAP_WRITE) + { + wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_SYSMEM); + buffer_invalidate_bo_range(buffer, dirty_offset, dirty_size); + } - if (flags & WINED3D_MAP_WRITE) + if ((flags & WINED3D_MAP_DISCARD) && resource->heap_memory) + wined3d_buffer_evict_sysmem(buffer); + + if (count == 1) + { + addr.buffer_object = buffer->buffer_object; + addr.addr = 0; + buffer->map_ptr = wined3d_context_map_bo_address(context, &addr, resource->size, flags); + /* We are accessing buffer->resource.client from the CS thread, + * but it's safe because the client thread will wait for the + * map to return, thus completely serializing this call with + * other client code. */ + buffer->resource.client.addr = addr; + + if (((DWORD_PTR)buffer->map_ptr) & (RESOURCE_ALIGNMENT - 1)) { - wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_SYSMEM); - buffer_invalidate_bo_range(buffer, dirty_offset, dirty_size); - } + WARN("Pointer %p is not %u byte aligned.\n", buffer->map_ptr, RESOURCE_ALIGNMENT); - if ((flags & WINED3D_MAP_DISCARD) && resource->heap_memory) - wined3d_buffer_evict_sysmem(buffer); + wined3d_context_unmap_bo_address(context, &addr, 0, NULL); + buffer->map_ptr = NULL; - if (count == 1) - { - addr.buffer_object = buffer->buffer_object; - addr.addr = 0; - buffer->map_ptr = wined3d_context_map_bo_address(context, &addr, resource->size, flags); - /* We are accessing buffer->resource.client from the CS thread, - * but it's safe because the client thread will wait for the - * map to return, thus completely serializing this call with - * other client code. */ - buffer->resource.client.addr = addr; - - if (((DWORD_PTR)buffer->map_ptr) & (RESOURCE_ALIGNMENT - 1)) + if (resource->usage & WINED3DUSAGE_DYNAMIC) + { + /* The extra copy is more expensive than not using VBOs + * at all on the NVIDIA Linux driver, which is the + * only driver that returns unaligned pointers. */ + TRACE("Dynamic buffer, dropping VBO.\n"); + wined3d_buffer_drop_bo(buffer); + } + else { - WARN("Pointer %p is not %u byte aligned.\n", buffer->map_ptr, RESOURCE_ALIGNMENT); - - wined3d_context_unmap_bo_address(context, &addr, 0, NULL); - buffer->map_ptr = NULL; - - if (resource->usage & WINED3DUSAGE_DYNAMIC) - { - /* The extra copy is more expensive than not using VBOs - * at all on the NVIDIA Linux driver, which is the - * only driver that returns unaligned pointers. */ - TRACE("Dynamic buffer, dropping VBO.\n"); - wined3d_buffer_drop_bo(buffer); - } - else - { - TRACE("Falling back to doublebuffered operation.\n"); - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); - buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; - } - TRACE("New pointer is %p.\n", resource->heap_memory); + TRACE("Falling back to doublebuffered operation.\n"); + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); + buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; } + TRACE("New pointer is %p.\n", resource->heap_memory); } - - context_release(context); } + + context_release(context); } base = buffer->map_ptr ? buffer->map_ptr : resource->heap_memory;

1 0

Zebediah Figura : wined3d: Introduce WINED3D_LOCATION_CLEARED and use it for the initial state of buffers.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 1af6cb07b2d9a42200dcf776169df06b74a11fcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=1af6cb07b2d9a42200dcf776… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 27 20:22:51 2022 -0600 wined3d: Introduce WINED3D_LOCATION_CLEARED and use it for the initial state of buffers. The practical effect of this is to defer clearing buffers until they are used. Under normal circumstances the buffer will be initially discarded, in which case we need not clear it at all, and may even avoid ever allocating sysmem. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 31 +++++++++++++++++++++++-------- dlls/wined3d/utils.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index abbef0fac41..2f3b5fd316e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -607,13 +607,28 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, switch (location) { case WINED3D_LOCATION_SYSMEM: - range.offset = 0; - range.size = buffer->resource.size; - buffer->buffer_ops->buffer_download_ranges(buffer, context, - buffer->resource.heap_memory, 0, 1, &range); + if (buffer->locations & WINED3D_LOCATION_CLEARED) + { + memset(buffer->resource.heap_memory, 0, buffer->resource.size); + } + else + { + range.offset = 0; + range.size = buffer->resource.size; + buffer->buffer_ops->buffer_download_ranges(buffer, context, + buffer->resource.heap_memory, 0, 1, &range); + } break; case WINED3D_LOCATION_BUFFER: + if (buffer->locations & WINED3D_LOCATION_CLEARED) + { + /* FIXME: Clear the buffer on the GPU if possible. */ + if (!wined3d_buffer_prepare_location(buffer, context, WINED3D_LOCATION_SYSMEM)) + return FALSE; + memset(buffer->resource.heap_memory, 0, buffer->resource.size); + } + if (!buffer->conversion_map) buffer->buffer_ops->buffer_upload_ranges(buffer, context, buffer->resource.heap_memory, 0, buffer->modified_areas, buffer->maps); @@ -650,7 +665,7 @@ DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_co TRACE("buffer %p, context %p, data %p, locations %s.\n", buffer, context, data, wined3d_debug_location(locations)); - if (locations & WINED3D_LOCATION_DISCARDED) + if (locations & (WINED3D_LOCATION_DISCARDED | WINED3D_LOCATION_CLEARED)) { locations = ((buffer->flags & WINED3D_BUFFER_USE_BO) ? WINED3D_LOCATION_BUFFER : WINED3D_LOCATION_SYSMEM); if (!wined3d_buffer_load_location(buffer, context, locations)) @@ -949,7 +964,7 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc } if (flags & WINED3D_MAP_WRITE) - wined3d_buffer_invalidate_range(buffer, WINED3D_LOCATION_BUFFER, dirty_offset, dirty_size); + wined3d_buffer_invalidate_range(buffer, ~WINED3D_LOCATION_SYSMEM, dirty_offset, dirty_size); } else { @@ -971,7 +986,7 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc if (flags & WINED3D_MAP_WRITE) { - wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_SYSMEM); + wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER); buffer_invalidate_bo_range(buffer, dirty_offset, dirty_size); } @@ -1241,7 +1256,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d } buffer->buffer_ops = buffer_ops; buffer->structure_byte_stride = desc->structure_byte_stride; - buffer->locations = data ? WINED3D_LOCATION_DISCARDED : WINED3D_LOCATION_SYSMEM; + buffer->locations = WINED3D_LOCATION_CLEARED; TRACE("buffer %p, size %#x, usage %#x, memory @ %p.\n", buffer, buffer->resource.size, buffer->resource.usage, buffer->resource.heap_memory); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e50d42ead92..bf9ae11ea13 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6864,6 +6864,7 @@ const char *wined3d_debug_location(DWORD location) #define LOCATION_TO_STR(x) if (location & x) { debug_append(&buffer, #x, " | "); location &= ~x; } LOCATION_TO_STR(WINED3D_LOCATION_DISCARDED); LOCATION_TO_STR(WINED3D_LOCATION_SYSMEM); + LOCATION_TO_STR(WINED3D_LOCATION_CLEARED); LOCATION_TO_STR(WINED3D_LOCATION_BUFFER); LOCATION_TO_STR(WINED3D_LOCATION_TEXTURE_RGB); LOCATION_TO_STR(WINED3D_LOCATION_TEXTURE_SRGB); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e28fc3b880d..1b3a13024f9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4316,6 +4316,7 @@ void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DEC #define WINED3D_LOCATION_DISCARDED 0x00000001 #define WINED3D_LOCATION_SYSMEM 0x00000002 +#define WINED3D_LOCATION_CLEARED 0x00000004 #define WINED3D_LOCATION_BUFFER 0x00000008 #define WINED3D_LOCATION_TEXTURE_RGB 0x00000010 #define WINED3D_LOCATION_TEXTURE_SRGB 0x00000020

1 0

Alex Henrie : user32: Send EVENT_OBJECT_FOCUS when the focus changes.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: ddfb6d518ee1e1bbd72e2effd10bc4850c225821 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddfb6d518ee1e1bbd72e2eff… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jan 27 22:56:24 2022 -0700 user32: Send EVENT_OBJECT_FOCUS when the focus changes. The NVDA screen reader needs this. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/focus.c | 3 ++ dlls/user32/tests/msg.c | 104 ++++++++++++++++++++++++------------------------ 2 files changed, 55 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ddfb6d518ee1e1bbd72e…

1 0