wine-commits January 2024

wine-commits@winehq.org

1 participants
711 discussions

Zebediah Figura : wined3d/spirv: Hook up sm1 interface matching.
by Alexandre Julliard 19 Jan '24

19 Jan '24

Module: wine Branch: master Commit: 504d1a45e08d0fe4ae437a593bf4fc9fcfdbe81e URL: https://gitlab.winehq.org/wine/wine/-/commit/504d1a45e08d0fe4ae437a593bf4fc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 18 18:11:27 2023 -0500 wined3d/spirv: Hook up sm1 interface matching. --- configure | 8 +++--- configure.ac | 2 +- dlls/wined3d/shader_spirv.c | 59 +++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 59 insertions(+), 10 deletions(-) diff --git a/configure b/configure index e9fc3a8ef5a..a8993e6c5c8 100755 --- a/configure +++ b/configure @@ -13293,8 +13293,8 @@ then : else $as_nop : fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vkd3d_shader_serialize_dxbc in MinGW -lvkd3d-shader" >&5 -printf %s "checking for vkd3d_shader_serialize_dxbc in MinGW -lvkd3d-shader... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vkd3d_shader_build_varying_map in MinGW -lvkd3d-shader" >&5 +printf %s "checking for vkd3d_shader_build_varying_map in MinGW -lvkd3d-shader... " >&6; } if test ${ac_cv_mingw_lib_vkd3d_shader+y} then : printf %s "(cached) " >&6 @@ -13311,11 +13311,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -char vkd3d_shader_serialize_dxbc (); +char vkd3d_shader_build_varying_map (); int main (void) { -return vkd3d_shader_serialize_dxbc (); +return vkd3d_shader_build_varying_map (); ; return 0; } diff --git a/configure.ac b/configure.ac index da661323375..9e550559589 100644 --- a/configure.ac +++ b/configure.ac @@ -1161,7 +1161,7 @@ then if test "$ac_cv_mingw_header_vkd3d_h" = "yes" -a "$ac_cv_mingw_header_vkd3d_shader_h" = "yes" then WINE_CHECK_MINGW_LIB(vkd3d,vkd3d_set_log_callback,[:],[:],[$VKD3D_PE_LIBS]) - WINE_CHECK_MINGW_LIB(vkd3d-shader,vkd3d_shader_serialize_dxbc,[:],[:],[$VKD3D_PE_LIBS]) + WINE_CHECK_MINGW_LIB(vkd3d-shader,vkd3d_shader_build_varying_map,[:],[:],[$VKD3D_PE_LIBS]) if test "$ac_cv_mingw_lib_vkd3d" = "no" -o "$ac_cv_mingw_lib_vkd3d_shader" = "no" then VKD3D_PE_CFLAGS="" diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index f2e220beed2..e1c50a1179c 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -53,10 +53,17 @@ struct shader_spirv_priv struct shader_spirv_resource_bindings bindings; }; +#define MAX_SM1_INTER_STAGE_VARYINGS 12 + struct shader_spirv_compile_arguments { union { + struct + { + struct vkd3d_shader_varying_map varying_map[MAX_SM1_INTER_STAGE_VARYINGS]; + unsigned int varying_count; + } vs; struct { uint32_t alpha_swizzle; @@ -81,6 +88,7 @@ struct shader_spirv_graphics_program_vk SIZE_T variants_size, variant_count; struct vkd3d_shader_scan_descriptor_info descriptor_info; + struct vkd3d_shader_scan_signature_info signature_info; }; struct shader_spirv_compute_program_vk @@ -95,6 +103,7 @@ struct shader_spirv_compute_program_vk struct wined3d_shader_spirv_compile_args { + struct vkd3d_shader_varying_map_info varying_map; struct vkd3d_shader_spirv_target_info spirv_target; struct vkd3d_shader_parameter sample_count; unsigned int ps_alpha_swizzle[WINED3D_MAX_RENDER_TARGETS]; @@ -155,6 +164,24 @@ static void shader_spirv_compile_arguments_init(struct shader_spirv_compile_argu args->u.fs.dual_source_blending = state->blend_state && state->blend_state->dual_source; break; + case WINED3D_SHADER_TYPE_VERTEX: + { + struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL]; + + if (ps) + { + struct shader_spirv_graphics_program_vk *vs_program = shader->backend_data; + struct shader_spirv_graphics_program_vk *ps_program = ps->backend_data; + + if (ps_program->signature_info.input.element_count > ARRAY_SIZE(args->u.vs.varying_map)) + ERR("Unexpected inter-stage varying count %u.\n", ps_program->signature_info.input.element_count); + if (shader->reg_maps.shader_version.major < 4) + vkd3d_shader_build_varying_map(&vs_program->signature_info.output, + &ps_program->signature_info.input, &args->u.vs.varying_count, args->u.vs.varying_map); + } + break; + } + default: break; } @@ -162,7 +189,8 @@ static void shader_spirv_compile_arguments_init(struct shader_spirv_compile_argu static void shader_spirv_init_compile_args(struct wined3d_shader_spirv_compile_args *args, struct vkd3d_shader_interface_info *vkd3d_interface, enum vkd3d_shader_spirv_environment environment, - enum wined3d_shader_type shader_type, const struct shader_spirv_compile_arguments *compile_args) + enum wined3d_shader_type shader_type, enum vkd3d_shader_source_type source_type, + const struct shader_spirv_compile_arguments *compile_args) { unsigned int i; @@ -199,6 +227,18 @@ static void shader_spirv_init_compile_args(struct wined3d_shader_spirv_compile_a args->spirv_target.output_swizzles = args->ps_alpha_swizzle; args->spirv_target.output_swizzle_count = ARRAY_SIZE(args->ps_alpha_swizzle); } + else if (shader_type == WINED3D_SHADER_TYPE_VERTEX) + { + if (source_type == VKD3D_SHADER_SOURCE_D3D_BYTECODE) + { + args->spirv_target.next = &args->varying_map; + + args->varying_map.type = VKD3D_SHADER_STRUCTURE_TYPE_VARYING_MAP_INFO; + args->varying_map.next = vkd3d_interface; + args->varying_map.varying_map = compile_args->u.vs.varying_map; + args->varying_map.varying_count = compile_args->u.vs.varying_count; + } + } } static void shader_spirv_init_shader_interface_vk(struct wined3d_shader_spirv_shader_interface *iface, @@ -246,7 +286,7 @@ static VkShaderModule shader_spirv_compile_shader(struct wined3d_context_vk *con shader_spirv_init_shader_interface_vk(&iface, bindings, so_desc); shader_spirv_init_compile_args(&compile_args, &iface.vkd3d_interface, - VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0, shader_type, args); + VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0, shader_type, source_type, args); info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = &compile_args.spirv_target; @@ -687,7 +727,8 @@ static bool shader_spirv_resource_bindings_init(struct shader_spirv_resource_bin } static void shader_spirv_scan_shader(struct wined3d_shader *shader, - struct vkd3d_shader_scan_descriptor_info *descriptor_info) + struct vkd3d_shader_scan_descriptor_info *descriptor_info, + struct vkd3d_shader_scan_signature_info *signature_info) { struct vkd3d_shader_compile_info info; char *messages; @@ -696,6 +737,13 @@ static void shader_spirv_scan_shader(struct wined3d_shader *shader, memset(descriptor_info, 0, sizeof(*descriptor_info)); descriptor_info->type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_DESCRIPTOR_INFO; + if (signature_info) + { + memset(signature_info, 0, sizeof(*signature_info)); + signature_info->type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_SIGNATURE_INFO; + descriptor_info->next = signature_info; + } + info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = descriptor_info; info.source.code = shader->byte_code; @@ -736,7 +784,7 @@ static void shader_spirv_precompile_compute(struct wined3d_shader *shader) shader->backend_data = program_vk; } - shader_spirv_scan_shader(shader, &program_vk->descriptor_info); + shader_spirv_scan_shader(shader, &program_vk->descriptor_info, NULL); } static void shader_spirv_precompile(void *shader_priv, struct wined3d_shader *shader) @@ -758,7 +806,7 @@ static void shader_spirv_precompile(void *shader_priv, struct wined3d_shader *sh shader->backend_data = program_vk; } - shader_spirv_scan_shader(shader, &program_vk->descriptor_info); + shader_spirv_scan_shader(shader, &program_vk->descriptor_info, &program_vk->signature_info); } static void shader_spirv_select(void *shader_priv, struct wined3d_context *context, @@ -967,6 +1015,7 @@ static void shader_spirv_destroy(struct wined3d_shader *shader) } heap_free(program_vk->variants); vkd3d_shader_free_scan_descriptor_info(&program_vk->descriptor_info); + vkd3d_shader_free_scan_signature_info(&program_vk->signature_info); shader->backend_data = NULL; heap_free(program_vk);

1 0

Fan Wenjie : wined3d: Compile sm1 bytecode to spirv.
by Alexandre Julliard 19 Jan '24

19 Jan '24

Module: wine Branch: master Commit: 1474f5cc47d9f056382f04ea5dff3314c6d181b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/1474f5cc47d9f056382f04ea5dff33… Author: Fan Wenjie <fanwj(a)mail.ustc.edu.cn> Date: Wed Nov 2 21:31:06 2022 +0800 wined3d: Compile sm1 bytecode to spirv. --- dlls/wined3d/shader.c | 15 +++++++-------- dlls/wined3d/shader_spirv.c | 33 +++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 428389a7177..1f0fe13402c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2395,7 +2395,6 @@ static void shader_trace(const void *code, size_t size, enum vkd3d_shader_source static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device *device, const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { - enum vkd3d_shader_source_type source_type; HRESULT hr; TRACE("byte_code %p, byte_code_size %#lx.\n", desc->byte_code, (long)desc->byte_code_size); @@ -2424,8 +2423,8 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device const DWORD *ptr; void *fe_data; - source_type = VKD3D_SHADER_SOURCE_D3D_BYTECODE; - if (!(shader->frontend = shader_select_frontend(source_type))) + shader->source_type = VKD3D_SHADER_SOURCE_D3D_BYTECODE; + if (!(shader->frontend = shader_select_frontend(shader->source_type))) { FIXME("Unable to find frontend for shader.\n"); hr = WINED3DERR_INVALIDCALL; @@ -2471,10 +2470,10 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device shader->byte_code_size = desc->byte_code_size; max_version = shader_max_version_from_feature_level(device->cs->c.state->feature_level); - if (FAILED(hr = wined3d_shader_extract_from_dxbc(shader, max_version, &source_type))) + if (FAILED(hr = wined3d_shader_extract_from_dxbc(shader, max_version, &shader->source_type))) goto fail; - if (!(shader->frontend = shader_select_frontend(source_type))) + if (!(shader->frontend = shader_select_frontend(shader->source_type))) { FIXME("Unable to find frontend for shader.\n"); hr = WINED3DERR_INVALIDCALL; @@ -2484,10 +2483,10 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device if (TRACE_ON(d3d_shader)) { - if (source_type == VKD3D_SHADER_SOURCE_D3D_BYTECODE) - shader_trace(shader->function, shader->functionLength, source_type); + if (shader->source_type == VKD3D_SHADER_SOURCE_D3D_BYTECODE) + shader_trace(shader->function, shader->functionLength, shader->source_type); else - shader_trace(shader->byte_code, shader->byte_code_size, source_type); + shader_trace(shader->byte_code, shader->byte_code_size, shader->source_type); } diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index b5b0e1f0462..f2e220beed2 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -228,9 +228,9 @@ static void shader_spirv_init_shader_interface_vk(struct wined3d_shader_spirv_sh } static VkShaderModule shader_spirv_compile_shader(struct wined3d_context_vk *context_vk, - const struct wined3d_shader_desc *shader_desc, enum wined3d_shader_type shader_type, - const struct shader_spirv_compile_arguments *args, const struct shader_spirv_resource_bindings *bindings, - const struct wined3d_stream_output_desc *so_desc) + const struct wined3d_shader_desc *shader_desc, enum vkd3d_shader_source_type source_type, + enum wined3d_shader_type shader_type, const struct shader_spirv_compile_arguments *args, + const struct shader_spirv_resource_bindings *bindings, const struct wined3d_stream_output_desc *so_desc) { struct wined3d_shader_spirv_compile_args compile_args; struct wined3d_shader_spirv_shader_interface iface; @@ -252,7 +252,7 @@ static VkShaderModule shader_spirv_compile_shader(struct wined3d_context_vk *con info.next = &compile_args.spirv_target; info.source.code = shader_desc->byte_code; info.source.size = shader_desc->byte_code_size; - info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + info.source_type = source_type; info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; info.options = spirv_compile_options; info.option_count = ARRAY_SIZE(spirv_compile_options); @@ -338,11 +338,19 @@ static struct shader_spirv_graphics_program_variant_vk *shader_spirv_find_graphi variant_vk->compile_args = args; variant_vk->binding_base = binding_base; - shader_desc.byte_code = shader->byte_code; - shader_desc.byte_code_size = shader->byte_code_size; + if (shader->source_type == VKD3D_SHADER_SOURCE_D3D_BYTECODE) + { + shader_desc.byte_code = shader->function; + shader_desc.byte_code_size = shader->functionLength; + } + else + { + shader_desc.byte_code = shader->byte_code; + shader_desc.byte_code_size = shader->byte_code_size; + } - if (!(variant_vk->vk_module = shader_spirv_compile_shader(context_vk, &shader_desc, shader_type, &args, - bindings, so_desc))) + if (!(variant_vk->vk_module = shader_spirv_compile_shader(context_vk, &shader_desc, + shader->source_type, shader_type, &args, bindings, so_desc))) return NULL; ++program_vk->variant_count; @@ -370,8 +378,8 @@ static struct shader_spirv_compute_program_vk *shader_spirv_find_compute_program shader_desc.byte_code = shader->byte_code; shader_desc.byte_code_size = shader->byte_code_size; - if (!(program->vk_module = shader_spirv_compile_shader(context_vk, &shader_desc, WINED3D_SHADER_TYPE_COMPUTE, - NULL, bindings, NULL))) + if (!(program->vk_module = shader_spirv_compile_shader(context_vk, &shader_desc, + shader->source_type, WINED3D_SHADER_TYPE_COMPUTE, NULL, bindings, NULL))) return NULL; if (!(layout = wined3d_context_vk_get_pipeline_layout(context_vk, @@ -692,7 +700,7 @@ static void shader_spirv_scan_shader(struct wined3d_shader *shader, info.next = descriptor_info; info.source.code = shader->byte_code; info.source.size = shader->byte_code_size; - info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + info.source_type = shader->source_type; info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; info.options = spirv_compile_options; info.option_count = ARRAY_SIZE(spirv_compile_options); @@ -1049,7 +1057,8 @@ static uint64_t shader_spirv_compile(struct wined3d_context *context, const stru enum wined3d_shader_type shader_type) { struct shader_spirv_resource_bindings bindings = {0}; - return (uint64_t)shader_spirv_compile_shader(wined3d_context_vk(context), shader_desc, shader_type, NULL, &bindings, NULL); + return (uint64_t)shader_spirv_compile_shader(wined3d_context_vk(context), shader_desc, + VKD3D_SHADER_SOURCE_DXBC_TPF, shader_type, NULL, &bindings, NULL); } static const struct wined3d_shader_backend_ops spirv_shader_backend_vk = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5a35ca88a7b..ff08a7f837f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4251,6 +4251,7 @@ struct wined3d_shader void *byte_code; unsigned int byte_code_size; BOOL load_local_constsF; + enum vkd3d_shader_source_type source_type; const struct wined3d_shader_frontend *frontend; void *frontend_data; void *backend_data;

1 0

Zebediah Figura : wined3d: Hook up push constants for Vulkan.
by Alexandre Julliard 19 Jan '24

19 Jan '24

Module: wine Branch: master Commit: 9e094def75c435065919b5e13484e136ca1784ad URL: https://gitlab.winehq.org/wine/wine/-/commit/9e094def75c435065919b5e13484e1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jul 2 13:28:29 2023 -0500 wined3d: Hook up push constants for Vulkan. --- dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/cs.c | 35 ++++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 3e6604c035e..0e6a7babfb1 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2322,6 +2322,7 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ d3d_info->subpixel_viewport = true; d3d_info->fences = true; d3d_info->persistent_map = true; + d3d_info->gpu_push_constants = true; /* Like GL, Vulkan doesn't explicitly specify a filling convention and only mandates that a * shared edge of two adjacent triangles generate a fragment for exactly one of the triangles. diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 37d160d8f25..fb114fb0b78 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2144,29 +2144,39 @@ static const struct push_constant_info size_t size; unsigned int max_count; DWORD mask; + enum wined3d_shader_type shader_type; + enum vkd3d_shader_d3dbc_constant_register shader_binding; } wined3d_cs_push_constant_info[] = { - [WINED3D_PUSH_CONSTANTS_VS_F] = {sizeof(struct wined3d_vec4), WINED3D_MAX_VS_CONSTS_F, WINED3D_SHADER_CONST_VS_F}, - [WINED3D_PUSH_CONSTANTS_PS_F] = {sizeof(struct wined3d_vec4), WINED3D_MAX_PS_CONSTS_F, WINED3D_SHADER_CONST_PS_F}, - [WINED3D_PUSH_CONSTANTS_VS_I] = {sizeof(struct wined3d_ivec4), WINED3D_MAX_CONSTS_I, WINED3D_SHADER_CONST_VS_I}, - [WINED3D_PUSH_CONSTANTS_PS_I] = {sizeof(struct wined3d_ivec4), WINED3D_MAX_CONSTS_I, WINED3D_SHADER_CONST_PS_I}, - [WINED3D_PUSH_CONSTANTS_VS_B] = {sizeof(BOOL), WINED3D_MAX_CONSTS_B, WINED3D_SHADER_CONST_VS_B}, - [WINED3D_PUSH_CONSTANTS_PS_B] = {sizeof(BOOL), WINED3D_MAX_CONSTS_B, WINED3D_SHADER_CONST_PS_B}, + [WINED3D_PUSH_CONSTANTS_VS_F] = {sizeof(struct wined3d_vec4), WINED3D_MAX_VS_CONSTS_F, WINED3D_SHADER_CONST_VS_F, WINED3D_SHADER_TYPE_VERTEX, VKD3D_SHADER_D3DBC_FLOAT_CONSTANT_REGISTER}, + [WINED3D_PUSH_CONSTANTS_PS_F] = {sizeof(struct wined3d_vec4), WINED3D_MAX_PS_CONSTS_F, WINED3D_SHADER_CONST_PS_F, WINED3D_SHADER_TYPE_PIXEL, VKD3D_SHADER_D3DBC_FLOAT_CONSTANT_REGISTER}, + [WINED3D_PUSH_CONSTANTS_VS_I] = {sizeof(struct wined3d_ivec4), WINED3D_MAX_CONSTS_I, WINED3D_SHADER_CONST_VS_I, WINED3D_SHADER_TYPE_VERTEX, VKD3D_SHADER_D3DBC_INT_CONSTANT_REGISTER}, + [WINED3D_PUSH_CONSTANTS_PS_I] = {sizeof(struct wined3d_ivec4), WINED3D_MAX_CONSTS_I, WINED3D_SHADER_CONST_PS_I, WINED3D_SHADER_TYPE_PIXEL, VKD3D_SHADER_D3DBC_INT_CONSTANT_REGISTER}, + [WINED3D_PUSH_CONSTANTS_VS_B] = {sizeof(BOOL), WINED3D_MAX_CONSTS_B, WINED3D_SHADER_CONST_VS_B, WINED3D_SHADER_TYPE_VERTEX, VKD3D_SHADER_D3DBC_BOOL_CONSTANT_REGISTER}, + [WINED3D_PUSH_CONSTANTS_PS_B] = {sizeof(BOOL), WINED3D_MAX_CONSTS_B, WINED3D_SHADER_CONST_PS_B, WINED3D_SHADER_TYPE_PIXEL, VKD3D_SHADER_D3DBC_BOOL_CONSTANT_REGISTER}, }; -static bool prepare_push_constant_buffer(struct wined3d_device *device, enum wined3d_push_constants type) +static bool prepare_push_constant_buffer(struct wined3d_device_context *context, enum wined3d_push_constants type) { const struct push_constant_info *info = &wined3d_cs_push_constant_info[type]; + struct wined3d_device *device = context->device; + bool gpu = device->adapter->d3d_info.gpu_push_constants; HRESULT hr; - const struct wined3d_buffer_desc desc = + struct wined3d_buffer_desc desc = { .byte_width = info->max_count * info->size, .bind_flags = 0, .access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W, }; + if (gpu) + { + desc.bind_flags = WINED3D_BIND_CONSTANT_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + } + if (!device->push_constants[type] && FAILED(hr = wined3d_buffer_create(device, &desc, NULL, NULL, &wined3d_null_parent_ops, &device->push_constants[type]))) { @@ -2174,6 +2184,13 @@ static bool prepare_push_constant_buffer(struct wined3d_device *device, enum win return false; } + if (gpu) + { + struct wined3d_constant_buffer_state state = {.buffer = device->push_constants[type], .size = desc.byte_width}; + + wined3d_device_context_emit_set_constant_buffers(context, info->shader_type, info->shader_binding, 1, &state); + } + return true; } @@ -2219,7 +2236,7 @@ void wined3d_device_context_push_constants(struct wined3d_device_context *contex unsigned int byte_size = count * info->size; struct wined3d_box box; - if (!prepare_push_constant_buffer(context->device, type)) + if (!prepare_push_constant_buffer(context, type)) return; wined3d_box_set(&box, byte_offset, 0, byte_offset + byte_size, 1, 0, 1); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 238456e78d8..5a35ca88a7b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -236,6 +236,7 @@ struct wined3d_d3d_info uint32_t subpixel_viewport : 1; uint32_t fences : 1; uint32_t persistent_map : 1; + uint32_t gpu_push_constants : 1; enum wined3d_feature_level feature_level; DWORD multisample_draw_location;

1 0

Brendan Shanks : wined3d: Update reported AMD driver version.
by Alexandre Julliard 19 Jan '24

19 Jan '24

Module: wine Branch: master Commit: f201a609a09949e737836c677f99fce58a2cc74e URL: https://gitlab.winehq.org/wine/wine/-/commit/f201a609a09949e737836c677f99fc… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jan 9 11:09:13 2024 -0800 wined3d: Update reported AMD driver version. Satisfies driver version check in Counter Strike 2. --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ab4fa04b3cf..11d829c2756 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -289,7 +289,7 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_AMD_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 10, 1280}, {DRIVER_AMD_R300, DRIVER_MODEL_NT6X, "atiumdag.dll", 10, 741 }, {DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 10, 1280}, - {DRIVER_AMD_RX, DRIVER_MODEL_NT6X, "aticfx32.dll", 21023, 2010}, /* Adrenalin 23.7.2 */ + {DRIVER_AMD_RX, DRIVER_MODEL_NT6X, "aticfx32.dll", 23013, 1023}, /* Adrenalin 23.12.1 */ /* Intel * The drivers are unified but not all versions support all GPUs. At some point the 2k/xp

1 0

Nikolay Sivov : mf/tests: Fully cleanup when skipping tests.
by Alexandre Julliard 19 Jan '24

19 Jan '24

Module: wine Branch: master Commit: 21bbd34d35034eb1c0291445cb754e491702c84e URL: https://gitlab.winehq.org/wine/wine/-/commit/21bbd34d35034eb1c0291445cb754e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 18 23:44:45 2024 +0100 mf/tests: Fully cleanup when skipping tests. --- dlls/mf/tests/mf.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 13b55b1f836..1fa832e11fa 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3733,6 +3733,23 @@ static void test_topology_loader_evr(void) hr = CoInitialize(NULL); ok(hr == S_OK, "Failed to initialize, hr %#lx.\n", hr); + /* EVR sink node. */ + window = create_window(); + + hr = MFCreateVideoRendererActivate(window, &activate); + ok(hr == S_OK, "Failed to create activate object, hr %#lx.\n", hr); + + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); + if (FAILED(hr)) + { + skip("Failed to create an EVR sink, skipping tests.\n"); + DestroyWindow(window); + IMFActivate_Release(activate); + CoUninitialize(); + return; + } + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFCreateTopoLoader(&loader); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -3749,21 +3766,6 @@ static void test_topology_loader_evr(void) IMFPresentationDescriptor_Release(pd); IMFStreamDescriptor_Release(sd); - /* EVR sink node. */ - window = create_window(); - - hr = MFCreateVideoRendererActivate(window, &activate); - ok(hr == S_OK, "Failed to create activate object, hr %#lx.\n", hr); - - hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); - if (FAILED(hr)) - { - skip("Failed to create an EVR sink, skipping tests.\n"); - DestroyWindow(window); - IMFActivate_Release(activate); - return; - } - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaSink_GetStreamSinkById(sink, 0, &stream_sink); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Alexandre Julliard : ntdll: Add NtCompareTokens syscall for ARM64EC.
by Alexandre Julliard 19 Jan '24

19 Jan '24

Module: wine Branch: master Commit: 7aa982f88b22af06691053beb7c083d34d881d09 URL: https://gitlab.winehq.org/wine/wine/-/commit/7aa982f88b22af06691053beb7c083… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 19 16:22:59 2024 +0100 ntdll: Add NtCompareTokens syscall for ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 3d6bc39468d..1bfd5716d07 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -376,6 +376,11 @@ NTSTATUS SYSCALL_API NtCompareObjects( HANDLE first, HANDLE second ) __ASM_SYSCALL_FUNC( __id_NtCompareObjects ); } +NTSTATUS SYSCALL_API NtCompareTokens( HANDLE first, HANDLE second, BOOLEAN *equal ) +{ + __ASM_SYSCALL_FUNC( __id_NtCompareTokens ); +} + NTSTATUS SYSCALL_API NtCompleteConnectPort( HANDLE handle ) { __ASM_SYSCALL_FUNC( __id_NtCompleteConnectPort );

1 0

Alexandre Julliard : opengl32: Return a proper NTSTATUS in the debug callback.
by Alexandre Julliard 19 Jan '24

19 Jan '24

Module: wine Branch: master Commit: 4b5b478de9890c5b840918f3730f37fd3f02121a URL: https://gitlab.winehq.org/wine/wine/-/commit/4b5b478de9890c5b840918f3730f37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 19 14:36:56 2024 +0100 opengl32: Return a proper NTSTATUS in the debug callback. --- dlls/opengl32/wgl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 40602d7d22d..a1c29a84fae 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1285,11 +1285,12 @@ GLboolean WINAPI glUnmapNamedBufferEXT( GLuint buffer ) return gl_unmap_named_buffer( unix_glUnmapNamedBufferEXT, buffer ); } -static BOOL WINAPI call_opengl_debug_message_callback( struct wine_gl_debug_message_params *params, ULONG size ) +static NTSTATUS WINAPI call_opengl_debug_message_callback( void *args, ULONG size ) { + struct wine_gl_debug_message_params *params = args; params->user_callback( params->source, params->type, params->id, params->severity, params->length, params->message, params->user_data ); - return TRUE; + return STATUS_SUCCESS; } /***********************************************************************

1 0

Alexandre Julliard : user32: Return a proper NTSTATUS in all user callbacks.
by Alexandre Julliard 19 Jan '24

19 Jan '24

Module: wine Branch: master Commit: b26d1278971ca13a0078104570bec3661e2cda01 URL: https://gitlab.winehq.org/wine/wine/-/commit/b26d1278971ca13a0078104570bec3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 19 14:30:48 2024 +0100 user32: Return a proper NTSTATUS in all user callbacks. --- dlls/user.exe16/message.c | 4 +++- dlls/user32/class.c | 6 ++++-- dlls/user32/hook.c | 8 +++++--- dlls/user32/user_main.c | 23 ++++++++++++++--------- dlls/user32/user_private.h | 8 ++++---- dlls/user32/winproc.c | 14 +++++++++----- dlls/win32u/defwnd.c | 5 ++--- dlls/win32u/imm.c | 5 ++--- dlls/win32u/win32u_private.h | 2 +- 9 files changed, 44 insertions(+), 31 deletions(-)

1 0

Alexandre Julliard : user32: Return a proper NTSTATUS in the post DDE message callback.
by Alexandre Julliard 19 Jan '24

19 Jan '24

Module: wine Branch: master Commit: 621bcd0db27372166c1ac5f7887b04e2f8b31ada URL: https://gitlab.winehq.org/wine/wine/-/commit/621bcd0db27372166c1ac5f7887b04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 19 14:28:26 2024 +0100 user32: Return a proper NTSTATUS in the post DDE message callback. --- dlls/user32/message.c | 21 ++++++--------------- dlls/user32/user_private.h | 4 ++-- dlls/win32u/message.c | 16 +++++++--------- 3 files changed, 15 insertions(+), 26 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 07dfbdb0f85..51e908d4dcd 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -333,7 +333,7 @@ static HGLOBAL dde_get_pair(HGLOBAL shm) * * Post a DDE message */ -BOOL post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid, DWORD type ) +NTSTATUS post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid, DWORD type ) { void* ptr = NULL; int size = 0; @@ -344,7 +344,7 @@ BOOL post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD ULONGLONG hpack; if (!UnpackDDElParam( msg, lparam, &uiLo, &uiHi )) - return FALSE; + return STATUS_INVALID_PARAMETER; lp = lparam; switch (msg) @@ -386,9 +386,9 @@ BOOL post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD if ((msg == WM_DDE_ADVISE && size < sizeof(DDEADVISE)) || (msg == WM_DDE_DATA && size < FIELD_OFFSET(DDEDATA, Value)) || (msg == WM_DDE_POKE && size < FIELD_OFFSET(DDEPOKE, Value))) - return FALSE; + return STATUS_INVALID_PARAMETER; } - else if (msg != WM_DDE_DATA) return FALSE; + else if (msg != WM_DDE_DATA) return STATUS_INVALID_PARAMETER; lp = uiHi; if (uiLo) @@ -428,21 +428,12 @@ BOOL post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD req->lparam = lp; req->timeout = TIMEOUT_INFINITE; if (size) wine_server_add_data( req, ptr, size ); - if ((res = wine_server_call( req ))) - { - if (res == STATUS_INVALID_PARAMETER) - /* FIXME: find a STATUS_ value for this one */ - SetLastError( ERROR_INVALID_THREAD_ID ); - else - SetLastError( RtlNtStatusToDosError(res) ); - } - else - FreeDDElParam( msg, lparam ); + if (!(res = wine_server_call( req ))) FreeDDElParam( msg, lparam ); } SERVER_END_REQ; if (hunlock) GlobalUnlock(hunlock); - return !res; + return res; } /*********************************************************************** diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 40d67ac468d..102fee69af2 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -45,8 +45,8 @@ struct wm_char_mapping_data extern HMODULE user32_module; -extern BOOL post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid, - DWORD type ); +extern NTSTATUS post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid, + DWORD type ); extern BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, const void *buffer, size_t size ); extern void free_cached_data( UINT format, HANDLE handle ); diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 2b6df6cc72c..21d3af8c5fc 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -3299,7 +3299,8 @@ static BOOL put_message_in_queue( const struct send_message_info *info, size_t * params.lparam = info->lparam; params.dest_tid = info->dest_tid; params.type = info->type; - return KeUserModeCallback( NtUserPostDDEMessage, &params, sizeof(params), &ret_ptr, &ret_len ); + res = KeUserModeCallback( NtUserPostDDEMessage, &params, sizeof(params), &ret_ptr, &ret_len ); + goto done; } SERVER_START_REQ( send_message ) @@ -3315,16 +3316,13 @@ static BOOL put_message_in_queue( const struct send_message_info *info, size_t * if (info->flags & SMTO_ABORTIFHUNG) req->flags |= SEND_MSG_ABORT_IF_HUNG; for (i = 0; i < data.count; i++) wine_server_add_data( req, data.data[i], data.size[i] ); - if ((res = wine_server_call( req ))) - { - if (res == STATUS_INVALID_PARAMETER) - /* FIXME: find a STATUS_ value for this one */ - RtlSetLastWin32Error( ERROR_INVALID_THREAD_ID ); - else - RtlSetLastWin32Error( RtlNtStatusToDosError(res) ); - } + res = wine_server_call( req ); } SERVER_END_REQ; + +done: + if (res == STATUS_INVALID_PARAMETER) res = STATUS_NO_LDT; + if (res) RtlSetLastWin32Error( RtlNtStatusToDosError(res) ); return !res; }

1 0

Alexandre Julliard : user32: Return a proper NTSTATUS in the load driver callback.
by Alexandre Julliard 19 Jan '24

19 Jan '24

Module: wine Branch: master Commit: d06192afe92f94f349cc09f73695930876c7d300 URL: https://gitlab.winehq.org/wine/wine/-/commit/d06192afe92f94f349cc09f7369593… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 19 14:23:24 2024 +0100 user32: Return a proper NTSTATUS in the load driver callback. --- dlls/user32/user_main.c | 9 +++++++-- dlls/win32u/driver.c | 3 +-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index f1b169a9741..c27e6add071 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -184,9 +184,14 @@ static NTSTATUS WINAPI User32RenderSsynthesizedFormat( const struct render_synth return 0; } -static BOOL WINAPI User32LoadDriver( const WCHAR *path, ULONG size ) +static NTSTATUS WINAPI User32LoadDriver( void *args, ULONG size ) { - return LoadLibraryW( path ) != NULL; + const WCHAR *path = args; + UNICODE_STRING str; + HMODULE module; + + RtlInitUnicodeString( &str, path ); + return LdrLoadDll( L"c:\\windows\\system32", 0, &str, &module ); } static NTSTATUS WINAPI User32UnpackDDEMessage( void *args, ULONG size ) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index fcfb7d55d54..7fcdbc4c383 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1019,8 +1019,7 @@ static BOOL load_desktop_driver( HWND hwnd ) { void *ret_ptr; ULONG ret_len; - ret = KeUserModeCallback( NtUserLoadDriver, info->Data, info->DataLength, - &ret_ptr, &ret_len ); + ret = !KeUserModeCallback( NtUserLoadDriver, info->Data, info->DataLength, &ret_ptr, &ret_len ); } else {

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
72
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 January 2024