April 2024 - Wine-Commits - list.winehq.org

Conor McCarthy : tests/hlsl: Add tests for SV_DepthLessEqual and SV_DepthGreaterEqual.
by Alexandre Julliard April 19, 2024

April 19, 2024

Module: vkd3d Branch: master Commit: 7eeca3fa39d2441516f11074a9c095a31965596b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7eeca3fa39d2441516f11074a9c09… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 15 10:37:37 2024 +1000 tests/hlsl: Add tests for SV_DepthLessEqual and SV_DepthGreaterEqual. --- tests/hlsl/depth-out.shader_test | 75 ++++++++++++++++++++++++++++++++++++++++ tests/shader_runner.c | 13 +++++++ tests/shader_runner_d3d11.c | 4 +++ tests/shader_runner_d3d12.c | 5 +++ tests/shader_runner_gl.c | 11 +++++- tests/shader_runner_vulkan.c | 7 ++++ 6 files changed, 114 insertions(+), 1 deletion(-) diff --git a/tests/hlsl/depth-out.shader_test b/tests/hlsl/depth-out.shader_test index 7acd05b4..fa40e1a1 100644 --- a/tests/hlsl/depth-out.shader_test +++ b/tests/hlsl/depth-out.shader_test @@ -33,3 +33,78 @@ depth less clear dsv 0.5 todo(sm>=6 | glsl) draw quad probe dsv all r (0.5) + + +[require] +shader model >= 5.0 + +[rtv 0] +format r32g32b32a32 float +size (2d, 640, 480) + +[vertex shader] +float2 depth; + +void main(float4 in_position : POSITION, out float4 out_position : SV_Position) +{ + out_position = in_position; + out_position.z = depth.x; +} + +[pixel shader todo] +float2 depth; + +float4 main(out float out_depth : SV_DepthLessEqual) : SV_Target +{ + out_depth = depth.y; + return float4(0.0f, 1.0f, 0.0f, 1.0f); +} + +[test] +uniform 0 float4 0.75 0.75 0.0 0.0 +clear rtv 0 1.0 1.0 1.0 1.0 +clear dsv 0.5 +depth greater equal +todo draw quad +probe all rgba (0.0, 1.0, 0.0, 1.0) +probe dsv all r (0.75) + +uniform 0 float4 0.75 0.375 0.0 0.0 +clear rtv 0 1.0 1.0 1.0 1.0 +clear dsv 0.5 +todo draw quad +probe all rgba (1.0, 1.0, 1.0, 1.0) +probe dsv all r (0.5) + + +[pixel shader todo] +float2 depth; + +float4 main(out float out_depth : SV_DepthGreaterEqual) : SV_Target +{ + out_depth = depth.y; + return float4(0.0f, 1.0f, 0.0f, 1.0f); +} + +[test] +uniform 0 float4 0.75 0.75 0.0 0.0 +clear rtv 0 1.0 1.0 1.0 1.0 +clear dsv 0.5 +depth greater equal +todo draw quad +probe all rgba (0.0, 1.0, 0.0, 1.0) +probe dsv all r (0.75) + +uniform 0 float4 0.375 0.625 0.0 0.0 +clear rtv 0 1.0 1.0 1.0 1.0 +clear dsv 0.5 +todo draw quad +probe all rgba (0.0, 1.0, 0.0, 1.0) +probe dsv all r (0.625) + +uniform 0 float4 0.375 0.375 0.0 0.0 +clear rtv 0 1.0 1.0 1.0 1.0 +clear dsv 0.5 +todo draw quad +probe all rgba (1.0, 1.0, 1.0, 1.0) +probe dsv all r (0.5) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 98e87115..f3b6972f 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -834,6 +834,19 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) runner->last_render_failed = !runner->ops->dispatch(runner, x, y, z); } + else if (match_string(line, "clear rtv", &line)) + { + struct resource *resource; + unsigned int slot; + struct vec4 v; + + if (sscanf(line, "%u %f %f %f %f", &slot, &v.x, &v.y, &v.z, &v.w) < 5) + fatal_error("Malformed rtv clear arguments '%s'.\n", line); + + if (!(resource = shader_runner_get_resource(runner, RESOURCE_TYPE_RENDER_TARGET, slot))) + fatal_error("Resource not found.\n"); + runner->ops->clear(runner, resource, &v); + } else if (match_string(line, "clear dsv", &line)) { struct resource *resource; diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index a8ab80e0..c656a318 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -620,6 +620,10 @@ static void d3d11_runner_clear(struct shader_runner *r, struct resource *res, co switch (resource->r.type) { + case RESOURCE_TYPE_RENDER_TARGET: + ID3D11DeviceContext_ClearRenderTargetView(context, resource->rtv, (const float *)clear_value); + break; + case RESOURCE_TYPE_DEPTH_STENCIL: ID3D11DeviceContext_ClearDepthStencilView(context, resource->dsv, D3D11_CLEAR_DEPTH, clear_value->x, 0); break; diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index bb4157d4..7729de7c 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -468,6 +468,11 @@ static void d3d12_runner_clear(struct shader_runner *r, struct resource *resourc switch (resource->type) { + case RESOURCE_TYPE_RENDER_TARGET: + view = get_cpu_rtv_handle(test_context, runner->rtv_heap, resource->slot); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, view, (const float *)clear_value, 0, NULL); + break; + case RESOURCE_TYPE_DEPTH_STENCIL: view = get_cpu_dsv_handle(test_context, runner->dsv_heap, 0); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, view, diff --git a/tests/shader_runner_gl.c b/tests/shader_runner_gl.c index 7e93763f..fdc418ba 100644 --- a/tests/shader_runner_gl.c +++ b/tests/shader_runner_gl.c @@ -940,6 +940,7 @@ static void gl_runner_clear(struct shader_runner *r, struct resource *res, const { struct gl_resource *resource = gl_resource(res); struct gl_runner *runner = gl_runner(r); + GLbitfield clear_mask; if (!runner->fbo_id) glGenFramebuffers(1, &runner->fbo_id); @@ -947,10 +948,18 @@ static void gl_runner_clear(struct shader_runner *r, struct resource *res, const switch (resource->r.type) { + case RESOURCE_TYPE_RENDER_TARGET: + glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, resource->id, 0); + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + glClearColor(clear_value->x, clear_value->y, clear_value->z, clear_value->w); + clear_mask = GL_COLOR_BUFFER_BIT; + break; + case RESOURCE_TYPE_DEPTH_STENCIL: glFramebufferTexture(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, resource->id, 0); glDepthMask(GL_TRUE); glClearDepthf(clear_value->x); + clear_mask = GL_DEPTH_BUFFER_BIT; break; default: @@ -958,7 +967,7 @@ static void gl_runner_clear(struct shader_runner *r, struct resource *res, const } glScissor(0, 0, res->width, res->height); - glClear(GL_DEPTH_BUFFER_BIT); + glClear(clear_mask); } static bool gl_runner_draw(struct shader_runner *r, diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index 8a3e9163..d9f06980 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -1225,6 +1225,13 @@ static void vulkan_runner_clear(struct shader_runner *r, struct resource *res, c switch (resource->r.type) { + case RESOURCE_TYPE_RENDER_TARGET: + attachment_desc.initialLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + sub_pass_desc.colorAttachmentCount = 1; + sub_pass_desc.pColorAttachments = &attachment_ref; + memcpy(vk_clear_value.color.float32, clear_value, sizeof(vk_clear_value.color.float32)); + break; + case RESOURCE_TYPE_DEPTH_STENCIL: attachment_desc.initialLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; sub_pass_desc.pDepthStencilAttachment = &attachment_ref;

1 0

Giovanni Mascellani : tests: Avoid using a different UAV for SM<6 and SM>=6.
by Alexandre Julliard April 19, 2024

April 19, 2024

Module: vkd3d Branch: master Commit: 12c457b43f69a5c16f399ed84786e711ec85ca44 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/12c457b43f69a5c16f399ed84786e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 12 13:42:56 2024 +0200 tests: Avoid using a different UAV for SM<6 and SM>=6. --- tests/hlsl/discard.shader_test | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/tests/hlsl/discard.shader_test b/tests/hlsl/discard.shader_test index cf53bf48..69272b58 100644 --- a/tests/hlsl/discard.shader_test +++ b/tests/hlsl/discard.shader_test @@ -19,12 +19,6 @@ probe all rgba (1, 2, 3, 4) [require] shader model >= 5.0 -[uav 0] -format r32 float -size (2d, 2, 1) - -0.0 0.0 - [uav 1] format r32 float size (2d, 2, 1) @@ -34,7 +28,7 @@ size (2d, 2, 1) % Check that side effects stop happening after discard [pixel shader] uniform float4 x; -RWTexture2D<float> y; +RWTexture2D<float> y : register(u1); float4 main(float4 pos : sv_position) : sv_target { @@ -51,14 +45,10 @@ float4 main(float4 pos : sv_position) : sv_target uniform 0 float4 1 2 3 4 todo(glsl) draw quad probe all rgba (1, 2, 3, 4) -if(sm<6) probe uav 1 (0, 0) r (1.0) -if(sm<6) probe uav 1 (1, 0) r (1.0) -if(sm>=6) probe uav 0 (0, 0) r (1.0) -if(sm>=6) probe uav 0 (1, 0) r (1.0) +probe uav 1 (0, 0) r (1.0) +probe uav 1 (1, 0) r (1.0) uniform 0 float4 9 8 7 6 todo(glsl) draw quad probe all rgba (1, 2, 3, 4) -if(sm<6) probe uav 1 (0, 0) r (2.0) -if(sm<6) probe uav 1 (1, 0) r (1.0) -if(sm>=6) probe uav 0 (0, 0) r (2.0) -if(sm>=6) probe uav 0 (1, 0) r (1.0) +probe uav 1 (0, 0) r (2.0) +probe uav 1 (1, 0) r (1.0)

1 0

Giovanni Mascellani : vkd3d-utils: Make all extensions optional in D3D12CreateDeviceVKD3D().
by Alexandre Julliard April 19, 2024

April 19, 2024

Module: vkd3d Branch: master Commit: 296edf0d68582181206271f4fba97706462981b9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/296edf0d68582181206271f4fba97… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Apr 18 13:12:56 2024 +0200 vkd3d-utils: Make all extensions optional in D3D12CreateDeviceVKD3D(). A D3D12 device can be useful even without a surface and swapchain. On the other hand, just having the surface and swapchain extensions doesn't give any feature (the client still has to manage them), so there is no point in making them a requirement. --- libs/vkd3d-utils/vkd3d_utils_main.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 9a1b5406..1a11543a 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -60,16 +60,14 @@ HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) HRESULT WINAPI D3D12CreateDeviceVKD3D(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device, enum vkd3d_api_version api_version) { - struct vkd3d_optional_instance_extensions_info optional_extensions_info; + struct vkd3d_optional_instance_extensions_info optional_instance_extensions_info; + struct vkd3d_optional_device_extensions_info optional_device_extensions_info; struct vkd3d_instance_create_info instance_create_info; struct vkd3d_device_create_info device_create_info; - static const char * const instance_extensions[] = - { - VK_KHR_SURFACE_EXTENSION_NAME, - }; static const char * const optional_instance_extensions[] = { + VK_KHR_SURFACE_EXTENSION_NAME, "VK_KHR_android_surface", "VK_KHR_wayland_surface", "VK_KHR_win32_surface", @@ -79,7 +77,7 @@ HRESULT WINAPI D3D12CreateDeviceVKD3D(IUnknown *adapter, D3D_FEATURE_LEVEL minim "VK_MVK_macos_surface", "VK_MVK_ios_surface", }; - static const char * const device_extensions[] = + static const char * const optional_device_extensions[] = { VK_KHR_SWAPCHAIN_EXTENSION_NAME, }; @@ -95,27 +93,28 @@ HRESULT WINAPI D3D12CreateDeviceVKD3D(IUnknown *adapter, D3D_FEATURE_LEVEL minim if (adapter) FIXME("Ignoring adapter %p.\n", adapter); - memset(&optional_extensions_info, 0, sizeof(optional_extensions_info)); - optional_extensions_info.type = VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO; - optional_extensions_info.next = &application_info; - optional_extensions_info.extensions = optional_instance_extensions; - optional_extensions_info.extension_count = ARRAY_SIZE(optional_instance_extensions); + memset(&optional_instance_extensions_info, 0, sizeof(optional_instance_extensions_info)); + optional_instance_extensions_info.type = VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO; + optional_instance_extensions_info.next = &application_info; + optional_instance_extensions_info.extensions = optional_instance_extensions; + optional_instance_extensions_info.extension_count = ARRAY_SIZE(optional_instance_extensions); memset(&instance_create_info, 0, sizeof(instance_create_info)); instance_create_info.type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; - instance_create_info.next = &optional_extensions_info; + instance_create_info.next = &optional_instance_extensions_info; instance_create_info.pfn_signal_event = vkd3d_signal_event; instance_create_info.wchar_size = sizeof(WCHAR); - instance_create_info.instance_extensions = instance_extensions; - instance_create_info.instance_extension_count = ARRAY_SIZE(instance_extensions); + + memset(&optional_device_extensions_info, 0, sizeof(optional_device_extensions_info)); + optional_device_extensions_info.type = VKD3D_STRUCTURE_TYPE_OPTIONAL_DEVICE_EXTENSIONS_INFO; + optional_device_extensions_info.extensions = optional_device_extensions; + optional_device_extensions_info.extension_count = ARRAY_SIZE(optional_device_extensions); memset(&device_create_info, 0, sizeof(device_create_info)); device_create_info.type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO; - device_create_info.next = NULL; + device_create_info.next = &optional_device_extensions_info; device_create_info.minimum_feature_level = minimum_feature_level; device_create_info.instance_create_info = &instance_create_info; - device_create_info.device_extensions = device_extensions; - device_create_info.device_extension_count = ARRAY_SIZE(device_extensions); return vkd3d_create_device(&device_create_info, iid, device); }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Make HLSL_TYPE_VOID into a separate class.
by Alexandre Julliard April 19, 2024

April 19, 2024

Module: vkd3d Branch: master Commit: cdcf2da2ebd2911fb29e02acaf0279db0852c5ab URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cdcf2da2ebd2911fb29e02acaf027… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 9 16:42:00 2024 -0500 vkd3d-shader/hlsl: Make HLSL_TYPE_VOID into a separate class. --- libs/vkd3d-shader/d3dbc.c | 12 ++++---- libs/vkd3d-shader/fx.c | 8 ++++++ libs/vkd3d-shader/hlsl.c | 61 ++++++++++++++++++++++++++++++++-------- libs/vkd3d-shader/hlsl.h | 4 +-- libs/vkd3d-shader/hlsl_codegen.c | 3 ++ libs/vkd3d-shader/tpf.c | 1 + 6 files changed, 71 insertions(+), 18 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 4685afa0..d5374909 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1514,10 +1514,11 @@ D3DXPARAMETER_CLASS hlsl_sm1_class(const struct hlsl_type *type) return D3DXPC_STRUCT; case HLSL_CLASS_VECTOR: return D3DXPC_VECTOR; - default: - ERR("Invalid class %#x.\n", type->class); - vkd3d_unreachable(); + case HLSL_CLASS_VOID: + break; } + + vkd3d_unreachable(); } D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type) @@ -1595,8 +1596,6 @@ D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type) break; case HLSL_TYPE_VERTEXSHADER: return D3DXPT_VERTEXSHADER; - case HLSL_TYPE_VOID: - return D3DXPT_VOID; default: vkd3d_unreachable(); } @@ -1607,6 +1606,9 @@ D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type) case HLSL_CLASS_STRUCT: return D3DXPT_VOID; + + case HLSL_CLASS_VOID: + break; } vkd3d_unreachable(); diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 1d90cd70..c94552da 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -436,6 +436,11 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co case HLSL_CLASS_ARRAY: vkd3d_unreachable(); + + case HLSL_CLASS_VOID: + FIXME("Writing type class %u is not implemented.\n", type->class); + set_status(fx, VKD3D_ERROR_NOT_IMPLEMENTED); + return 0; } size = stride = type->reg_size[HLSL_REGSET_NUMERIC] * sizeof(float); @@ -814,6 +819,9 @@ static bool is_type_supported_fx_2(struct hlsl_ctx *ctx, const struct hlsl_type default: return false; } + + case HLSL_CLASS_VOID: + return false; } vkd3d_unreachable(); diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index ed80e2b7..6859e1a3 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -365,6 +365,9 @@ static void hlsl_type_calculate_reg_size(struct hlsl_ctx *ctx, struct hlsl_type } break; } + + case HLSL_CLASS_VOID: + break; } } @@ -377,6 +380,25 @@ unsigned int hlsl_type_get_array_element_reg_size(const struct hlsl_type *type, return type->reg_size[regset]; } +static struct hlsl_type *hlsl_new_simple_type(struct hlsl_ctx *ctx, const char *name, enum hlsl_type_class class) +{ + struct hlsl_type *type; + + if (!(type = hlsl_alloc(ctx, sizeof(*type)))) + return NULL; + if (!(type->name = hlsl_strdup(ctx, name))) + { + vkd3d_free(type); + return NULL; + } + type->class = class; + hlsl_type_calculate_reg_size(ctx, type); + + list_add_tail(&ctx->types, &type->entry); + + return type; +} + static struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, enum hlsl_type_class type_class, enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) { @@ -402,7 +424,22 @@ static struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, e static bool type_is_single_component(const struct hlsl_type *type) { - return type->class == HLSL_CLASS_SCALAR || type->class == HLSL_CLASS_OBJECT; + switch (type->class) + { + case HLSL_CLASS_SCALAR: + case HLSL_CLASS_OBJECT: + return true; + + case HLSL_CLASS_VECTOR: + case HLSL_CLASS_MATRIX: + case HLSL_CLASS_STRUCT: + case HLSL_CLASS_ARRAY: + return false; + + case HLSL_CLASS_VOID: + break; + } + vkd3d_unreachable(); } /* Given a type and a component index, this function moves one step through the path required to @@ -525,7 +562,7 @@ unsigned int hlsl_type_get_component_offset(struct hlsl_ctx *ctx, struct hlsl_ty assert(idx == 0); break; - default: + case HLSL_CLASS_VOID: vkd3d_unreachable(); } type = next_type; @@ -752,7 +789,6 @@ struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, if (!(type = hlsl_alloc(ctx, sizeof(*type)))) return NULL; type->class = HLSL_CLASS_STRUCT; - type->base_type = HLSL_TYPE_VOID; type->name = name; type->dimy = 1; type->e.record.fields = fields; @@ -896,9 +932,11 @@ unsigned int hlsl_type_component_count(const struct hlsl_type *type) case HLSL_CLASS_OBJECT: return 1; - default: - vkd3d_unreachable(); + case HLSL_CLASS_VOID: + break; } + + vkd3d_unreachable(); } bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2) @@ -2313,15 +2351,16 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru return string; default: - vkd3d_string_buffer_printf(string, "<unexpected type>"); - return string; + break; } } - default: - vkd3d_string_buffer_printf(string, "<unexpected type>"); - return string; + case HLSL_CLASS_VOID: + break; } + + vkd3d_string_buffer_printf(string, "<unexpected type>"); + return string; } struct vkd3d_string_buffer *hlsl_component_to_string(struct hlsl_ctx *ctx, const struct hlsl_ir_var *var, @@ -3609,7 +3648,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) ctx->builtin_types.sampler[bt] = type; } - ctx->builtin_types.Void = hlsl_new_type(ctx, "void", HLSL_CLASS_OBJECT, HLSL_TYPE_VOID, 1, 1); + ctx->builtin_types.Void = hlsl_new_simple_type(ctx, "void", HLSL_CLASS_VOID); for (i = 0; i < ARRAY_SIZE(effect_types); ++i) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 3cb98b76..b09b44c2 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -79,6 +79,7 @@ enum hlsl_type_class HLSL_CLASS_STRUCT, HLSL_CLASS_ARRAY, HLSL_CLASS_OBJECT, + HLSL_CLASS_VOID, }; enum hlsl_base_type @@ -101,7 +102,6 @@ enum hlsl_base_type HLSL_TYPE_TECHNIQUE, HLSL_TYPE_EFFECT_GROUP, HLSL_TYPE_STRING, - HLSL_TYPE_VOID, }; enum hlsl_sampler_dim @@ -175,7 +175,7 @@ struct hlsl_type * If base_type is HLSL_TYPE_SAMPLER, then both dimx = 1 and dimy = 1. * If base_type is HLSL_TYPE_TEXTURE, then dimx = 4 and dimy = 1. * If base_type is HLSL_TYPE_UAV, then dimx is the dimx of e.resource_format, and dimy = 1. - * Otherwise both dimx = 1 and dimy = 1. */ + */ unsigned int dimx; unsigned int dimy; /* Sample count for HLSL_SAMPLER_DIM_2DMS or HLSL_SAMPLER_DIM_2DMSARRAY. */ diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index eaa72836..511b1a66 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1634,6 +1634,9 @@ static bool copy_propagation_transform_load(struct hlsl_ctx *ctx, /* FIXME: Actually we shouldn't even get here, but we don't split * matrices yet. */ return false; + + case HLSL_CLASS_VOID: + vkd3d_unreachable(); } if (copy_propagation_replace_with_constant_vector(ctx, state, load, HLSL_SWIZZLE(X, Y, Z, W), &load->node)) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index d5019a5d..d0f0111f 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3008,6 +3008,7 @@ static D3D_SHADER_VARIABLE_CLASS sm4_class(const struct hlsl_type *type) case HLSL_CLASS_ARRAY: case HLSL_CLASS_STRUCT: case HLSL_CLASS_OBJECT: + case HLSL_CLASS_VOID: break; } vkd3d_unreachable();

1 0

Zebediah Figura : vkd3d-shader/hlsl: Make HLSL_TYPE_TEXTURE into a separate class.
by Alexandre Julliard April 19, 2024

April 19, 2024

Module: vkd3d Branch: master Commit: 93d7cd178583ebd6ebe68471f91853aa5b81f403 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/93d7cd178583ebd6ebe68471f9185… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 5 20:25:57 2024 -0600 vkd3d-shader/hlsl: Make HLSL_TYPE_TEXTURE into a separate class. --- libs/vkd3d-shader/d3dbc.c | 38 +++++++------- libs/vkd3d-shader/fx.c | 88 ++++++++++++++++++------------- libs/vkd3d-shader/hlsl.c | 109 +++++++++++++++++++++------------------ libs/vkd3d-shader/hlsl.h | 5 +- libs/vkd3d-shader/hlsl.y | 11 ++-- libs/vkd3d-shader/hlsl_codegen.c | 3 +- libs/vkd3d-shader/tpf.c | 7 +-- 7 files changed, 143 insertions(+), 118 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Make HLSL_TYPE_STRING into a separate class.
by Alexandre Julliard April 19, 2024

April 19, 2024

Module: vkd3d Branch: master Commit: f57db442b00df9d3748b87f35dcff1a79c1f0916 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f57db442b00df9d3748b87f35dcff… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 5 20:04:02 2024 -0600 vkd3d-shader/hlsl: Make HLSL_TYPE_STRING into a separate class. --- libs/vkd3d-shader/d3dbc.c | 10 ++++++---- libs/vkd3d-shader/fx.c | 6 +++++- libs/vkd3d-shader/hlsl.c | 7 ++++++- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl_codegen.c | 1 + libs/vkd3d-shader/tpf.c | 1 + 6 files changed, 20 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index d5374909..61f0f5cb 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1506,14 +1506,15 @@ D3DXPARAMETER_CLASS hlsl_sm1_class(const struct hlsl_type *type) return D3DXPC_MATRIX_COLUMNS; else return D3DXPC_MATRIX_ROWS; - case HLSL_CLASS_OBJECT: - return D3DXPC_OBJECT; case HLSL_CLASS_SCALAR: return D3DXPC_SCALAR; case HLSL_CLASS_STRUCT: return D3DXPC_STRUCT; case HLSL_CLASS_VECTOR: return D3DXPC_VECTOR; + case HLSL_CLASS_OBJECT: + case HLSL_CLASS_STRING: + return D3DXPC_OBJECT; case HLSL_CLASS_VOID: break; } @@ -1574,8 +1575,6 @@ D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type) vkd3d_unreachable(); } break; - case HLSL_TYPE_STRING: - return D3DXPT_STRING; case HLSL_TYPE_TEXTURE: switch (type->sampler_dim) { @@ -1607,6 +1606,9 @@ D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type) case HLSL_CLASS_STRUCT: return D3DXPT_VOID; + case HLSL_CLASS_STRING: + return D3DXPT_STRING; + case HLSL_CLASS_VOID: break; } diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index c94552da..e5770f10 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -437,6 +437,7 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co case HLSL_CLASS_ARRAY: vkd3d_unreachable(); + case HLSL_CLASS_STRING: case HLSL_CLASS_VOID: FIXME("Writing type class %u is not implemented.\n", type->class); set_status(fx, VKD3D_ERROR_NOT_IMPLEMENTED); @@ -810,7 +811,6 @@ static bool is_type_supported_fx_2(struct hlsl_ctx *ctx, const struct hlsl_type break; case HLSL_TYPE_SAMPLER: - case HLSL_TYPE_STRING: case HLSL_TYPE_PIXELSHADER: case HLSL_TYPE_VERTEXSHADER: hlsl_fixme(ctx, loc, "Write fx 2.0 parameter object type %#x.", type->base_type); @@ -820,6 +820,10 @@ static bool is_type_supported_fx_2(struct hlsl_ctx *ctx, const struct hlsl_type return false; } + case HLSL_CLASS_STRING: + hlsl_fixme(ctx, loc, "Write fx 2.0 parameter class %#x.", type->class); + return false; + case HLSL_CLASS_VOID: return false; } diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 6859e1a3..c3170ff7 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -366,6 +366,7 @@ static void hlsl_type_calculate_reg_size(struct hlsl_ctx *ctx, struct hlsl_type break; } + case HLSL_CLASS_STRING: case HLSL_CLASS_VOID: break; } @@ -428,6 +429,7 @@ static bool type_is_single_component(const struct hlsl_type *type) { case HLSL_CLASS_SCALAR: case HLSL_CLASS_OBJECT: + case HLSL_CLASS_STRING: return true; case HLSL_CLASS_VECTOR: @@ -559,6 +561,7 @@ unsigned int hlsl_type_get_component_offset(struct hlsl_ctx *ctx, struct hlsl_ty break; case HLSL_CLASS_OBJECT: + case HLSL_CLASS_STRING: assert(idx == 0); break; @@ -930,6 +933,7 @@ unsigned int hlsl_type_component_count(const struct hlsl_type *type) return hlsl_type_component_count(type->e.array.type) * type->e.array.elements_count; case HLSL_CLASS_OBJECT: + case HLSL_CLASS_STRING: return 1; case HLSL_CLASS_VOID: @@ -2355,6 +2359,7 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru } } + case HLSL_CLASS_STRING: case HLSL_CLASS_VOID: break; } @@ -3532,7 +3537,6 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) {"matrix", HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4}, {"fxgroup", HLSL_CLASS_OBJECT, HLSL_TYPE_EFFECT_GROUP, 1, 1}, {"pass", HLSL_CLASS_OBJECT, HLSL_TYPE_PASS, 1, 1}, - {"STRING", HLSL_CLASS_OBJECT, HLSL_TYPE_STRING, 1, 1}, {"texture", HLSL_CLASS_OBJECT, HLSL_TYPE_TEXTURE, 1, 1}, {"pixelshader", HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1}, {"vertexshader", HLSL_CLASS_OBJECT, HLSL_TYPE_VERTEXSHADER, 1, 1}, @@ -3649,6 +3653,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) } ctx->builtin_types.Void = hlsl_new_simple_type(ctx, "void", HLSL_CLASS_VOID); + hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "STRING", HLSL_CLASS_STRING)); for (i = 0; i < ARRAY_SIZE(effect_types); ++i) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index b09b44c2..83679767 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -79,6 +79,7 @@ enum hlsl_type_class HLSL_CLASS_STRUCT, HLSL_CLASS_ARRAY, HLSL_CLASS_OBJECT, + HLSL_CLASS_STRING, HLSL_CLASS_VOID, }; @@ -101,7 +102,6 @@ enum hlsl_base_type HLSL_TYPE_DEPTHSTENCILVIEW, HLSL_TYPE_TECHNIQUE, HLSL_TYPE_EFFECT_GROUP, - HLSL_TYPE_STRING, }; enum hlsl_sampler_dim diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 511b1a66..e1064b99 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1635,6 +1635,7 @@ static bool copy_propagation_transform_load(struct hlsl_ctx *ctx, * matrices yet. */ return false; + case HLSL_CLASS_STRING: case HLSL_CLASS_VOID: vkd3d_unreachable(); } diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index d0f0111f..4bacbefd 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3008,6 +3008,7 @@ static D3D_SHADER_VARIABLE_CLASS sm4_class(const struct hlsl_type *type) case HLSL_CLASS_ARRAY: case HLSL_CLASS_STRUCT: case HLSL_CLASS_OBJECT: + case HLSL_CLASS_STRING: case HLSL_CLASS_VOID: break; }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Make HLSL_TYPE_SAMPLER into a separate class.
by Alexandre Julliard April 19, 2024

April 19, 2024

Module: vkd3d Branch: master Commit: 220362cbadfff0d28cef8190565110d29ce3a662 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/220362cbadfff0d28cef819056511… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 5 20:13:17 2024 -0600 vkd3d-shader/hlsl: Make HLSL_TYPE_SAMPLER into a separate class. --- libs/vkd3d-shader/d3dbc.c | 38 +++++++++--------- libs/vkd3d-shader/fx.c | 29 ++++++++------ libs/vkd3d-shader/hlsl.c | 85 ++++++++++++++++++++++++---------------- libs/vkd3d-shader/hlsl.h | 5 +-- libs/vkd3d-shader/hlsl.y | 17 +++----- libs/vkd3d-shader/hlsl_codegen.c | 3 +- libs/vkd3d-shader/tpf.c | 29 +++++++++----- 7 files changed, 119 insertions(+), 87 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Make HLSL_TYPE_UAV into a separate class.
by Alexandre Julliard April 19, 2024

April 19, 2024

Module: vkd3d Branch: master Commit: 171e097268c6fc0191e9f71d418dfe4ffaffe582 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/171e097268c6fc0191e9f71d418df… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 5 20:32:37 2024 -0600 vkd3d-shader/hlsl: Make HLSL_TYPE_UAV into a separate class. --- libs/vkd3d-shader/d3dbc.c | 2 + libs/vkd3d-shader/fx.c | 32 ++++++++------ libs/vkd3d-shader/hlsl.c | 94 ++++++++++++++-------------------------- libs/vkd3d-shader/hlsl.h | 10 ++--- libs/vkd3d-shader/hlsl.y | 8 ++-- libs/vkd3d-shader/hlsl_codegen.c | 1 + libs/vkd3d-shader/tpf.c | 12 ++--- 7 files changed, 63 insertions(+), 96 deletions(-)

1 0

Alexandre Julliard : Release 9.7.
by Alexandre Julliard April 19, 2024

April 19, 2024

Module: wine Branch: master Commit: 166895ae3ad3890ad946a309d0fd85e89ea3630e URL: https://gitlab.winehq.org/wine/wine/-/commit/166895ae3ad3890ad946a309d0fd85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 19 22:18:13 2024 +0200 Release 9.7. --- ANNOUNCE.md | 417 ++++++++++++++++++++++++++++-------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +-- 4 files changed, 203 insertions(+), 236 deletions(-)

1 0

Tag wine-9.7 : Alexandre Julliard : Release 9.7
by Alexandre Julliard April 19, 2024

April 19, 2024

Module: wine Branch: refs/tags/wine-9.7 Tag: e3ac88924af9742f1b67cf87a7b9bd02e82ff757 URL: https://gitlab.winehq.org/wine/wine/-/tags/e3ac88924af9742f1b67cf87a7b9bd02… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 19 22:18:13 2024 +0200 Release 9.7

1 0