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

Henri Verbeet : vkd3d-shader: Rename the vkd3d_shader_domain_shader_compile_arguments structure.
by Alexandre Julliard June 18, 2020

June 18, 2020

Module: vkd3d Branch: master Commit: 8292efdbed8d5e6892ffb0e275ec047f18b330d0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8292efdbed8d5e6892ffb0e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 18 19:10:48 2020 +0430 vkd3d-shader: Rename the vkd3d_shader_domain_shader_compile_arguments structure. To vkd3d_shader_spirv_domain_shader_target_info. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/spirv.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 2b07906..1f58ebd 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -32,9 +32,9 @@ enum vkd3d_shader_structure_type /* 1.2 */ VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO, VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO, + VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_DOMAIN_SHADER_TARGET_INFO, VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO, VKD3D_SHADER_STRUCTURE_TYPE_TRANSFORM_FEEDBACK_INFO, - VKD3D_SHADER_STRUCTURE_TYPE_DOMAIN_SHADER_COMPILE_ARGUMENTS, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), }; @@ -269,7 +269,7 @@ enum vkd3d_tessellator_partitioning }; /* Extends vkd3d_shader_spirv_target_info. */ -struct vkd3d_shader_domain_shader_compile_arguments +struct vkd3d_shader_spirv_domain_shader_target_info { enum vkd3d_shader_structure_type type; const void *next; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 31dcc4f..9bcb59d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -8671,7 +8671,7 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_shader_code *spirv) { const struct vkd3d_shader_spirv_target_info *info = compiler->spirv_target_info; - const struct vkd3d_shader_domain_shader_compile_arguments *ds_args; + const struct vkd3d_shader_spirv_domain_shader_target_info *ds_info; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_phase *phase; @@ -8685,14 +8685,14 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, if (compiler->shader_type == VKD3D_SHADER_TYPE_DOMAIN) { - if (info && (ds_args = vkd3d_find_struct(info->next, DOMAIN_SHADER_COMPILE_ARGUMENTS))) + if (info && (ds_info = vkd3d_find_struct(info->next, SPIRV_DOMAIN_SHADER_TARGET_INFO))) { - vkd3d_dxbc_compiler_emit_tessellator_output_primitive(compiler, ds_args->output_primitive); - vkd3d_dxbc_compiler_emit_tessellator_partitioning(compiler, ds_args->partitioning); + vkd3d_dxbc_compiler_emit_tessellator_output_primitive(compiler, ds_info->output_primitive); + vkd3d_dxbc_compiler_emit_tessellator_partitioning(compiler, ds_info->partitioning); } else if (vkd3d_dxbc_compiler_is_opengl_target(compiler)) { - ERR("vkd3d_shader_domain_shader_compile_arguments are required for " + ERR("vkd3d_shader_spirv_domain_shader_target_info is required for " "OpenGL tessellation evaluation shader.\n"); } }

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_shader_target enumeration to vkd3d_shader_spirv_environment.
by Alexandre Julliard June 18, 2020

June 18, 2020

Module: vkd3d Branch: master Commit: 425dab80b8209034e7026443a25b51ab7b20a161 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=425dab80b8209034e702644… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 18 19:10:50 2020 +0430 vkd3d-shader: Rename the vkd3d_shader_target enumeration to vkd3d_shader_spirv_environment. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 12 ++++---- libs/vkd3d-shader/spirv.c | 52 +++++++++++++++++++---------------- libs/vkd3d-shader/vkd3d_shader_main.c | 8 +++--- libs/vkd3d/state.c | 2 +- 4 files changed, 39 insertions(+), 35 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 09b77b2..1fa39b9 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -218,13 +218,13 @@ struct vkd3d_shader_transform_feedback_info unsigned int buffer_stride_count; }; -enum vkd3d_shader_target +enum vkd3d_shader_spirv_environment { - VKD3D_SHADER_TARGET_NONE, - VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5, - VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0, /* default target */ + VKD3D_SHADER_SPIRV_ENVIRONMENT_NONE, + VKD3D_SHADER_SPIRV_ENVIRONMENT_OPENGL_4_5, + VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0, /* default target */ - VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TARGET), + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SPIRV_ENVIRONMENT), }; enum vkd3d_shader_target_extension @@ -239,7 +239,7 @@ struct vkd3d_shader_spirv_target_info enum vkd3d_shader_structure_type type; const void *next; - enum vkd3d_shader_target target; + enum vkd3d_shader_spirv_environment environment; unsigned int target_extension_count; const enum vkd3d_shader_target_extension *target_extensions; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9bcb59d..bcc208a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -36,21 +36,21 @@ #ifdef HAVE_SPIRV_TOOLS # include "spirv-tools/libspirv.h" -static spv_target_env spv_target_env_from_vkd3d(enum vkd3d_shader_target target) +static spv_target_env spv_target_env_from_vkd3d(enum vkd3d_shader_spirv_environment environment) { - switch (target) + switch (environment) { - case VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5: + case VKD3D_SHADER_SPIRV_ENVIRONMENT_OPENGL_4_5: return SPV_ENV_OPENGL_4_5; - case VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0: + case VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0: return SPV_ENV_VULKAN_1_0; default: - ERR("Invalid shader target %#x.\n", target); + ERR("Invalid environment %#x.\n", environment); return SPV_ENV_VULKAN_1_0; } } -static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, enum vkd3d_shader_target target) +static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, enum vkd3d_shader_spirv_environment environment) { const static uint32_t options = SPV_BINARY_TO_TEXT_OPTION_FRIENDLY_NAMES | SPV_BINARY_TO_TEXT_OPTION_INDENT; @@ -59,7 +59,7 @@ static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, enum vkd3d_s spv_context context; spv_result_t ret; - context = spvContextCreate(spv_target_env_from_vkd3d(target)); + context = spvContextCreate(spv_target_env_from_vkd3d(environment)); if (!(ret = spvBinaryToText(context, spirv->code, spirv->size / sizeof(uint32_t), options, &text, &diagnostic))) @@ -82,13 +82,14 @@ static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, enum vkd3d_s spvContextDestroy(context); } -static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, enum vkd3d_shader_target target) +static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, + enum vkd3d_shader_spirv_environment environment) { spv_diagnostic diagnostic = NULL; spv_context context; spv_result_t ret; - context = spvContextCreate(spv_target_env_from_vkd3d(target)); + context = spvContextCreate(spv_target_env_from_vkd3d(environment)); if ((ret = spvValidateBinary(context, spirv->code, spirv->size / sizeof(uint32_t), &diagnostic))) @@ -103,8 +104,10 @@ static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, enum vkd #else -static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, enum vkd3d_shader_target target) {} -static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, enum vkd3d_shader_target target) {} +static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, + enum vkd3d_shader_spirv_environment environment) {} +static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, + enum vkd3d_shader_spirv_environment environment) {} #endif /* HAVE_SPIRV_TOOLS */ @@ -2180,16 +2183,17 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader return compiler; } -static enum vkd3d_shader_target vkd3d_dxbc_compiler_get_target(const struct vkd3d_dxbc_compiler *compiler) +static enum vkd3d_shader_spirv_environment vkd3d_dxbc_compiler_get_target_environment( + const struct vkd3d_dxbc_compiler *compiler) { const struct vkd3d_shader_spirv_target_info *info = compiler->spirv_target_info; - return info ? info->target : VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; + return info ? info->environment : VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0; } static bool vkd3d_dxbc_compiler_is_opengl_target(const struct vkd3d_dxbc_compiler *compiler) { - return vkd3d_dxbc_compiler_get_target(compiler) == VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5; + return vkd3d_dxbc_compiler_get_target_environment(compiler) == VKD3D_SHADER_SPIRV_ENVIRONMENT_OPENGL_4_5; } static bool vkd3d_dxbc_compiler_is_target_extension_supported(const struct vkd3d_dxbc_compiler *compiler, @@ -3544,12 +3548,12 @@ static const struct { enum vkd3d_shader_input_sysval_semantic sysval; struct vkd3d_spirv_builtin builtin; - enum vkd3d_shader_target target; + enum vkd3d_shader_spirv_environment environment; } vkd3d_system_value_builtins[] = { - {VKD3D_SIV_VERTEX_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInVertexId}, VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5}, - {VKD3D_SIV_INSTANCE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInInstanceId}, VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5}, + {VKD3D_SIV_VERTEX_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInVertexId}, VKD3D_SHADER_SPIRV_ENVIRONMENT_OPENGL_4_5}, + {VKD3D_SIV_INSTANCE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInInstanceId}, VKD3D_SHADER_SPIRV_ENVIRONMENT_OPENGL_4_5}, {VKD3D_SIV_POSITION, {VKD3D_TYPE_FLOAT, 4, SpvBuiltInPosition}}, {VKD3D_SIV_VERTEX_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInVertexIndex, sv_vertex_id_fixup}}, @@ -3632,7 +3636,7 @@ static void vkd3d_dxbc_compiler_emit_register_execution_mode(struct vkd3d_dxbc_c static const struct vkd3d_spirv_builtin *get_spirv_builtin_for_sysval( const struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_input_sysval_semantic sysval) { - enum vkd3d_shader_target target; + enum vkd3d_shader_spirv_environment environment; unsigned int i; if (!sysval) @@ -3642,12 +3646,12 @@ static const struct vkd3d_spirv_builtin *get_spirv_builtin_for_sysval( if (sysval == VKD3D_SIV_POSITION && compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL) return &vkd3d_pixel_shader_position_builtin; - target = vkd3d_dxbc_compiler_get_target(compiler); + environment = vkd3d_dxbc_compiler_get_target_environment(compiler); for (i = 0; i < ARRAY_SIZE(vkd3d_system_value_builtins); ++i) { if (vkd3d_system_value_builtins[i].sysval == sysval - && (!vkd3d_system_value_builtins[i].target - || vkd3d_system_value_builtins[i].target == target)) + && (!vkd3d_system_value_builtins[i].environment + || vkd3d_system_value_builtins[i].environment == environment)) return &vkd3d_system_value_builtins[i].builtin; } @@ -8711,9 +8715,9 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, if (TRACE_ON()) { - enum vkd3d_shader_target target = vkd3d_dxbc_compiler_get_target(compiler); - vkd3d_spirv_dump(spirv, target); - vkd3d_spirv_validate(spirv, target); + enum vkd3d_shader_spirv_environment environment = vkd3d_dxbc_compiler_get_target_environment(compiler); + vkd3d_spirv_dump(spirv, environment); + vkd3d_spirv_validate(spirv, environment); } return VKD3D_OK; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 0badd74..a56682e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -114,13 +114,13 @@ static int vkd3d_shader_validate_spirv_target_info(const struct vkd3d_shader_spi return VKD3D_ERROR_INVALID_ARGUMENT; } - switch (info->target) + switch (info->environment) { - case VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5: - case VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0: + case VKD3D_SHADER_SPIRV_ENVIRONMENT_OPENGL_4_5: + case VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0: break; default: - WARN("Invalid shader target %#x.\n", info->target); + WARN("Invalid target environment %#x.\n", info->environment); return VKD3D_ERROR_INVALID_ARGUMENT; } diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 16bce6b..84cdbe8 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2166,7 +2166,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ps_target_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO; ps_target_info.next = NULL; - ps_target_info.target = VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; + ps_target_info.environment = VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0; ps_target_info.target_extensions = vk_info->shader_extensions; ps_target_info.target_extension_count = vk_info->shader_extension_count; ps_target_info.parameters = ps_shader_parameters;

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_shader_target_extension enumeration to vkd3d_shader_spirv_extension.
by Alexandre Julliard June 18, 2020

June 18, 2020

Module: vkd3d Branch: master Commit: 13c2fbdc8dd4b723f67db7cbbc10945a1637fdc9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=13c2fbdc8dd4b723f67db7c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 18 19:10:51 2020 +0430 vkd3d-shader: Rename the vkd3d_shader_target_extension enumeration to vkd3d_shader_spirv_extension. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 13 +++++++------ libs/vkd3d-shader/spirv.c | 8 ++++---- libs/vkd3d/device.c | 2 +- libs/vkd3d/state.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 2 +- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1fa39b9..e57b913 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -227,11 +227,12 @@ enum vkd3d_shader_spirv_environment VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SPIRV_ENVIRONMENT), }; -enum vkd3d_shader_target_extension +enum vkd3d_shader_spirv_extension { - VKD3D_SHADER_TARGET_EXTENSION_NONE, + VKD3D_SHADER_SPIRV_EXTENSION_NONE, + VKD3D_SHADER_SPIRV_EXTENSION_EXT_DEMOTE_TO_HELPER_INVOCATION, - VKD3D_SHADER_TARGET_EXTENSION_SPV_EXT_DEMOTE_TO_HELPER_INVOCATION, + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SPIRV_EXTENSION), }; struct vkd3d_shader_spirv_target_info @@ -241,11 +242,11 @@ struct vkd3d_shader_spirv_target_info enum vkd3d_shader_spirv_environment environment; - unsigned int target_extension_count; - const enum vkd3d_shader_target_extension *target_extensions; + const enum vkd3d_shader_spirv_extension *extensions; + unsigned int extension_count; - unsigned int parameter_count; const struct vkd3d_shader_parameter *parameters; + unsigned int parameter_count; bool dual_source_blending; const unsigned int *output_swizzles; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index bcc208a..3f6d526 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2197,14 +2197,14 @@ static bool vkd3d_dxbc_compiler_is_opengl_target(const struct vkd3d_dxbc_compile } static bool vkd3d_dxbc_compiler_is_target_extension_supported(const struct vkd3d_dxbc_compiler *compiler, - enum vkd3d_shader_target_extension extension) + enum vkd3d_shader_spirv_extension extension) { const struct vkd3d_shader_spirv_target_info *info = compiler->spirv_target_info; unsigned int i; - for (i = 0; info && i < info->target_extension_count; ++i) + for (i = 0; info && i < info->extension_count; ++i) { - if (info->target_extensions[i] == extension) + if (info->extensions[i] == extension) return true; } @@ -6660,7 +6660,7 @@ static void vkd3d_dxbc_compiler_emit_kill(struct vkd3d_dxbc_compiler *compiler, vkd3d_spirv_build_op_label(builder, target_id); if (vkd3d_dxbc_compiler_is_target_extension_supported(compiler, - VKD3D_SHADER_TARGET_EXTENSION_SPV_EXT_DEMOTE_TO_HELPER_INVOCATION)) + VKD3D_SHADER_SPIRV_EXTENSION_EXT_DEMOTE_TO_HELPER_INVOCATION)) { vkd3d_spirv_enable_capability(builder, SpvCapabilityDemoteToHelperInvocationEXT); vkd3d_spirv_build_op_demote_to_helper_invocation(builder); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 843f327..437454d 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1447,7 +1447,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, if (vulkan_info->EXT_shader_demote_to_helper_invocation) { vulkan_info->shader_extension_count = 1; - vulkan_info->shader_extensions[0] = VKD3D_SHADER_TARGET_EXTENSION_SPV_EXT_DEMOTE_TO_HELPER_INVOCATION; + vulkan_info->shader_extensions[0] = VKD3D_SHADER_SPIRV_EXTENSION_EXT_DEMOTE_TO_HELPER_INVOCATION; } /* Disable unused Vulkan features. */ diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 84cdbe8..7b14198 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2167,8 +2167,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ps_target_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO; ps_target_info.next = NULL; ps_target_info.environment = VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0; - ps_target_info.target_extensions = vk_info->shader_extensions; - ps_target_info.target_extension_count = vk_info->shader_extension_count; + ps_target_info.extensions = vk_info->shader_extensions; + ps_target_info.extension_count = vk_info->shader_extension_count; ps_target_info.parameters = ps_shader_parameters; ps_target_info.parameter_count = ARRAY_SIZE(ps_shader_parameters); ps_target_info.dual_source_blending = is_dual_source_blending(&desc->BlendState.RenderTarget[0]); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index bfdc7b4..d7da7f1 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -122,7 +122,7 @@ struct vkd3d_vulkan_info VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT texel_buffer_alignment_properties; unsigned int shader_extension_count; - enum vkd3d_shader_target_extension shader_extensions[VKD3D_MAX_SHADER_EXTENSIONS]; + enum vkd3d_shader_spirv_extension shader_extensions[VKD3D_MAX_SHADER_EXTENSIONS]; D3D_FEATURE_LEVEL max_feature_level; };

1 0

Paul Gofman : ddraw/tests: Add more tests for _SetSurfaceDesc with mipmaps.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: fde4cca30b4aec91cc2e2bc6a22983640878fa51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fde4cca30b4aec91cc2e2bc6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 17 01:54:27 2020 +0300 ddraw/tests: Add more tests for _SetSurfaceDesc with mipmaps. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c85f020111..15f552f88e 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7147,6 +7147,93 @@ static void test_set_surface_desc(void) * parameters. */ hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); ok(hr == DDERR_INVALIDSURFACETYPE, "Got unexpected hr %#x.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_LPSURFACE; + ddsd.lpSurface = data; + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DDERR_INVALIDSURFACETYPE, "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface7_Release(surface); + } + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_MIPMAPCOUNT; + ddsd.dwWidth = 8; + ddsd.dwHeight = 8; + U2(ddsd).dwMipMapCount = 3; + ddsd.lpSurface = data; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DD_OK || hr == DDERR_NODIRECTDRAWHW || hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + + if (hr == DD_OK) + { + static DDSCAPS2 caps = {DDSCAPS_TEXTURE, 0, 0, {0}}; + void *surface2_system_mem; + IDirectDrawSurface7 *surface2; + + hr = IDirectDrawSurface7_GetAttachedSurface(surface, &caps, &surface2); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + reset_ddsd(&ddsd); + hr = IDirectDrawSurface7_GetSurfaceDesc(surface2, &ddsd); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(ddsd.dwWidth == 4, "Got unexpected dwWidth %u.\n", ddsd.dwWidth); + + hr = IDirectDrawSurface7_Lock(surface2, NULL, &ddsd, 0, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + surface2_system_mem = ddsd.lpSurface; + IDirectDrawSurface7_Unlock(surface2, NULL); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_LPSURFACE; + ddsd.dwWidth = 16; + ddsd.dwHeight = 16; + U1(ddsd).lPitch = 16 * 4; + ddsd.lpSurface = data; + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + todo_wine ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_LPSURFACE; + ddsd.dwWidth = 8; + ddsd.dwHeight = 8; + U1(ddsd).lPitch = 8 * 4; + ddsd.lpSurface = data; + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + reset_ddsd(&ddsd); + hr = IDirectDrawSurface7_Lock(surface2, NULL, &ddsd, 0, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(ddsd.lpSurface == surface2_system_mem, "Got unexpected lpSurface %p.\n", ddsd.lpSurface); + IDirectDrawSurface7_Unlock(surface2, NULL); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_LPSURFACE; + ddsd.dwWidth = 4; + ddsd.dwHeight = 4; + U1(ddsd).lPitch = 4 * 4; + ddsd.lpSurface = data; + hr = IDirectDrawSurface7_SetSurfaceDesc(surface2, &ddsd, 0); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + reset_ddsd(&ddsd); + hr = IDirectDrawSurface7_Lock(surface2, NULL, &ddsd, 0, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(ddsd.lpSurface == data, "Got unexpected lpSurface %p.\n", ddsd.lpSurface); + IDirectDrawSurface7_Unlock(surface2, NULL); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_LPSURFACE; + ddsd.dwWidth = 16; + ddsd.dwHeight = 16; + U1(ddsd).lPitch = 16 * 4; + ddsd.lpSurface = data; + hr = IDirectDrawSurface7_SetSurfaceDesc(surface2, &ddsd, 0); + todo_wine ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface7_Release(surface2); IDirectDrawSurface7_Release(surface); }

1 0

André Hentschel : include: Add else cases for __cdecl.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: 557b81116d8843415eb2cc7d0ca4c34946593dc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=557b81116d8843415eb2cc7d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 17 15:09:34 2020 +0200 include: Add else cases for __cdecl. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt.h | 2 ++ include/windef.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index c98b72f7d3..ad46c56591 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -100,6 +100,8 @@ # define __cdecl __attribute__((pcs("aapcs-vfp"))) # elif defined(__aarch64__) && defined (__GNUC__) # define __cdecl __attribute__((ms_abi)) +# else +# define __cdecl # endif #endif /* __cdecl */ diff --git a/include/windef.h b/include/windef.h index 7ece7c8628..521c3ab451 100644 --- a/include/windef.h +++ b/include/windef.h @@ -93,7 +93,7 @@ extern "C" { # define __cdecl __attribute__((pcs("aapcs-vfp"))) # elif defined(__aarch64__) && defined (__GNUC__) # define __cdecl __attribute__((ms_abi)) -# elif !defined(_MSC_VER) +# else # define __cdecl # endif #endif /* __cdecl */

1 0

André Hentschel : winevulkan: Change blacklist to a more neutral word.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: 9b54cb9b8b7158060180ea6f12b33f504db57c5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b54cb9b8b7158060180ea6f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 17 13:33:21 2020 +0200 winevulkan: Change blacklist to a more neutral word. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 1dee769836..7459b8f024 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -84,7 +84,7 @@ WINE_VULKAN_THUNKS_H = "vulkan_thunks.h" EXT_BASE = 1000000000 EXT_BLOCK_SIZE = 1000 -BLACKLISTED_EXTENSIONS = [ +UNSUPPORTED_EXTENSIONS = [ # Instance extensions "VK_EXT_debug_report", # Handling of VK_EXT_debug_report requires some consideration. The win32 @@ -2607,7 +2607,7 @@ class VkRegistry(object): def _is_extension_supported(self, extension): # We disable some extensions as either we haven't implemented # support yet or because they are for platforms other than win32. - return extension not in BLACKLISTED_EXTENSIONS + return extension not in UNSUPPORTED_EXTENSIONS def _mark_command_required(self, command): """ Helper function to mark a certain command and the datatypes it needs as required.""" @@ -2847,13 +2847,12 @@ class VkRegistry(object): return if not self._is_extension_supported(ext_name): - LOGGER.debug("Skipping blacklisted extension: {0}".format(ext_name)) + LOGGER.debug("Skipping unsupported extension: {0}".format(ext_name)) return elif "requires" in ext.attrib: - # Check if this extension builds on top of another blacklisted - # extension. + # Check if this extension builds on top of another unsupported extension. requires = ext.attrib["requires"].split(",") - if len(set(requires).intersection(BLACKLISTED_EXTENSIONS)) > 0: + if len(set(requires).intersection(UNSUPPORTED_EXTENSIONS)) > 0: return LOGGER.debug("Loading extension: {0}".format(ext_name))

1 0

André Hentschel : winemenubuilder: Change blacklist to a more neutral word.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: d0a24609fe1f5d1801415c0b0810e968974ac1ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0a24609fe1f5d1801415c0b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 17 13:33:20 2020 +0200 winemenubuilder: Change blacklist to a more neutral word. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index d6fc9e2923..ee53619bb9 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2470,7 +2470,7 @@ static BOOL write_freedesktop_mime_type_entry(const char *packages_dir, const ch return ret; } -static BOOL is_extension_blacklisted(LPCWSTR extension) +static BOOL is_extension_banned(LPCWSTR extension) { /* These are managed through external tools like wine.desktop, to evade malware created file type associations */ static const WCHAR comW[] = {'.','c','o','m',0}; @@ -2564,7 +2564,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package size *= 2; } while (ret == ERROR_MORE_DATA); - if (ret == ERROR_SUCCESS && extensionW[0] == '.' && !is_extension_blacklisted(extensionW)) + if (ret == ERROR_SUCCESS && extensionW[0] == '.' && !is_extension_banned(extensionW)) { char *extensionA = NULL; WCHAR *commandW = NULL;

1 0

Paul Gofman : wined3d: Set user memory separately for texture sub resources.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: cfeefc6b94c6517d169e055eb291188cb42c37b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfeefc6b94c6517d169e055e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 17 01:54:26 2020 +0300 wined3d: Set user memory separately for texture sub resources. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43232 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 +-- dlls/ddraw/surface.c | 80 ++++++++++++++++++++++++------------------ dlls/wined3d/swapchain.c | 4 +-- dlls/wined3d/texture.c | 77 +++++++++++++++++++++++++--------------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 3 +- include/wine/wined3d.h | 2 +- 7 files changed, 103 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cfeefc6b94c6517d169e…

1 0

Matteo Bruni : d3dcompiler: Check shader for NULL.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: 7d92b1abbd2acc4461a913682188f575b70e5625 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d92b1abbd2acc4461a91368… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jun 17 17:27:26 2020 +0200 d3dcompiler: Check shader for NULL. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/compiler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 78fb0c46cc..c400b83d8d 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -805,7 +805,7 @@ static HRESULT compile_shader(const char *preproc_shader, const char *target, co if (FAILED(blob_hr = D3DCreateBlob(size, &buffer))) { HeapFree(GetProcessHeap(), 0, messages); - if (*shader) + if (shader && *shader) { ID3D10Blob_Release(*shader); *shader = NULL;

1 0

Gabriel Ivăncescu : msscript.ocx: Implement IScriptModuleCollection::get_Count.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: 67ef5151744b347d4a30c985da6712fb0061e675 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67ef5151744b347d4a30c985… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jun 15 16:00:04 2020 +0300 msscript.ocx: Implement IScriptModuleCollection::get_Count. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 7 +++++-- dlls/msscript.ocx/tests/msscript.c | 12 ++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index e397044fd7..8fb127e0e3 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -893,9 +893,12 @@ static HRESULT WINAPI ScriptModuleCollection_get_Count(IScriptModuleCollection * { ScriptControl *This = impl_from_IScriptModuleCollection(iface); - FIXME("(%p)->(%p)\n", This, plCount); + TRACE("(%p)->(%p)\n", This, plCount); - return E_NOTIMPL; + if (!plCount) return E_POINTER; + + *plCount = This->module_count; + return S_OK; } static HRESULT WINAPI ScriptModuleCollection_Add(IScriptModuleCollection *iface, BSTR name, diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 6a0730368c..fbbe83191b 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -2331,11 +2331,11 @@ static void test_IScriptControl_get_Modules(void) ok(hr == S_OK, "IScriptControl_get_Modules failed: 0x%08x.\n", hr); hr = IScriptModuleCollection_get_Count(mods, NULL); - todo_wine ok(hr == E_POINTER, "IScriptModuleCollection_get_Count returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptModuleCollection_get_Count returned: 0x%08x.\n", hr); count = 0; hr = IScriptModuleCollection_get_Count(mods, &count); - todo_wine ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr); - todo_wine ok(count == 1, "count is not 1, got %d.\n", count); + ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr); + ok(count == 1, "count is not 1, got %d.\n", count); V_VT(&var) = VT_I4; V_I4(&var) = -1; @@ -2372,7 +2372,7 @@ static void test_IScriptControl_get_Modules(void) SysFreeString(str); hr = IScriptModuleCollection_get_Count(mods, &count); - todo_wine ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr); todo_wine ok(count == 3, "count is not 3, got %d.\n", count); V_VT(&var) = VT_I4; V_I4(&var) = count + 1; @@ -2411,8 +2411,8 @@ static void test_IScriptControl_get_Modules(void) SysFreeString(str); hr = IScriptModuleCollection_get_Count(mods, &count); - todo_wine ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr); - todo_wine ok(count == 1, "count is not 1, got %d.\n", count); + ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr); + ok(count == 1, "count is not 1, got %d.\n", count); IScriptModuleCollection_Release(mods); IScriptControl_Release(sc);

1 0