May 2024 - Wine-commits - list.winehq.org

Conor McCarthy : vkd3d-shader/spirv: Do not warn if no global flags are unhandled.
by Alexandre Julliard 13 May '24

13 May '24

Module: vkd3d Branch: master Commit: e340855122b2eb0af03d6712b9d6a331b4a05c3d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e340855122b2eb0af03d6712b9d6a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Nov 30 17:02:15 2023 +1000 vkd3d-shader/spirv: Do not warn if no global flags are unhandled. --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a78af601..af2be2e0 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5842,7 +5842,7 @@ static void spirv_compiler_emit_dcl_global_flags(struct spirv_compiler *compiler if (flags & ~(VKD3DSGF_REFACTORING_ALLOWED | VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS)) FIXME("Unhandled global flags %#"PRIx64".\n", (uint64_t)flags); - else + else if (flags) WARN("Unhandled global flags %#"PRIx64".\n", (uint64_t)flags); }

1 0

Conor McCarthy : vkd3d-shader/spirv: Emit a trace instead of a warning message for ignored alignment.
by Alexandre Julliard 13 May '24

13 May '24

Module: vkd3d Branch: master Commit: f47ac703ab2f6fd5d0ee2db1723485f10af9634a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f47ac703ab2f6fd5d0ee2db172348… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Apr 24 00:32:13 2024 +1000 vkd3d-shader/spirv: Emit a trace instead of a warning message for ignored alignment. --- libs/vkd3d-shader/spirv.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index af2be2e0..c1079166 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3617,8 +3617,9 @@ static void spirv_compiler_emit_dereference_register(struct spirv_compiler *comp indexes[index_count++] = spirv_compiler_emit_register_addressing(compiler, &reg->idx[0]); } + /* Alignment is supported only in the Kernel execution model and is an optimisation only. */ if (reg->alignment) - WARN("Ignoring alignment %u.\n", reg->alignment); + TRACE("Ignoring alignment %u.\n", reg->alignment); if (index_count) { @@ -5904,8 +5905,9 @@ static void spirv_compiler_emit_dcl_indexable_temp(struct spirv_compiler *compil vsir_register_init(&reg, VKD3DSPR_IDXTEMP, VKD3D_DATA_FLOAT, 1); reg.idx[0].offset = temp->register_idx; + /* Alignment is supported only in the Kernel execution model and is an optimisation only. */ if (temp->alignment) - WARN("Ignoring alignment %u.\n", temp->alignment); + TRACE("Ignoring alignment %u.\n", temp->alignment); function_location = spirv_compiler_get_current_function_location(compiler); vkd3d_spirv_begin_function_stream_insertion(builder, function_location);

1 0

Conor McCarthy : vkd3d-shader/dxil: Delete bool not-equal-to-false comparison instructions.
by Alexandre Julliard 13 May '24

13 May '24

Module: vkd3d Branch: master Commit: def87539de122956d9464664a61ef32f3b506bb0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/def87539de122956d9464664a61ef… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Apr 24 12:23:27 2024 +1000 vkd3d-shader/dxil: Delete bool not-equal-to-false comparison instructions. --- libs/vkd3d-shader/dxil.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index ab165910..22fdcf9f 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -6726,6 +6726,15 @@ static void sm6_parser_emit_cmp2(struct sm6_parser *sm6, const struct dxil_recor code = record->operands[i++]; + /* dxcompiler occasionally emits bool not-equal-to-false, which is a no-op. Bool comparisons + * do not otherwise occur, so deleting these avoids the need for backend support. */ + if (sm6_type_is_bool(type_a) && code == ICMP_NE && sm6_value_is_constant_zero(b)) + { + ins->handler_idx = VKD3DSIH_NOP; + *dst = *a; + return; + } + if ((!is_int && !is_fp) || is_int != (code >= ICMP_EQ)) { FIXME("Invalid operation %"PRIu64" on type class %u.\n", code, type_a->class);

1 0

Conor McCarthy : vkd3d-shader/ir: Allow all DCL instructions to occur outside hull shader phases.
by Alexandre Julliard 13 May '24

13 May '24

Module: vkd3d Branch: master Commit: 98f73ca2e5353b858f3249716dbb7ed957d8e3e1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/98f73ca2e5353b858f3249716dbb7… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Apr 24 12:28:45 2024 +1000 vkd3d-shader/ir: Allow all DCL instructions to occur outside hull shader phases. --- libs/vkd3d-shader/ir.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index c6ecbdd9..2c78447e 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -5748,11 +5748,6 @@ static void vsir_validate_instruction(struct validation_context *ctx) instruction->declaration.max_tessellation_factor); return; - /* The DXIL parser can generate these outside phases, but this is not an issue. */ - case VKD3DSIH_DCL_INPUT: - case VKD3DSIH_DCL_OUTPUT: - return; - case VKD3DSIH_DCL_INPUT_PRIMITIVE: if (instruction->declaration.primitive_type.type == VKD3D_PT_UNDEFINED || instruction->declaration.primitive_type.type >= VKD3D_PT_COUNT) @@ -5810,7 +5805,9 @@ static void vsir_validate_instruction(struct validation_context *ctx) break; } - if (version->type == VKD3D_SHADER_TYPE_HULL && ctx->phase == VKD3DSIH_INVALID) + /* Only DCL instructions may occur outside hull shader phases. */ + if (!vsir_instruction_is_dcl(instruction) && version->type == VKD3D_SHADER_TYPE_HULL + && ctx->phase == VKD3DSIH_INVALID) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER, "Instruction %#x appear before any phase instruction in a hull shader.", instruction->handler_idx);

1 0

Conor McCarthy : tests: Add tests for D3D12_FEATURE_SHADER_MODEL.
by Alexandre Julliard 13 May '24

13 May '24

Module: vkd3d Branch: master Commit: 677c23f1fe2cfd63ac5338f92eb7653b081cd6af URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/677c23f1fe2cfd63ac5338f92eb76… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed May 8 15:28:47 2024 +1000 tests: Add tests for D3D12_FEATURE_SHADER_MODEL. --- tests/d3d12.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index d75a7ffe..0258604d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -800,9 +800,11 @@ static void test_check_feature_support(void) D3D12_FEATURE_DATA_ROOT_SIGNATURE root_signature; D3D_FEATURE_LEVEL max_supported_feature_level; D3D12_FEATURE_DATA_ARCHITECTURE architecture; + D3D12_FEATURE_DATA_SHADER_MODEL shader_model; D3D12_FEATURE_DATA_FORMAT_INFO format_info; unsigned int expected_plane_count; ID3D12Device *device; + D3D_SHADER_MODEL sm; DXGI_FORMAT format; ULONG refcount; bool is_todo; @@ -988,6 +990,39 @@ static void test_check_feature_support(void) trace("GPU virtual address bits per process: %u.\n", gpu_virtual_address.MaxGPUVirtualAddressBitsPerProcess); + /* Shader model */ + shader_model.HighestShaderModel = D3D_SHADER_MODEL_5_1; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &shader_model, sizeof(shader_model)); + ok(hr == S_OK, "Failed to check shader model, hr %#x.\n", hr); + todo + ok(shader_model.HighestShaderModel <= D3D_SHADER_MODEL_5_1, + "Got shader model %#x, expected <= %#x.\n", shader_model.HighestShaderModel, D3D_SHADER_MODEL_5_1); + for (sm = D3D_HIGHEST_SHADER_MODEL; sm >= D3D_SHADER_MODEL_6_0; --sm) + { + shader_model.HighestShaderModel = sm; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &shader_model, sizeof(shader_model)); + ok(hr == S_OK || hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + break; + } + ok(hr == S_OK, "Failed to check shader model, hr %#x.\n", hr); + trace("Highest shader model %#x.\n", shader_model.HighestShaderModel); + ok(shader_model.HighestShaderModel <= sm, + "Got shader model %#x, expected <= %#x.\n", shader_model.HighestShaderModel, sm); + shader_model.HighestShaderModel = 0x89; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &shader_model, sizeof(shader_model)); + todo + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + shader_model.HighestShaderModel = 0x52; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &shader_model, sizeof(shader_model)); + todo + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + shader_model.HighestShaderModel = 0; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &shader_model, sizeof(shader_model)); + todo + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + /* Root signature */ root_signature.HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_0; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_ROOT_SIGNATURE, &root_signature, sizeof(root_signature));

1 0

Conor McCarthy : vkd3d: Return a shader model no higher than the requested one for D3D12_FEATURE_SHADER_MODEL.
by Alexandre Julliard 13 May '24

13 May '24

Module: vkd3d Branch: master Commit: d17956ced877690d6f455f259d7766f113ad8b2a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d17956ced877690d6f455f259d776… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 30 23:59:27 2024 +1000 vkd3d: Return a shader model no higher than the requested one for D3D12_FEATURE_SHADER_MODEL. --- libs/vkd3d/device.c | 4 ++-- tests/d3d12.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 36d84339..3eb7ec85 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3490,9 +3490,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device9 TRACE("Request shader model %#x.\n", data->HighestShaderModel); #ifdef VKD3D_SHADER_UNSUPPORTED_DXIL - data->HighestShaderModel = D3D_SHADER_MODEL_6_0; + data->HighestShaderModel = min(data->HighestShaderModel, D3D_SHADER_MODEL_6_0); #else - data->HighestShaderModel = D3D_SHADER_MODEL_5_1; + data->HighestShaderModel = min(data->HighestShaderModel, D3D_SHADER_MODEL_5_1); #endif TRACE("Shader model %#x.\n", data->HighestShaderModel); diff --git a/tests/d3d12.c b/tests/d3d12.c index 0258604d..8db0af99 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -994,7 +994,6 @@ static void test_check_feature_support(void) shader_model.HighestShaderModel = D3D_SHADER_MODEL_5_1; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &shader_model, sizeof(shader_model)); ok(hr == S_OK, "Failed to check shader model, hr %#x.\n", hr); - todo ok(shader_model.HighestShaderModel <= D3D_SHADER_MODEL_5_1, "Got shader model %#x, expected <= %#x.\n", shader_model.HighestShaderModel, D3D_SHADER_MODEL_5_1); for (sm = D3D_HIGHEST_SHADER_MODEL; sm >= D3D_SHADER_MODEL_6_0; --sm)

1 0

Conor McCarthy : vkd3d: Return E_INVALIDARG if the requested shader model is unknown.
by Alexandre Julliard 13 May '24

13 May '24

Module: vkd3d Branch: master Commit: fb20639eb449295131ca8e3c93fd5b4abc79da9f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fb20639eb449295131ca8e3c93fd5… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed May 1 00:01:02 2024 +1000 vkd3d: Return E_INVALIDARG if the requested shader model is unknown. --- libs/vkd3d/device.c | 8 ++++++++ tests/d3d12.c | 3 --- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 3eb7ec85..6b39663a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3487,6 +3487,14 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device9 return E_INVALIDARG; } + if (data->HighestShaderModel != D3D_SHADER_MODEL_5_1 + && (data->HighestShaderModel < D3D_SHADER_MODEL_6_0 + || data->HighestShaderModel > D3D_HIGHEST_SHADER_MODEL)) + { + WARN("Unknown shader model %#x.\n", data->HighestShaderModel); + return E_INVALIDARG; + } + TRACE("Request shader model %#x.\n", data->HighestShaderModel); #ifdef VKD3D_SHADER_UNSUPPORTED_DXIL diff --git a/tests/d3d12.c b/tests/d3d12.c index 8db0af99..f55eefc0 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1010,15 +1010,12 @@ static void test_check_feature_support(void) "Got shader model %#x, expected <= %#x.\n", shader_model.HighestShaderModel, sm); shader_model.HighestShaderModel = 0x89; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &shader_model, sizeof(shader_model)); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); shader_model.HighestShaderModel = 0x52; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &shader_model, sizeof(shader_model)); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); shader_model.HighestShaderModel = 0; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &shader_model, sizeof(shader_model)); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); /* Root signature */

1 0

Giovanni Mascellani : vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS14 in CheckFeatureSupport().
by Alexandre Julliard 13 May '24

13 May '24

Module: vkd3d Branch: master Commit: 761ee1e487a7f1c6db9e46e07d34c81198015e80 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/761ee1e487a7f1c6db9e46e07d34c… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed May 8 11:15:59 2024 +0200 vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS14 in CheckFeatureSupport(). --- include/vkd3d_d3d12.idl | 8 ++++++++ libs/vkd3d/device.c | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 9b1b494c..ecda1a40 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2447,6 +2447,13 @@ typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS13 BOOL AlphaBlendFactorSupported; } D3D12_FEATURE_DATA_D3D12_OPTIONS13; +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS14 +{ + BOOL AdvancedTextureOpsSupported; + BOOL WriteableMSAATexturesSupported; + BOOL IndependentFrontAndBackStencilRefMaskSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS14; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, @@ -2482,6 +2489,7 @@ typedef enum D3D12_FEATURE D3D12_FEATURE_D3D12_OPTIONS11 = 40, D3D12_FEATURE_D3D12_OPTIONS12 = 41, D3D12_FEATURE_D3D12_OPTIONS13 = 42, + D3D12_FEATURE_D3D12_OPTIONS14 = 43, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 6b39663a..58a58050 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3919,6 +3919,25 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device9 return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS14: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS14 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + } + + data->AdvancedTextureOpsSupported = FALSE; + data->WriteableMSAATexturesSupported = FALSE; + data->IndependentFrontAndBackStencilRefMaskSupported = FALSE; + + TRACE("Advanced texture ops %#x.\n", data->AdvancedTextureOpsSupported); + TRACE("Writeable MSAA textures %#x.\n", data->WriteableMSAATexturesSupported); + TRACE("Independent front and back stencil ref mask %#x.\n", data->IndependentFrontAndBackStencilRefMaskSupported); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Giovanni Mascellani : vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS15 in CheckFeatureSupport().
by Alexandre Julliard 13 May '24

13 May '24

Module: vkd3d Branch: master Commit: 5445c4c8aabdb64e50906246324ede220e870e5d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5445c4c8aabdb64e50906246324ed… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed May 8 11:19:28 2024 +0200 vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS15 in CheckFeatureSupport(). --- include/vkd3d_d3d12.idl | 7 +++++++ libs/vkd3d/device.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index ecda1a40..35994c20 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2454,6 +2454,12 @@ typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS14 BOOL IndependentFrontAndBackStencilRefMaskSupported; } D3D12_FEATURE_DATA_D3D12_OPTIONS14; +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS15 +{ + BOOL TriangleFanSupported; + BOOL DynamicIndexBufferStripCutSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS15; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, @@ -2490,6 +2496,7 @@ typedef enum D3D12_FEATURE D3D12_FEATURE_D3D12_OPTIONS12 = 41, D3D12_FEATURE_D3D12_OPTIONS13 = 42, D3D12_FEATURE_D3D12_OPTIONS14 = 43, + D3D12_FEATURE_D3D12_OPTIONS15 = 44, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 58a58050..ba745e54 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3938,6 +3938,23 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device9 return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS15: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS15 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + } + + data->TriangleFanSupported = FALSE; + data->DynamicIndexBufferStripCutSupported = FALSE; + + TRACE("Triangle fan %#x.\n", data->TriangleFanSupported); + TRACE("Dynamic index buffer strip cut %#x.\n", data->DynamicIndexBufferStripCutSupported); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Giovanni Mascellani : vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS16 in CheckFeatureSupport().
by Alexandre Julliard 13 May '24

13 May '24

Module: vkd3d Branch: master Commit: d528fdbebfd260a75c576208dc03271a6dab55ba URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d528fdbebfd260a75c576208dc032… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed May 8 11:21:28 2024 +0200 vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS16 in CheckFeatureSupport(). --- include/vkd3d_d3d12.idl | 7 +++++++ libs/vkd3d/device.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 35994c20..23f1567e 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2460,6 +2460,12 @@ typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS15 BOOL DynamicIndexBufferStripCutSupported; } D3D12_FEATURE_DATA_D3D12_OPTIONS15; +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS16 +{ + BOOL DynamicDepthBiasSupported; + BOOL GPUUploadHeapSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS16; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, @@ -2497,6 +2503,7 @@ typedef enum D3D12_FEATURE D3D12_FEATURE_D3D12_OPTIONS13 = 42, D3D12_FEATURE_D3D12_OPTIONS14 = 43, D3D12_FEATURE_D3D12_OPTIONS15 = 44, + D3D12_FEATURE_D3D12_OPTIONS16 = 45, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index ba745e54..2a11105d 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3955,6 +3955,23 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device9 return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS16: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS16 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + } + + data->DynamicDepthBiasSupported = FALSE; + data->GPUUploadHeapSupported = FALSE; + + TRACE("Dynamic depth bias %#x.\n", data->DynamicDepthBiasSupported); + TRACE("GPU upload heap %#x.\n", data->GPUUploadHeapSupported); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0