January 2024 - Wine-Commits

Giovanni Mascellani : vkd3d-shader/spirv: Emit an error if merge information is missing.
by Alexandre Julliard Jan. 29, 2024

Jan. 29, 2024

Module: vkd3d Branch: master Commit: b97edee03d6c87390e95b681ee6f62b5d0844803 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b97edee03d6c87390e95b681ee6f6… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jan 17 14:24:43 2024 +0100 vkd3d-shader/spirv: Emit an error if merge information is missing. Instead of crashing. --- libs/vkd3d-shader/spirv.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6821a78f..544ed9d7 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7813,7 +7813,10 @@ static void spirv_compiler_emit_branch(struct spirv_compiler *compiler, if (instruction->src_count > 1) { /* Loop merge only. Must have a merge block and a continue block. */ - spirv_compiler_emit_merge(compiler, src[1].reg.idx[0].offset, src[2].reg.idx[0].offset); + if (instruction->src_count == 3) + spirv_compiler_emit_merge(compiler, src[1].reg.idx[0].offset, src[2].reg.idx[0].offset); + else + ERR("Invalid branch with %u sources.\n", instruction->src_count); } vkd3d_spirv_build_op_branch(builder, spirv_compiler_get_label_id(compiler, src[0].reg.idx[0].offset)); return; @@ -7830,8 +7833,11 @@ static void spirv_compiler_emit_branch(struct spirv_compiler *compiler, condition_id = spirv_compiler_emit_int_to_bool(compiler, VKD3D_SHADER_CONDITIONAL_OP_NZ, src[0].reg.data_type, 1, condition_id); /* Emit the merge immediately before the branch instruction. */ - spirv_compiler_emit_merge(compiler, src[3].reg.idx[0].offset, - (instruction->src_count > 4) ? src[4].reg.idx[0].offset : 0); + if (instruction->src_count >= 4) + spirv_compiler_emit_merge(compiler, src[3].reg.idx[0].offset, + (instruction->src_count > 4) ? src[4].reg.idx[0].offset : 0); + else + ERR("Invalid branch with %u sources.\n", instruction->src_count); vkd3d_spirv_build_op_branch_conditional(builder, condition_id, spirv_compiler_get_label_id(compiler, src[1].reg.idx[0].offset), spirv_compiler_get_label_id(compiler, src[2].reg.idx[0].offset));

1 0

Conor McCarthy : vkd3d-shader/dxil: Load raw/structured buffer SRV/UAV descriptors.
by Alexandre Julliard Jan. 29, 2024

Jan. 29, 2024

Module: vkd3d Branch: master Commit: 1bab93843d62e286c48153e7c290e28decec1013 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1bab93843d62e286c48153e7c290e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jan 3 16:07:49 2024 +1000 vkd3d-shader/dxil: Load raw/structured buffer SRV/UAV descriptors. --- libs/vkd3d-shader/dxil.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 8a31d03c..e09e90bf 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -5975,6 +5975,8 @@ static enum vkd3d_shader_resource_type shader_resource_type_from_dxil_resource_k switch (kind) { case RESOURCE_KIND_TYPEDBUFFER: + case RESOURCE_KIND_RAWBUFFER: + case RESOURCE_KIND_STRUCTUREDBUFFER: return VKD3D_SHADER_RESOURCE_BUFFER; default: return VKD3D_SHADER_RESOURCE_NONE; @@ -6039,6 +6041,13 @@ static struct vkd3d_shader_resource *sm6_parser_resources_load_common_info(struc } ins->resource_type = resource_type; + if (!m) + { + ins->handler_idx = is_uav ? VKD3DSIH_DCL_UAV_RAW : VKD3DSIH_DCL_RESOURCE_RAW; + ins->declaration.raw_resource.resource.reg.write_mask = 0; + return &ins->declaration.raw_resource.resource; + } + if (!sm6_metadata_value_is_node(m)) { WARN("Resource metadata list is not a node.\n"); @@ -6093,6 +6102,39 @@ static struct vkd3d_shader_resource *sm6_parser_resources_load_common_info(struc return &ins->declaration.semantic.resource; } + else if (dxil_resource_type == RESOURCE_TYPE_RAW_STRUCTURED) + { + if (kind == RESOURCE_KIND_RAWBUFFER) + { + ins->handler_idx = is_uav ? VKD3DSIH_DCL_UAV_RAW : VKD3DSIH_DCL_RESOURCE_RAW; + ins->declaration.raw_resource.resource.reg.write_mask = 0; + + return &ins->declaration.raw_resource.resource; + } + + if (kind != RESOURCE_KIND_STRUCTUREDBUFFER) + { + WARN("Unhandled resource kind %u.\n", kind); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "Resource kind %u for a raw or structured buffer is unhandled.", kind); + return NULL; + } + + ins->handler_idx = is_uav ? VKD3DSIH_DCL_UAV_STRUCTURED : VKD3DSIH_DCL_RESOURCE_STRUCTURED; + ins->declaration.structured_resource.byte_stride = values[1]; + ins->declaration.structured_resource.resource.reg.write_mask = 0; + + /* TODO: 16-bit resources. */ + if (ins->declaration.structured_resource.byte_stride % 4u) + { + WARN("Byte stride %u is not a multiple of 4.\n", ins->declaration.structured_resource.byte_stride); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "Structured resource byte stride %u is not a multiple of 4.", + ins->declaration.structured_resource.byte_stride); + } + + return &ins->declaration.structured_resource.resource; + } else { FIXME("Unhandled resource type %u.\n", dxil_resource_type); @@ -6159,7 +6201,8 @@ static enum vkd3d_result sm6_parser_resources_load_srv(struct sm6_parser *sm6, d->kind = kind; d->reg_type = VKD3DSPR_RESOURCE; d->reg_data_type = (ins->resource_type == VKD3D_SHADER_RESOURCE_BUFFER) ? VKD3D_DATA_UINT : VKD3D_DATA_RESOURCE; - d->resource_data_type = ins->declaration.semantic.resource_data_type[0]; + d->resource_data_type = (ins->handler_idx == VKD3DSIH_DCL) + ? ins->declaration.semantic.resource_data_type[0] : VKD3D_DATA_UNUSED; init_resource_declaration(resource, VKD3DSPR_RESOURCE, d->reg_data_type, d->id, &d->range); @@ -6232,7 +6275,8 @@ static enum vkd3d_result sm6_parser_resources_load_uav(struct sm6_parser *sm6, d->kind = values[0]; d->reg_type = VKD3DSPR_UAV; d->reg_data_type = (ins->resource_type == VKD3D_SHADER_RESOURCE_BUFFER) ? VKD3D_DATA_UINT : VKD3D_DATA_UAV; - d->resource_data_type = ins->declaration.semantic.resource_data_type[0]; + d->resource_data_type = (ins->handler_idx == VKD3DSIH_DCL_UAV_TYPED) + ? ins->declaration.semantic.resource_data_type[0] : VKD3D_DATA_UNUSED; init_resource_declaration(resource, VKD3DSPR_UAV, d->reg_data_type, d->id, &d->range);

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic RawBufferLoad.
by Alexandre Julliard Jan. 29, 2024

Jan. 29, 2024

Module: vkd3d Branch: master Commit: e08c0cfc4f83e428361d2e13a1d8280eef718ec2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e08c0cfc4f83e428361d2e13a1d82… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jan 3 16:09:01 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic RawBufferLoad. --- libs/vkd3d-shader/dxil.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index e09e90bf..ebe600e1 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -363,6 +363,7 @@ enum dx_intrinsic_opcode DX_DERIV_FINEY = 86, DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, + DX_RAW_BUFFER_LOAD = 139, }; enum dxil_cast_code @@ -2078,6 +2079,8 @@ static void instruction_init_with_resource(struct vkd3d_shader_instruction *ins, { vsir_instruction_init(ins, &sm6->p.location, handler_idx); ins->resource_type = resource->u.handle.d->resource_type; + ins->raw = resource->u.handle.d->kind == RESOURCE_KIND_RAWBUFFER; + ins->structured = resource->u.handle.d->kind == RESOURCE_KIND_STRUCTUREDBUFFER; } static struct vkd3d_shader_src_param *instruction_src_params_alloc(struct vkd3d_shader_instruction *ins, @@ -3100,6 +3103,15 @@ static void dst_param_io_init(struct vkd3d_shader_dst_param *param, param->reg.dimension = VSIR_DIMENSION_VEC4; } +static void src_params_init_from_operands(struct vkd3d_shader_src_param *src_params, + const struct sm6_value **operands, unsigned int count) +{ + unsigned int i; + + for (i = 0; i < count; ++i) + src_param_init_from_value(&src_params[i], operands[i]); +} + static void sm6_parser_init_signature(struct sm6_parser *sm6, const struct shader_signature *s, enum vkd3d_shader_register_type reg_type, struct vkd3d_shader_dst_param *params) { @@ -3722,6 +3734,49 @@ static void sm6_parser_emit_dx_load_input(struct sm6_parser *sm6, enum dx_intrin instruction_dst_param_init_ssa_scalar(ins, sm6); } +static void sm6_parser_emit_dx_raw_buffer_load(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + unsigned int operand_count, write_mask, component_count = VKD3D_VEC4_SIZE; + struct vkd3d_shader_instruction *ins = state->ins; + struct vkd3d_shader_src_param *src_params; + const struct sm6_value *resource; + bool raw; + + resource = operands[0]; + if (!sm6_value_validate_is_handle(resource, sm6)) + return; + raw = resource->u.handle.d->kind == RESOURCE_KIND_RAWBUFFER; + + if (op == DX_RAW_BUFFER_LOAD) + { + write_mask = sm6_value_get_constant_uint(operands[3]); + if (!write_mask || write_mask > VKD3DSP_WRITEMASK_ALL) + { + WARN("Invalid write mask %#x.\n", write_mask); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Write mask %#x for a raw/structured buffer load operation is invalid.", write_mask); + return; + } + else if (write_mask & (write_mask + 1)) + { + FIXME("Unhandled write mask %#x.\n", write_mask); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Write mask %#x for a raw/structured buffer load operation is unhandled.", write_mask); + } + component_count = vsir_write_mask_component_count(write_mask); + } + + instruction_init_with_resource(ins, raw ? VKD3DSIH_LD_RAW : VKD3DSIH_LD_STRUCTURED, resource, sm6); + operand_count = 2 + !raw; + if (!(src_params = instruction_src_params_alloc(ins, operand_count, sm6))) + return; + src_params_init_from_operands(src_params, &operands[1], operand_count - 1); + src_param_init_vector_from_reg(&src_params[operand_count - 1], &resource->u.handle.reg); + + instruction_dst_param_init_ssa_vector(ins, component_count, sm6); +} + static void sm6_parser_emit_dx_buffer_load(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { @@ -3733,6 +3788,12 @@ static void sm6_parser_emit_dx_buffer_load(struct sm6_parser *sm6, enum dx_intri if (!sm6_value_validate_is_handle(resource, sm6)) return; + if (resource->u.handle.d->kind == RESOURCE_KIND_RAWBUFFER + || resource->u.handle.d->kind == RESOURCE_KIND_STRUCTUREDBUFFER) + { + return sm6_parser_emit_dx_raw_buffer_load(sm6, op, operands, state); + } + if (resource->u.handle.d->kind != RESOURCE_KIND_TYPEDBUFFER) { WARN("Resource is not a typed buffer.\n"); @@ -3884,6 +3945,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_LEGACY_F32TOF16 ] = {"i", "f", sm6_parser_emit_dx_unary}, [DX_LOAD_INPUT ] = {"o", "ii8i", sm6_parser_emit_dx_load_input}, [DX_LOG ] = {"g", "R", sm6_parser_emit_dx_unary}, + [DX_RAW_BUFFER_LOAD ] = {"o", "Hii8i", sm6_parser_emit_dx_raw_buffer_load}, [DX_ROUND_NE ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_ROUND_NI ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_ROUND_PI ] = {"g", "R", sm6_parser_emit_dx_unary},

1 0

Alexandre Julliard : Release 9.1.
by Alexandre Julliard Jan. 26, 2024

Jan. 26, 2024

Module: wine Branch: master Commit: c963c4141a0d4f6601c37f11d79de186be0da6a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/c963c4141a0d4f6601c37f11d79de1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 23:56:23 2024 +0100 Release 9.1. --- .mailmap | 1 + ANNOUNCE.md | 724 ++++++++++++++++++++++++++++++++++-------------------------- AUTHORS | 5 + VERSION | 2 +- configure | 18 +- 5 files changed, 424 insertions(+), 326 deletions(-)

1 0

Tag wine-9.1 : Alexandre Julliard : Release 9.1
by Alexandre Julliard Jan. 26, 2024

Jan. 26, 2024

Module: wine Branch: refs/tags/wine-9.1 Tag: 7b300159847be9eec65067a5c0cd07f0f96d4c22 URL: https://gitlab.winehq.org/wine/wine/-/tags/7b300159847be9eec65067a5c0cd07f0… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 23:56:23 2024 +0100 Release 9.1

1 0

Zebediah Figura : wined3d: Collapse some trivially nested ifs into a single condition.
by Alexandre Julliard Jan. 26, 2024

Jan. 26, 2024

Module: wine Branch: master Commit: 34232874adadb198d1715b22e6faf504c560612e URL: https://gitlab.winehq.org/wine/wine/-/commit/34232874adadb198d1715b22e6faf5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jan 22 17:07:04 2024 -0600 wined3d: Collapse some trivially nested ifs into a single condition. --- dlls/wined3d/utils.c | 54 +++++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a0b1fded9f5..24bbad0f6fa 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6477,35 +6477,37 @@ void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, const st aarg0 = (args[aop] & ARG0) ? state->texture_states[i][WINED3D_TSS_ALPHA_ARG0] : ARG_UNUSED; } - if (!i && texture && state->render_states[WINED3D_RS_COLORKEYENABLE]) + if (!i && state->render_states[WINED3D_RS_COLORKEYENABLE] + && texture && !(texture->resource.usage & WINED3DUSAGE_LEGACY_CUBEMAP) + && (texture->async.color_key_flags & WINED3D_CKEY_SRC_BLT) && !texture->resource.format->alpha_size) { - if (!(texture->resource.usage & WINED3DUSAGE_LEGACY_CUBEMAP)) + if (aop == WINED3D_TOP_DISABLE) { - if (texture->async.color_key_flags & WINED3D_CKEY_SRC_BLT && !texture->resource.format->alpha_size) + aarg1 = WINED3DTA_TEXTURE; + aop = WINED3D_TOP_SELECT_ARG1; + } + else if (aop == WINED3D_TOP_SELECT_ARG1 && aarg1 != WINED3DTA_TEXTURE) + { + if (state->blend_state && state->blend_state->desc.rt[0].enable) { - if (aop == WINED3D_TOP_DISABLE) - { - aarg1 = WINED3DTA_TEXTURE; - aop = WINED3D_TOP_SELECT_ARG1; - } - else if (aop == WINED3D_TOP_SELECT_ARG1 && aarg1 != WINED3DTA_TEXTURE) - { - if (state->blend_state && state->blend_state->desc.rt[0].enable) - { - aarg2 = WINED3DTA_TEXTURE; - aop = WINED3D_TOP_MODULATE; - } - else aarg1 = WINED3DTA_TEXTURE; - } - else if (aop == WINED3D_TOP_SELECT_ARG2 && aarg2 != WINED3DTA_TEXTURE) - { - if (state->blend_state && state->blend_state->desc.rt[0].enable) - { - aarg1 = WINED3DTA_TEXTURE; - aop = WINED3D_TOP_MODULATE; - } - else aarg2 = WINED3DTA_TEXTURE; - } + aarg2 = WINED3DTA_TEXTURE; + aop = WINED3D_TOP_MODULATE; + } + else + { + aarg1 = WINED3DTA_TEXTURE; + } + } + else if (aop == WINED3D_TOP_SELECT_ARG2 && aarg2 != WINED3DTA_TEXTURE) + { + if (state->blend_state && state->blend_state->desc.rt[0].enable) + { + aarg1 = WINED3DTA_TEXTURE; + aop = WINED3D_TOP_MODULATE; + } + else + { + aarg2 = WINED3DTA_TEXTURE; } } }

1 0

Zebediah Figura : wined3d: Check for WINED3DUSAGE_LEGACY_CUBEMAP instead of checking the GL texture target.
by Alexandre Julliard Jan. 26, 2024

Jan. 26, 2024

Module: wine Branch: master Commit: d219903c612b4e0c770b657ffddcef21d04fb9e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/d219903c612b4e0c770b657ffddcef… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 16 19:42:41 2023 -0600 wined3d: Check for WINED3DUSAGE_LEGACY_CUBEMAP instead of checking the GL texture target. This check was introduced in 4640be8dc834. At that point the only way for that condition to be false was for a cube map texture. It's not clear why cube maps are relevant here; we have no tests for this, but it seems most expedient to just preserve the intent of the check. --- dlls/wined3d/utils.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index cda31374c93..a0b1fded9f5 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6479,11 +6479,7 @@ void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, const st if (!i && texture && state->render_states[WINED3D_RS_COLORKEYENABLE]) { - GLenum texture_dimensions; - - texture_dimensions = wined3d_texture_gl(texture)->target; - - if (texture_dimensions == GL_TEXTURE_2D || texture_dimensions == GL_TEXTURE_RECTANGLE_ARB) + if (!(texture->resource.usage & WINED3DUSAGE_LEGACY_CUBEMAP)) { if (texture->async.color_key_flags & WINED3D_CKEY_SRC_BLT && !texture->resource.format->alpha_size) {

1 0

Zebediah Figura : wined3d: Set the tex_type field of the FFP fragment settings from the resource's GL type.
by Alexandre Julliard Jan. 26, 2024

Jan. 26, 2024

Module: wine Branch: master Commit: df70800b12c55f7d099b3e390bb8357b2f95feae URL: https://gitlab.winehq.org/wine/wine/-/commit/df70800b12c55f7d099b3e390bb835… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 16 19:18:33 2023 -0600 wined3d: Set the tex_type field of the FFP fragment settings from the resource's GL type. --- dlls/wined3d/utils.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a46a4c7257d..cda31374c93 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6437,30 +6437,9 @@ void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, const st else settings->op[i].color_fixup = texture->resource.format->color_fixup; if (ignore_textype) - { settings->op[i].tex_type = WINED3D_GL_RES_TYPE_TEX_1D; - } else - { - switch (wined3d_texture_gl(texture)->target) - { - case GL_TEXTURE_1D: - settings->op[i].tex_type = WINED3D_GL_RES_TYPE_TEX_1D; - break; - case GL_TEXTURE_2D: - settings->op[i].tex_type = WINED3D_GL_RES_TYPE_TEX_2D; - break; - case GL_TEXTURE_3D: - settings->op[i].tex_type = WINED3D_GL_RES_TYPE_TEX_3D; - break; - case GL_TEXTURE_CUBE_MAP_ARB: - settings->op[i].tex_type = WINED3D_GL_RES_TYPE_TEX_CUBE; - break; - case GL_TEXTURE_RECTANGLE_ARB: - settings->op[i].tex_type = WINED3D_GL_RES_TYPE_TEX_RECT; - break; - } - } + settings->op[i].tex_type = texture->resource.gl_type; } else { settings->op[i].color_fixup = COLOR_FIXUP_IDENTITY; settings->op[i].tex_type = WINED3D_GL_RES_TYPE_TEX_1D;

1 0

Zebediah Figura : wined3d: Check the wined3d resource type and usage in find_ps_compile_args().
by Alexandre Julliard Jan. 26, 2024

Jan. 26, 2024

Module: wine Branch: master Commit: 36597df656347670a779f91ac7bb983e8ae8e0d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/36597df656347670a779f91ac7bb98… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 18:42:09 2023 -0600 wined3d: Check the wined3d resource type and usage in find_ps_compile_args(). --- dlls/wined3d/shader.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8553ff6ec72..91105a43a91 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -26,7 +26,6 @@ #include <string.h> #include "wined3d_private.h" -#include "wined3d_gl.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); @@ -2845,6 +2844,8 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 { for (i = 0; i < shader->limits->sampler; ++i) { + enum wined3d_shader_tex_types type = WINED3D_SHADER_TEX_2D; + if (!shader->reg_maps.resource_info[i].type) continue; @@ -2855,20 +2856,24 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 continue; texture = texture_from_resource(view->resource); - switch (wined3d_texture_gl(texture)->target) + switch (texture->resource.type) { - /* RECT textures are distinguished from 2D textures via np2_fixup */ - default: + case WINED3D_RTYPE_NONE: + case WINED3D_RTYPE_BUFFER: + case WINED3D_RTYPE_TEXTURE_1D: + assert(0); + + case WINED3D_RTYPE_TEXTURE_2D: + if (texture->resource.usage & WINED3DUSAGE_LEGACY_CUBEMAP) + type = WINED3D_SHADER_TEX_CUBE; break; - case GL_TEXTURE_3D: - args->tex_types |= WINED3D_SHADER_TEX_3D << i * WINED3D_PSARGS_TEXTYPE_SHIFT; - break; - - case GL_TEXTURE_CUBE_MAP_ARB: - args->tex_types |= WINED3D_SHADER_TEX_CUBE << i * WINED3D_PSARGS_TEXTYPE_SHIFT; + case WINED3D_RTYPE_TEXTURE_3D: + type = WINED3D_SHADER_TEX_3D; break; } + + args->tex_types |= (type << (i * WINED3D_PSARGS_TEXTYPE_SHIFT)); } } else if (shader->reg_maps.shader_version.major <= 3)

1 0

Zebediah Figura : d3d11/tests: Add a test for shader stencil export.
by Alexandre Julliard Jan. 26, 2024

Jan. 26, 2024

Module: wine Branch: master Commit: dc15413585c3db2b3181c7863ff53393624f4f22 URL: https://gitlab.winehq.org/wine/wine/-/commit/dc15413585c3db2b3181c7863ff533… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Mar 20 20:22:43 2022 -0500 d3d11/tests: Add a test for shader stencil export. Ported from b8ab71e4dc in vkd3d by Conor McCarthy. --- dlls/d3d11/tests/d3d11.c | 160 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 727f263731d..d08c19f89cf 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -21,6 +21,7 @@ #include <float.h> #include <limits.h> #include <math.h> +#include <stdbool.h> #include <stdlib.h> #define COBJMACROS #include "initguid.h" @@ -1646,6 +1647,16 @@ static BOOL check_compute_shaders_via_sm4_support(ID3D11Device *device) return options.ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x; } +static bool check_stencil_ref_export_support(ID3D11Device *device) +{ + D3D11_FEATURE_DATA_D3D11_OPTIONS2 options; + + if (FAILED(ID3D11Device_CheckFeatureSupport(device, + D3D11_FEATURE_D3D11_OPTIONS2, &options, sizeof(options)))) + return false; + return options.PSSpecifiedStencilRefSupported; +} + static BOOL check_viewport_array_index_from_any_shader_support(ID3D11Device *device) { D3D11_FEATURE_DATA_D3D11_OPTIONS3 options; @@ -35452,6 +35463,154 @@ static void test_clear_during_render(void) release_test_context(&test_context); } +static void test_stencil_export(void) +{ + D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc; + D3D11_DEPTH_STENCIL_VIEW_DESC dsv_desc; + struct d3d11_test_context test_context; + D3D11_DEPTH_STENCIL_DESC ds_desc = {0}; + ID3D11DepthStencilState *ds_state; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11PixelShader *ps, *ps_sample; + ID3D11ShaderResourceView *srv; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11DepthStencilView *dsv; + ID3D11RenderTargetView *rtv; + ID3D11Texture2D *rt, *ds; + ID3D11Device *device; + ID3D11Buffer *cb; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + uint stencil_ref; + + uint main() : SV_StencilRef + { + return stencil_ref; + } +#endif + 0x43425844, 0x3980cb16, 0xbbe87d38, 0xb93f7c61, 0x200c41ed, 0x00000001, 0x000000cc, 0x00000004, + 0x00000030, 0x00000040, 0x00000078, 0x000000bc, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x00000030, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0xffffffff, 0x00000e01, 0x535f5653, 0x636e6574, 0x65526c69, 0xabab0066, 0x58454853, 0x0000003c, + 0x00000050, 0x0000000f, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x02000065, + 0x00029001, 0x05000036, 0x00029001, 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, 0x30494653, + 0x00000008, 0x00000200, 0x00000000, + }; + static const DWORD ps_sample_code[] = + { +#if 0 + Texture2D<uint4> tex : register(t0); + + uint4 main(float4 pos : SV_Position) : SV_TARGET + { + return tex[uint2(pos.xy)].g; + } +#endif + 0x43425844, 0xdd1e98d4, 0x53c81701, 0x576f6b2e, 0x040b18bb, 0x00000001, 0x0000014c, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x58454853, 0x000000b0, 0x00000050, + 0x0000002c, 0x0100086a, 0x04001858, 0x00107000, 0x00000000, 0x00004444, 0x04002064, 0x00101032, + 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0500001c, + 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8900002d, 0x800000c2, 0x00111103, 0x00100012, + 0x00000000, 0x00100e46, 0x00000000, 0x00107e16, 0x00000000, 0x05000036, 0x001020f2, 0x00000000, + 0x00100006, 0x00000000, 0x0100003e, + }; + static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; + static const DWORD cb_data[4] = {0xff}; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + if (!check_stencil_ref_export_support(device)) + { + skip("The device does not support stencil ref export.\n"); + release_test_context(&test_context); + return; + } + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_R8_UINT; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &rt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)rt, NULL, &rtv); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_R32G8X24_TYPELESS; + texture_desc.BindFlags = D3D11_BIND_DEPTH_STENCIL | D3D11_BIND_SHADER_RESOURCE; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &ds); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + dsv_desc.Format = DXGI_FORMAT_D32_FLOAT_S8X24_UINT; + dsv_desc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2D; + dsv_desc.Flags = 0; + dsv_desc.Texture2D.MipSlice = 0; + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)ds, &dsv_desc, &dsv); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + srv_desc.Format = DXGI_FORMAT_X32_TYPELESS_G8X24_UINT; + srv_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D; + srv_desc.Texture2D.MostDetailedMip = 0; + srv_desc.Texture2D.MipLevels = 1; + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)ds, &srv_desc, &srv); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + ds_desc.DepthFunc = D3D11_COMPARISON_NEVER; + ds_desc.StencilEnable = TRUE, + ds_desc.StencilReadMask = D3D11_DEFAULT_STENCIL_READ_MASK, + ds_desc.StencilWriteMask = D3D11_DEFAULT_STENCIL_WRITE_MASK, + ds_desc.FrontFace.StencilFailOp = D3D11_STENCIL_OP_REPLACE, + ds_desc.FrontFace.StencilDepthFailOp = D3D11_STENCIL_OP_REPLACE, + ds_desc.FrontFace.StencilPassOp = D3D11_STENCIL_OP_REPLACE, + ds_desc.FrontFace.StencilFunc = D3D11_COMPARISON_ALWAYS, + ds_desc.BackFace = ds_desc.FrontFace; + hr = ID3D11Device_CreateDepthStencilState(device, &ds_desc, &ds_state); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ps_sample_code, sizeof(ps_sample_code), NULL, &ps_sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(cb_data), cb_data); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_STENCIL, 0.0f, 0x80); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, dsv); + ID3D11DeviceContext_OMSetDepthStencilState(context, ds_state, 0); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); + draw_quad(&test_context); + + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, black); + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); + ID3D11DeviceContext_PSSetShader(context, ps_sample, NULL, 0); + draw_quad(&test_context); + + get_texture_readback(rt, 0, &rb); + check_readback_data_u8(&rb, NULL, 0xff, 0); + release_resource_readback(&rb); + + ID3D11ShaderResourceView_Release(srv); + ID3D11Buffer_Release(cb); + ID3D11PixelShader_Release(ps); + ID3D11PixelShader_Release(ps_sample); + ID3D11DepthStencilState_Release(ds_state); + ID3D11Texture2D_Release(rt); + ID3D11Texture2D_Release(ds); + ID3D11RenderTargetView_Release(rtv); + ID3D11DepthStencilView_Release(dsv); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -35649,6 +35808,7 @@ START_TEST(d3d11) queue_for_each_feature_level(test_shared_resource); queue_test(test_keyed_mutex); queue_test(test_clear_during_render); + queue_test(test_stencil_export); run_queued_tests();

1 0