Module: vkd3d Branch: master Commit: 9177df883ecf1bc66b39e28d8f6bb616572a75fe URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9177df883ecf1bc66b39e28d8f6bb6...
Author: Zebediah Figura zfigura@codeweavers.com Date: Sun Mar 3 23:58:15 2024 -0600
vkd3d-shader/hlsl: Write the SFI0 section and "REQUIRES_ROVS" flag when ROVs are used.
---
include/private/vkd3d_common.h | 1 + libs/vkd3d-shader/tpf.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+)
diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 8d6e7b37..dc0b2e17 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -64,6 +64,7 @@ #define TAG_RDEF VKD3D_MAKE_TAG('R', 'D', 'E', 'F') #define TAG_RTS0 VKD3D_MAKE_TAG('R', 'T', 'S', '0') #define TAG_SDBG VKD3D_MAKE_TAG('S', 'D', 'B', 'G') +#define TAG_SFI0 VKD3D_MAKE_TAG('S', 'F', 'I', '0') #define TAG_SHDR VKD3D_MAKE_TAG('S', 'H', 'D', 'R') #define TAG_SHEX VKD3D_MAKE_TAG('S', 'H', 'E', 'X') #define TAG_STAT VKD3D_MAKE_TAG('S', 'T', 'A', 'T') diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index c6cf1c95..3be4e40a 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -164,6 +164,21 @@ STATIC_ASSERT(SM4_MAX_SRC_COUNT <= SPIRV_MAX_SRC_COUNT); /* The shift that corresponds to the D3D_SIF_TEXTURE_COMPONENTS mask. */ #define VKD3D_SM4_SIF_TEXTURE_COMPONENTS_SHIFT 2
+#define VKD3D_SM4_REQUIRES_DOUBLES 0x00000001 +#define VKD3D_SM4_REQUIRES_EARLY_DEPTH_STENCIL 0x00000002 +#define VKD3D_SM4_REQUIRES_UAVS_AT_EVERY_STAGE 0x00000004 +#define VKD3D_SM4_REQUIRES_64_UAVS 0x00000008 +#define VKD3D_SM4_REQUIRES_MINIMUM_PRECISION 0x00000010 +#define VKD3D_SM4_REQUIRES_11_1_DOUBLE_EXTENSIONS 0x00000020 +#define VKD3D_SM4_REQUIRES_11_1_SHADER_EXTENSIONS 0x00000040 +#define VKD3D_SM4_REQUIRES_LEVEL_9_COMPARISON_FILTERING 0x00000080 +#define VKD3D_SM4_REQUIRES_TILED_RESOURCES 0x00000100 +#define VKD3D_SM4_REQUIRES_STENCIL_REF 0x00000200 +#define VKD3D_SM4_REQUIRES_INNER_COVERAGE 0x00000400 +#define VKD3D_SM4_REQUIRES_TYPED_UAV_LOAD_ADDITIONAL_FORMATS 0x00000800 +#define VKD3D_SM4_REQUIRES_ROVS 0x00001000 +#define VKD3D_SM4_REQUIRES_VIEWPORT_AND_RT_ARRAY_INDEX_FROM_ANY_SHADER_FEEDING_RASTERIZER 0x00002000 + enum vkd3d_sm4_opcode { VKD3D_SM4_OP_ADD = 0x00, @@ -5896,6 +5911,31 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, sm4_free_extern_resources(extern_resources, extern_resources_count); }
+static void write_sm4_sfi0(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) +{ + struct extern_resource *extern_resources; + unsigned int extern_resources_count; + uint64_t *flags; + + flags = vkd3d_calloc(1, sizeof(*flags)); + + extern_resources = sm4_get_extern_resources(ctx, &extern_resources_count); + for (unsigned int i = 0; i < extern_resources_count; ++i) + { + if (extern_resources[i].data_type->e.resource.rasteriser_ordered) + *flags |= VKD3D_SM4_REQUIRES_ROVS; + } + sm4_free_extern_resources(extern_resources, extern_resources_count); + + /* FIXME: We also emit code that should require UAVS_AT_EVERY_STAGE, + * STENCIL_REF, and TYPED_UAV_LOAD_ADDITIONAL_FORMATS. */ + + if (flags) + dxbc_writer_add_section(dxbc, TAG_SFI0, flags, sizeof(*flags)); + else + vkd3d_free(flags); +} + int hlsl_sm4_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out) { struct dxbc_writer dxbc; @@ -5908,6 +5948,7 @@ int hlsl_sm4_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun write_sm4_signature(ctx, &dxbc, true); write_sm4_rdef(ctx, &dxbc); write_sm4_shdr(ctx, entry_func, &dxbc); + write_sm4_sfi0(ctx, &dxbc);
if (!(ret = ctx->result)) ret = dxbc_writer_write(&dxbc, out);