[PATCH 0/3] MR8091: wined3d/spirv: Implement some extra shader parameters.
From: Elizabeth Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/shader_spirv.c | 37 +++++++++++++++++++++++++++++++++---- dlls/wined3d/stateblock.c | 2 ++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index f67e5e79338..e27b6d502dd 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -61,6 +61,7 @@ struct shader_spirv_compile_arguments { struct vkd3d_shader_varying_map varying_map[MAX_SM1_INTER_STAGE_VARYINGS]; unsigned int varying_count; + uint8_t clip_planes; } vs; struct { @@ -104,7 +105,7 @@ struct wined3d_shader_spirv_compile_args struct vkd3d_shader_spirv_target_info spirv_target; struct vkd3d_shader_parameter_info parameter_info; enum vkd3d_shader_spirv_extension extensions[1]; - struct vkd3d_shader_parameter1 parameters[4]; + struct vkd3d_shader_parameter1 parameters[9]; unsigned int ps_alpha_swizzle[WINED3D_MAX_RENDER_TARGETS]; }; @@ -149,6 +150,8 @@ static void shader_spirv_compile_arguments_init(struct shader_spirv_compile_argu 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); } + + args->u.vs.clip_planes = state->extra_vs_args.clip_planes; break; } @@ -157,6 +160,30 @@ static void shader_spirv_compile_arguments_init(struct shader_spirv_compile_argu } } +static void fill_vs_parameters(struct wined3d_shader_spirv_compile_args *vkd3d_args, + const struct shader_spirv_compile_arguments *compile_args, uint32_t ffp_extra_binding) +{ + struct vkd3d_shader_parameter1 *parameters = vkd3d_args->parameters; + + for (unsigned int i = 0; i < WINED3D_MAX_CLIP_DISTANCES; ++i) + { + parameters[i].name = VKD3D_SHADER_PARAMETER_NAME_CLIP_PLANE_0 + i; + parameters[i].type = VKD3D_SHADER_PARAMETER_TYPE_BUFFER; + parameters[i].data_type = VKD3D_SHADER_PARAMETER_DATA_TYPE_FLOAT32_VEC4; + parameters[i].u.buffer.set = 0; + parameters[i].u.buffer.binding = ffp_extra_binding; + parameters[i].u.buffer.offset = offsetof(struct wined3d_ffp_vs_constants, clip_planes[i]); + } + + parameters[8].name = VKD3D_SHADER_PARAMETER_NAME_CLIP_PLANE_MASK; + parameters[8].type = VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT; + parameters[8].data_type = VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32; + parameters[8].u.immediate_constant.u.u32 = compile_args->u.vs.clip_planes; + + vkd3d_args->parameter_info.parameter_count = 9; + vkd3d_args->parameter_info.parameters = vkd3d_args->parameters; +} + static void fill_ps_parameters(struct wined3d_shader_spirv_compile_args *vkd3d_args, const struct shader_spirv_compile_arguments *compile_args, uint32_t ffp_extra_binding) { @@ -233,14 +260,16 @@ static void shader_spirv_init_compile_args(const struct wined3d_vk_info *vk_info } else if (shader_type == WINED3D_SHADER_TYPE_VERTEX) { + fill_vs_parameters(args, compile_args, bindings->ffp_vs_extra_binding); + 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.next = args->spirv_target.next; args->varying_map.varying_map = compile_args->u.vs.varying_map; args->varying_map.varying_count = compile_args->u.vs.varying_count; + + args->spirv_target.next = &args->varying_map; } } } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 95a4a4c05ec..5803f166955 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -4082,6 +4082,8 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, bind_push_constant_buffer(device, WINED3D_PUSH_CONSTANTS_PS_FFP, WINED3D_SHADER_TYPE_PIXEL, WINED3D_FFP_CONSTANTS_EXTRA_REGISTER); + bind_push_constant_buffer(device, WINED3D_PUSH_CONSTANTS_VS_FFP, + WINED3D_SHADER_TYPE_VERTEX, WINED3D_FFP_CONSTANTS_EXTRA_REGISTER); assert(list_empty(&stateblock->changed.changed_lights)); memset(&stateblock->changed, 0, sizeof(stateblock->changed)); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8091
From: Elizabeth Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/shader_spirv.c | 41 ++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index e27b6d502dd..142b02346b2 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -105,7 +105,7 @@ struct wined3d_shader_spirv_compile_args struct vkd3d_shader_spirv_target_info spirv_target; struct vkd3d_shader_parameter_info parameter_info; enum vkd3d_shader_spirv_extension extensions[1]; - struct vkd3d_shader_parameter1 parameters[9]; + struct vkd3d_shader_parameter1 parameters[12]; unsigned int ps_alpha_swizzle[WINED3D_MAX_RENDER_TARGETS]; }; @@ -160,27 +160,40 @@ static void shader_spirv_compile_arguments_init(struct shader_spirv_compile_argu } } +static void fill_buffer_parameter(struct vkd3d_shader_parameter1 *parameter, uint32_t binding, + enum vkd3d_shader_parameter_name name, enum vkd3d_shader_parameter_data_type data_type, uint32_t offset) +{ + parameter->name = name; + parameter->type = VKD3D_SHADER_PARAMETER_TYPE_BUFFER; + parameter->data_type = data_type; + parameter->u.buffer.set = 0; + parameter->u.buffer.binding = binding; + parameter->u.buffer.offset = offset; +} + static void fill_vs_parameters(struct wined3d_shader_spirv_compile_args *vkd3d_args, const struct shader_spirv_compile_arguments *compile_args, uint32_t ffp_extra_binding) { struct vkd3d_shader_parameter1 *parameters = vkd3d_args->parameters; for (unsigned int i = 0; i < WINED3D_MAX_CLIP_DISTANCES; ++i) - { - parameters[i].name = VKD3D_SHADER_PARAMETER_NAME_CLIP_PLANE_0 + i; - parameters[i].type = VKD3D_SHADER_PARAMETER_TYPE_BUFFER; - parameters[i].data_type = VKD3D_SHADER_PARAMETER_DATA_TYPE_FLOAT32_VEC4; - parameters[i].u.buffer.set = 0; - parameters[i].u.buffer.binding = ffp_extra_binding; - parameters[i].u.buffer.offset = offsetof(struct wined3d_ffp_vs_constants, clip_planes[i]); - } + fill_buffer_parameter(¶meters[i], ffp_extra_binding, + VKD3D_SHADER_PARAMETER_NAME_CLIP_PLANE_0 + i, VKD3D_SHADER_PARAMETER_DATA_TYPE_FLOAT32_VEC4, + offsetof(struct wined3d_ffp_vs_constants, clip_planes[i])); parameters[8].name = VKD3D_SHADER_PARAMETER_NAME_CLIP_PLANE_MASK; parameters[8].type = VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT; parameters[8].data_type = VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32; parameters[8].u.immediate_constant.u.u32 = compile_args->u.vs.clip_planes; - vkd3d_args->parameter_info.parameter_count = 9; + fill_buffer_parameter(¶meters[9], ffp_extra_binding, VKD3D_SHADER_PARAMETER_NAME_POINT_SIZE, + VKD3D_SHADER_PARAMETER_DATA_TYPE_FLOAT32, offsetof(struct wined3d_ffp_vs_constants, point.size)); + fill_buffer_parameter(¶meters[10], ffp_extra_binding, VKD3D_SHADER_PARAMETER_NAME_POINT_SIZE_MIN, + VKD3D_SHADER_PARAMETER_DATA_TYPE_FLOAT32, offsetof(struct wined3d_ffp_vs_constants, point_clamp.min)); + fill_buffer_parameter(¶meters[11], ffp_extra_binding, VKD3D_SHADER_PARAMETER_NAME_POINT_SIZE_MAX, + VKD3D_SHADER_PARAMETER_DATA_TYPE_FLOAT32, offsetof(struct wined3d_ffp_vs_constants, point_clamp.max)); + + vkd3d_args->parameter_info.parameter_count = 12; vkd3d_args->parameter_info.parameters = vkd3d_args->parameters; } @@ -204,12 +217,8 @@ static void fill_ps_parameters(struct wined3d_shader_spirv_compile_args *vkd3d_a parameters[2].data_type = VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32; parameters[2].u.immediate_constant.u.u32 = compile_args->u.fs.args.alpha_test_func + 1; - parameters[3].name = VKD3D_SHADER_PARAMETER_NAME_ALPHA_TEST_REF; - parameters[3].type = VKD3D_SHADER_PARAMETER_TYPE_BUFFER; - parameters[3].data_type = VKD3D_SHADER_PARAMETER_DATA_TYPE_FLOAT32; - parameters[3].u.buffer.set = 0; - parameters[3].u.buffer.binding = ffp_extra_binding; - parameters[3].u.buffer.offset = offsetof(struct wined3d_ffp_ps_constants, alpha_test_ref); + fill_buffer_parameter(¶meters[3], ffp_extra_binding, VKD3D_SHADER_PARAMETER_NAME_ALPHA_TEST_REF, + VKD3D_SHADER_PARAMETER_DATA_TYPE_FLOAT32, offsetof(struct wined3d_ffp_ps_constants, alpha_test_ref)); vkd3d_args->parameter_info.parameter_count = 4; vkd3d_args->parameter_info.parameters = vkd3d_args->parameters; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8091
From: Elizabeth Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/shader_spirv.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 142b02346b2..ede45428a96 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -220,7 +220,12 @@ static void fill_ps_parameters(struct wined3d_shader_spirv_compile_args *vkd3d_a fill_buffer_parameter(¶meters[3], ffp_extra_binding, VKD3D_SHADER_PARAMETER_NAME_ALPHA_TEST_REF, VKD3D_SHADER_PARAMETER_DATA_TYPE_FLOAT32, offsetof(struct wined3d_ffp_ps_constants, alpha_test_ref)); - vkd3d_args->parameter_info.parameter_count = 4; + parameters[4].name = VKD3D_SHADER_PARAMETER_NAME_POINT_SPRITE; + parameters[4].type = VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT; + parameters[4].data_type = VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32; + parameters[4].u.immediate_constant.u.u32 = compile_args->u.fs.args.pointsprite; + + vkd3d_args->parameter_info.parameter_count = 5; vkd3d_args->parameter_info.parameters = vkd3d_args->parameters; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8091
This merge request was approved by Jan Sikorski. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8091
participants (3)
-
Elizabeth Figura -
Elizabeth Figura (＠zfigura)
-
Jan Sikorski (＠jsikorski)