January 2019 - Wine-devel - list.winehq.org

[PATCH vkd3d 5/7] vkd3d: Return hardcoded GPU virtual address support.
by Józef Kucia 25 Jan '19

25 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> The hardcoded value makes a real app happy and it is close to values returned by various Windows drivers (AMD, Intel, Nvidia). In the long term, we might try to derive the values from maxResourceSize and/or sparseAddressSpaceSize. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_d3d12.idl | 6 ++++++ libs/vkd3d/device.c | 16 ++++++++++++++++ tests/d3d12.c | 19 +++++++++++++++---- 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index c025dbe8b2bb..754bba380876 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1535,6 +1535,12 @@ typedef struct D3D12_FEATURE_DATA_ROOT_SIGNATURE D3D_ROOT_SIGNATURE_VERSION HighestVersion; } D3D12_FEATURE_DATA_ROOT_SIGNATURE; +typedef struct D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT +{ + UINT MaxGPUVirtualAddressBitsPerResource; + UINT MaxGPUVirtualAddressBitsPerProcess; +} D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT; + typedef enum D3D_SHADER_MODEL { D3D_SHADER_MODEL_5_1 = 0x51, diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 93af06cb1b5b..709c61fd5ccb 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1840,6 +1840,22 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return S_OK; } + case D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT: + { + D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + FIXME("Returning 40 GPU virtual address bits.\n"); + data->MaxGPUVirtualAddressBitsPerResource = 40; + data->MaxGPUVirtualAddressBitsPerProcess = 40; + return S_OK; + } + case D3D12_FEATURE_SHADER_MODEL: { D3D12_FEATURE_DATA_SHADER_MODEL *data = feature_data; diff --git a/tests/d3d12.c b/tests/d3d12.c index 26a216251646..4af52a5553d5 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -962,6 +962,7 @@ static void test_node_count(void) static void test_check_feature_support(void) { + D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT gpu_virtual_address; D3D12_FEATURE_DATA_FEATURE_LEVELS feature_levels; D3D_FEATURE_LEVEL max_supported_feature_level; D3D12_FEATURE_DATA_ARCHITECTURE architecture; @@ -1038,7 +1039,7 @@ static void test_check_feature_support(void) feature_levels.MaxSupportedFeatureLevel = 0; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FEATURE_LEVELS, &feature_levels, sizeof(feature_levels)); - ok(SUCCEEDED(hr), "Failed to check feature support, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to check feature support, hr %#x.\n", hr); trace("Max supported feature level %#x.\n", feature_levels.MaxSupportedFeatureLevel); max_supported_feature_level = feature_levels.MaxSupportedFeatureLevel; @@ -1047,7 +1048,7 @@ static void test_check_feature_support(void) feature_levels.MaxSupportedFeatureLevel = 0; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FEATURE_LEVELS, &feature_levels, sizeof(feature_levels)); - ok(SUCCEEDED(hr), "Failed to check feature support, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to check feature support, hr %#x.\n", hr); ok(feature_levels.MaxSupportedFeatureLevel == max_supported_feature_level, "Got unexpected feature level %#x, expected %#x.\n", feature_levels.MaxSupportedFeatureLevel, max_supported_feature_level); @@ -1065,7 +1066,7 @@ static void test_check_feature_support(void) feature_levels.MaxSupportedFeatureLevel = 0; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FEATURE_LEVELS, &feature_levels, sizeof(feature_levels)); - ok(SUCCEEDED(hr), "Failed to check feature support, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to check feature support, hr %#x.\n", hr); ok(feature_levels.MaxSupportedFeatureLevel == D3D_FEATURE_LEVEL_9_3, "Got unexpected max feature level %#x.\n", feature_levels.MaxSupportedFeatureLevel); @@ -1074,10 +1075,20 @@ static void test_check_feature_support(void) feature_levels.MaxSupportedFeatureLevel = 0; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FEATURE_LEVELS, &feature_levels, sizeof(feature_levels)); - ok(SUCCEEDED(hr), "Failed to check feature support, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to check feature support, hr %#x.\n", hr); ok(feature_levels.MaxSupportedFeatureLevel == 0x3000, "Got unexpected max feature level %#x.\n", feature_levels.MaxSupportedFeatureLevel); + /* GPU virtual address */ + memset(&gpu_virtual_address, 0, sizeof(gpu_virtual_address)); + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT, + &gpu_virtual_address, sizeof(gpu_virtual_address)); + ok(hr == S_OK, "Failed to check GPU virtual address support, hr %#x.\n", hr); + trace("GPU virtual address bits per resource: %u.\n", + gpu_virtual_address.MaxGPUVirtualAddressBitsPerResource); + trace("GPU virtual address bits per process: %u.\n", + gpu_virtual_address.MaxGPUVirtualAddressBitsPerProcess); + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } -- 2.19.2

2 1

[PATCH vkd3d 6/7] vkd3d: Implement D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS.
by Józef Kucia 25 Jan '19

25 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_d3d12.idl | 14 +++++++ libs/vkd3d/device.c | 75 ++++++++++++++++++++++++++++++++++++++ libs/vkd3d/resource.c | 18 +++++++-- libs/vkd3d/vkd3d_private.h | 1 + 4 files changed, 104 insertions(+), 4 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 754bba380876..8b2e70fdadcb 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -269,6 +269,20 @@ typedef struct D3D12_FEATURE_DATA_FORMAT_SUPPORT D3D12_FORMAT_SUPPORT2 Support2; } D3D12_FEATURE_DATA_FORMAT_SUPPORT; +typedef enum D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS +{ + D3D12_MULTISAMPLE_QUALITY_LEVELS_FLAG_NONE = 0x00000000, + D3D12_MULTISAMPLE_QUALITY_LEVELS_FLAG_TILED_RESOURCE = 0x00000001, +} D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS; + +typedef struct D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELS +{ + DXGI_FORMAT Format; + UINT SampleCount; + D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS Flags; + UINT NumQualityLevels; +} D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELS; + typedef enum D3D12_HEAP_TYPE { D3D12_HEAP_TYPE_DEFAULT = 1, diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 709c61fd5ccb..64c8391badc1 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1687,6 +1687,68 @@ static void vkd3d_restrict_format_support_for_feature_level(D3D12_FEATURE_DATA_F } } +static HRESULT d3d12_device_check_multisample_quality_levels(struct d3d12_device *device, + D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELS *data) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkImageFormatProperties vk_properties; + const struct vkd3d_format *format; + VkSampleCountFlagBits vk_samples; + VkImageUsageFlags vk_usage = 0; + VkResult vr; + + TRACE("Format %#x, sample count %u, flags %#x.\n", data->Format, data->SampleCount, data->Flags); + + data->NumQualityLevels = 0; + + if (!(vk_samples = vk_samples_from_sample_count(data->SampleCount))) + WARN("Invalid sample count %u.\n", data->SampleCount); + if (!data->SampleCount) + return E_FAIL; + + if (data->SampleCount == 1) + { + data->NumQualityLevels = 1; + goto done; + } + + if (data->Format == DXGI_FORMAT_UNKNOWN) + goto done; + + if (!(format = vkd3d_get_format(data->Format, false))) + { + FIXME("Unhandled format %#x.\n", data->Format); + return E_INVALIDARG; + } + if (data->Flags) + FIXME("Ignoring flags %#x.\n", data->Flags); + + if (format->vk_aspect_mask & VK_IMAGE_ASPECT_COLOR_BIT) + vk_usage |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + else + vk_usage |= VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT; + + vr = VK_CALL(vkGetPhysicalDeviceImageFormatProperties(device->vk_physical_device, + format->vk_format, VK_IMAGE_TYPE_2D, VK_IMAGE_TILING_OPTIMAL, vk_usage, 0, &vk_properties)); + if (vr == VK_ERROR_FORMAT_NOT_SUPPORTED) + { + WARN("Format %#x is not supported.\n", format->dxgi_format); + goto done; + } + if (vr < 0) + { + ERR("Failed to get image format properties, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + + if (vk_properties.sampleCounts & vk_samples) + data->NumQualityLevels = 1; + +done: + TRACE("Returning %u quality levels.\n", data->NumQualityLevels); + return S_OK; +} + static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device *iface, D3D12_FEATURE feature, void *feature_data, UINT feature_data_size) { @@ -1840,6 +1902,19 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return S_OK; } + case D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS: + { + D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELS *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + return d3d12_device_check_multisample_quality_levels(device, data); + } + case D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT: { D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT *data = feature_data; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 016d050998b0..75a5201b6d38 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -437,9 +437,9 @@ static VkImageType vk_image_type_from_d3d12_resource_dimension(D3D12_RESOURCE_DI } } -VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *desc) +VkSampleCountFlagBits vk_samples_from_sample_count(unsigned int sample_count) { - switch (desc->Count) + switch (sample_count) { case 1: return VK_SAMPLE_COUNT_1_BIT; @@ -456,11 +456,21 @@ VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *d case 64: return VK_SAMPLE_COUNT_64_BIT; default: - FIXME("Unhandled sample count %u.\n", desc->Count); - return VK_SAMPLE_COUNT_1_BIT; + return 0; } } +VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *desc) +{ + VkSampleCountFlagBits vk_samples; + + if ((vk_samples = vk_samples_from_sample_count(desc->Count))) + return vk_samples; + + FIXME("Unhandled sample count %u.\n", desc->Count); + return VK_SAMPLE_COUNT_1_BIT; +} + HRESULT vkd3d_create_buffer(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, VkBuffer *vk_buffer) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 6b35dc0f65a9..73825bb20748 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -974,6 +974,7 @@ static inline unsigned int d3d12_resource_desc_get_sub_resource_count(const D3D1 VkCompareOp vk_compare_op_from_d3d12(D3D12_COMPARISON_FUNC op) DECLSPEC_HIDDEN; VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *desc) DECLSPEC_HIDDEN; +VkSampleCountFlagBits vk_samples_from_sample_count(unsigned int sample_count) DECLSPEC_HIDDEN; bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN; bool check_feature_level_support(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN; -- 2.19.2

2 1

[PATCH vkd3d 3/7] vkd3d-shader: Add more general support for SPIR-V aggregates.
by Józef Kucia 25 Jan '19

25 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ae0490ee6239..1140f5080c44 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1718,6 +1718,7 @@ struct vkd3d_symbol_register_data enum vkd3d_component_type component_type; unsigned int write_mask; unsigned int structure_stride; + bool is_aggregate; /* An aggregate, i.e. a structure or an array. */ }; struct vkd3d_symbol_resource_data @@ -2414,6 +2415,7 @@ struct vkd3d_shader_register_info unsigned int write_mask; uint32_t member_idx; unsigned int structure_stride; + bool is_aggregate; }; static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compiler *compiler, @@ -2432,6 +2434,8 @@ static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compil register_info->component_type = VKD3D_TYPE_FLOAT; register_info->write_mask = VKD3DSP_WRITEMASK_ALL; register_info->member_idx = 0; + register_info->structure_stride = 0; + register_info->is_aggregate = false; return true; } @@ -2450,6 +2454,7 @@ static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compil register_info->write_mask = symbol->info.reg.write_mask; register_info->structure_stride = symbol->info.reg.structure_stride; register_info->member_idx = symbol->info.reg.member_idx; + register_info->is_aggregate = symbol->info.reg.is_aggregate; return true; } @@ -2476,8 +2481,11 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp { indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[1]); } - else if (reg->type == VKD3DSPR_COVERAGE || reg->type == VKD3DSPR_SAMPLEMASK) + else if (register_info->is_aggregate) { + if (reg->idx[0].rel_addr || reg->idx[1].rel_addr) + FIXME("Relative addressing not implemented.\n"); + indexes[index_count++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, register_info->member_idx); } else @@ -3390,6 +3398,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi reg_symbol.info.reg.component_type = use_private_var ? VKD3D_TYPE_FLOAT : component_type; reg_symbol.info.reg.write_mask = use_private_var ? vkd3d_write_mask_from_component_count(component_count) : signature_element->mask & 0xff; + reg_symbol.info.reg.is_aggregate = false; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -3467,6 +3476,7 @@ static void vkd3d_dxbc_compiler_emit_input_register(struct vkd3d_dxbc_compiler * reg_symbol.info.reg.member_idx = 0; reg_symbol.info.reg.component_type = builtin->component_type; reg_symbol.info.reg.write_mask = vkd3d_write_mask_from_component_count(builtin->component_count); + reg_symbol.info.reg.is_aggregate = builtin->is_spirv_array; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, input_id, reg); } @@ -3616,6 +3626,7 @@ static void vkd3d_dxbc_compiler_emit_output_register(struct vkd3d_dxbc_compiler reg_symbol.info.reg.member_idx = 0; reg_symbol.info.reg.component_type = builtin->component_type; reg_symbol.info.reg.write_mask = vkd3d_write_mask_from_component_count(builtin->component_count); + reg_symbol.info.reg.is_aggregate = builtin->is_spirv_array; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, output_id, reg); } @@ -3722,6 +3733,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler reg_symbol.info.reg.storage_class = storage_class; reg_symbol.info.reg.component_type = use_private_variable ? VKD3D_TYPE_FLOAT : component_type; reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; + reg_symbol.info.reg.is_aggregate = false; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -3848,6 +3860,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_indexable_temp(struct vkd3d_dxbc_compil reg_symbol.info.reg.storage_class = SpvStorageClassFunction; reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; + reg_symbol.info.reg.is_aggregate = false; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } @@ -3916,6 +3929,7 @@ static void vkd3d_dxbc_compiler_emit_push_constant_buffers(struct vkd3d_dxbc_com reg_symbol.info.reg.member_idx = j; reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; + reg_symbol.info.reg.is_aggregate = false; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); ++j; @@ -3978,6 +3992,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_constant_buffer(struct vkd3d_dxbc_compi reg_symbol.info.reg.member_idx = 0; reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; + reg_symbol.info.reg.is_aggregate = false; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } @@ -4013,6 +4028,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_immediate_constant_buffer(struct vkd3d_ reg_symbol.info.reg.storage_class = SpvStorageClassPrivate; reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; + reg_symbol.info.reg.is_aggregate = false; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } @@ -4041,6 +4057,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com vkd3d_symbol_make_register(&reg_symbol, reg); reg_symbol.id = var_id; reg_symbol.info.reg.storage_class = storage_class; + reg_symbol.info.reg.is_aggregate = false; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } @@ -4350,6 +4367,7 @@ static void vkd3d_dxbc_compiler_emit_workgroup_memory(struct vkd3d_dxbc_compiler reg_symbol.info.reg.component_type = VKD3D_TYPE_UINT; reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_0; reg_symbol.info.reg.structure_stride = structure_stride; + reg_symbol.info.reg.is_aggregate = false; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } -- 2.19.2

2 1

[PATCH vkd3d 7/7] tests: Add test for D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS.
by Józef Kucia 25 Jan '19

25 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 4af52a5553d5..21214738c6fa 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1151,6 +1151,126 @@ static void test_format_support(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_multisample_quality_levels(void) +{ + static const unsigned int sample_counts[] = {1, 2, 4, 8, 16, 32}; + D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELS format_support; + ID3D12Device *device; + DXGI_FORMAT format; + unsigned int i, j; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + memset(&format_support, 0, sizeof(format_support)); + format_support.NumQualityLevels = 0xdeadbeef; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, + &format_support, sizeof(format_support)); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!format_support.Flags, "Got unexpected flags %#x.\n", format_support.Flags); + ok(!format_support.NumQualityLevels, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels); + + format_support.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + format_support.NumQualityLevels = 0xdeadbeef; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, + &format_support, sizeof(format_support)); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!format_support.Flags, "Got unexpected flags %#x.\n", format_support.Flags); + ok(!format_support.NumQualityLevels, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels); + + /* 1 sample */ + for (format = DXGI_FORMAT_UNKNOWN; format <= DXGI_FORMAT_B4G4R4A4_UNORM; ++format) + { + if (format == DXGI_FORMAT_R1_UNORM) + continue; + + vkd3d_test_set_context("format %#x", format); + + memset(&format_support, 0, sizeof(format_support)); + format_support.Format = format; + format_support.SampleCount = 1; + format_support.NumQualityLevels = 0xdeadbeef; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, + &format_support, sizeof(format_support)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(format_support.NumQualityLevels == 1, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels); + } + vkd3d_test_set_context(NULL); + + /* DXGI_FORMAT_UNKNOWN */ + for (i = 1; i < ARRAY_SIZE(sample_counts); ++i) + { + vkd3d_test_set_context("samples %#x", sample_counts[i]); + + memset(&format_support, 0, sizeof(format_support)); + format_support.SampleCount = sample_counts[i]; + format_support.NumQualityLevels = 0xdeadbeef; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, + &format_support, sizeof(format_support)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!format_support.Flags, "Got unexpected flags %#x.\n", format_support.Flags); + ok(!format_support.NumQualityLevels, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels); + + format_support.Flags = D3D12_MULTISAMPLE_QUALITY_LEVELS_FLAG_TILED_RESOURCE; + format_support.NumQualityLevels = 0xdeadbeef; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, + &format_support, sizeof(format_support)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(format_support.Flags == D3D12_MULTISAMPLE_QUALITY_LEVELS_FLAG_TILED_RESOURCE, + "Got unexpected flags %#x.\n", format_support.Flags); + ok(!format_support.NumQualityLevels, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels); + } + vkd3d_test_set_context(NULL); + + /* invalid sample counts */ + for (i = 1; i <= 32; ++i) + { + BOOL valid_sample_count = FALSE; + for (j = 0; j < ARRAY_SIZE(sample_counts); ++j) + { + if (sample_counts[j] == i) + { + valid_sample_count = TRUE; + break; + } + } + if (valid_sample_count) + continue; + + vkd3d_test_set_context("samples %#x", i); + + memset(&format_support, 0, sizeof(format_support)); + format_support.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + format_support.SampleCount = i; + format_support.NumQualityLevels = 0xdeadbeef; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, + &format_support, sizeof(format_support)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!format_support.Flags, "Got unexpected flags %#x.\n", format_support.Flags); + ok(!format_support.NumQualityLevels, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels); + } + vkd3d_test_set_context(NULL); + + /* DXGI_FORMAT_R8G8B8A8_UNORM */ + memset(&format_support, 0, sizeof(format_support)); + format_support.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + format_support.SampleCount = 4; + format_support.NumQualityLevels = 0xdeadbeef; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS, + &format_support, sizeof(format_support)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!format_support.Flags, "Got unexpected flags %#x.\n", format_support.Flags); + ok(format_support.NumQualityLevels >= 1, "Got unexpected quality levels %u.\n", format_support.NumQualityLevels); + + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_create_command_allocator(void) { ID3D12CommandAllocator *command_allocator; @@ -23902,6 +24022,7 @@ START_TEST(d3d12) run_test(test_node_count); run_test(test_check_feature_support); run_test(test_format_support); + run_test(test_multisample_quality_levels); run_test(test_create_command_allocator); run_test(test_create_command_list); run_test(test_create_command_queue); -- 2.19.2

2 1

[PATCH vkd3d 4/7] vkd3d-shader: Use proper vkd3d_spirv_builtin for PS fragment coordinates.
by Józef Kucia 25 Jan '19

25 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1140f5080c44..d0cbf56769b3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2977,10 +2977,6 @@ static void vkd3d_dxbc_compiler_decorate_builtin(struct vkd3d_dxbc_compiler *com switch (builtin) { - case SpvBuiltInPosition: - if (compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL) - builtin = SpvBuiltInFragCoord; - break; case SpvBuiltInFragDepth: vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeDepthReplacing, NULL, 0); break; @@ -3110,6 +3106,10 @@ vkd3d_system_value_builtins[] = {VKD3D_SIV_CLIP_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInClipDistance, NULL, true}}, {VKD3D_SIV_CULL_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInCullDistance, NULL, true}}, }; +static const struct vkd3d_spirv_builtin vkd3d_pixel_shader_position_builtin = +{ + VKD3D_TYPE_FLOAT, 4, SpvBuiltInFragCoord, +}; static const struct { enum vkd3d_shader_register_type reg_type; @@ -3160,6 +3160,10 @@ static const struct vkd3d_spirv_builtin *get_spirv_builtin_for_sysval( if (!sysval) return NULL; + /* In pixel shaders, SV_Position is mapped to SpvBuiltInFragCoord. */ + if (sysval == VKD3D_SIV_POSITION && compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL) + return &vkd3d_pixel_shader_position_builtin; + target = vkd3d_dxbc_compiler_get_target(compiler); for (i = 0; i < ARRAY_SIZE(vkd3d_system_value_builtins); ++i) { -- 2.19.2

2 1

[PATCH vkd3d 2/7] vkd3d-shader: Translate dcl_tessellator_output_primitive instructions.
by Józef Kucia 25 Jan '19

25 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ddcaead2a185..ae0490ee6239 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4558,6 +4558,33 @@ static void vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(struct vkd3d_dxbc_co vkd3d_dxbc_compiler_emit_execution_mode(compiler, mode, NULL, 0); } +static void vkd3d_dxbc_compiler_emit_dcl_tessellator_output_primitive(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + enum vkd3d_tessellator_output_primitive primitive = instruction->declaration.tessellator_output_primitive; + SpvExecutionMode mode; + + switch (primitive) + { + case VKD3D_TESSELLATOR_OUTPUT_POINT: + mode = SpvExecutionModePointMode; + break; + case VKD3D_TESSELLATOR_OUTPUT_LINE: + return; + case VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CW: + mode = SpvExecutionModeVertexOrderCw; + break; + case VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW: + mode = SpvExecutionModeVertexOrderCcw; + break; + default: + FIXME("Invalid tessellator output primitive %#x.\n", primitive); + return; + } + + vkd3d_dxbc_compiler_emit_execution_mode(compiler, mode, NULL, 0); +} + static void vkd3d_dxbc_compiler_emit_dcl_tessellator_partitioning(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -6870,6 +6897,9 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_DCL_TESSELLATOR_DOMAIN: vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(compiler, instruction); break; + case VKD3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE: + vkd3d_dxbc_compiler_emit_dcl_tessellator_output_primitive(compiler, instruction); + break; case VKD3DSIH_DCL_TESSELLATOR_PARTITIONING: vkd3d_dxbc_compiler_emit_dcl_tessellator_partitioning(compiler, instruction); break; -- 2.19.2

2 1

[PATCH vkd3d 1/7] vkd3d: Fix assert() condition for sample mask array size.
by Józef Kucia 25 Jan '19

25 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 6daeab769344..08f2f3cc2a36 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2438,7 +2438,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->ms_desc.pSampleMask = NULL; if (desc->SampleMask != ~0u) { - assert(DIV_ROUND_UP(sample_count, 32) < ARRAY_SIZE(graphics->sample_mask)); + assert(DIV_ROUND_UP(sample_count, 32) <= ARRAY_SIZE(graphics->sample_mask)); graphics->sample_mask[0] = desc->SampleMask; graphics->sample_mask[1] = 0xffffffffu; graphics->ms_desc.pSampleMask = graphics->sample_mask; -- 2.19.2

2 1

[PATCH v2 1/2] msvcp: Set correct error code on non-existing path in _Open_dir.
by Gijs Vermeulen 25 Jan '19

25 Jan '19

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/msvcp120/tests/msvcp120.c | 2 +- dlls/msvcp140/tests/msvcp140.c | 2 +- dlls/msvcp90/ios.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index ac38aa61a0..6d72f9fd68 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1837,7 +1837,7 @@ static void test_tr2_sys__dir_operation(void) result_handle = file; result_handle = p_tr2_sys__Open_dir(first_file_name, "not_exist", &err, &type); ok(result_handle == NULL, "tr2_sys__Open_dir(): expect: NULL, got %p\n", result_handle); - todo_wine ok(err == ERROR_BAD_PATHNAME, "tr2_sys__Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); + ok(err == ERROR_BAD_PATHNAME, "tr2_sys__Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); ok((int)type == 0xdeadbeef, "tr2_sys__Open_dir(): expect: 0xdeadbeef, got %d\n", type); ok(!*first_file_name, "tr2_sys__Open_dir(): expect: 0, got %s\n", first_file_name); diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 229741a52d..1bae2b914d 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -983,7 +983,7 @@ static void test_dir_operation(void) result_handle = file; result_handle = p_Open_dir(first_file_name, not_existW, &err, &type); ok(result_handle == NULL, "_Open_dir(): expect: NULL, got %p\n", result_handle); - todo_wine ok(err == ERROR_BAD_PATHNAME, "_Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); + ok(err == ERROR_BAD_PATHNAME, "_Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); ok((int)type == 0xdeadbeef, "_Open_dir(): expect: 0xdeadbeef, got %d\n", type); ok(!*first_file_name, "_Open_dir(): expect: 0, got %s\n", wine_dbgstr_w(first_file_name)); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index bf7eea2e6f..32bd2e7ccd 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14983,7 +14983,7 @@ void* __cdecl tr2_sys__Open_dir_wchar(wchar_t* target, wchar_t const* dest, int* handle = FindFirstFileW(temppath, &data); if(handle == INVALID_HANDLE_VALUE) { - *err_code = GetLastError(); + *err_code = ERROR_BAD_PATHNAME; return NULL; } while(!wcscmp(data.cFileName, dot) || !wcscmp(data.cFileName, dotdot)) { -- 2.20.1

2 3

[PATCH v2 3/3] d3d9: Use wined3d_bit_scan() instead of open-coding it.
by Józef Kucia 25 Jan '19

25 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/device.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 067ea2bdc2d2..ed1fedf91db3 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2732,8 +2732,7 @@ static void d3d9_device_upload_sysmem_vertex_buffers(struct d3d9_device *device, map = device->sysmem_vb; while (map) { - i = ffs(map) - 1; - map ^= 1u << i; + i = wined3d_bit_scan(&map); if (FAILED(hr = wined3d_device_get_stream_source(device->wined3d_device, i, &dst_buffer, &offset, &stride))) ERR("Failed to get stream source.\n"); @@ -3111,8 +3110,7 @@ static HRESULT WINAPI d3d9_device_ProcessVertices(IDirect3DDevice9Ex *iface, map = device->sysmem_vb; while (map) { - i = ffs(map) - 1; - map ^= 1u << i; + i = wined3d_bit_scan(&map); if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, i, &wined3d_buffer, &offset, &stride))) @@ -3130,8 +3128,7 @@ static HRESULT WINAPI d3d9_device_ProcessVertices(IDirect3DDevice9Ex *iface, map = device->sysmem_vb; while (map) { - i = ffs(map) - 1; - map ^= 1u << i; + i = wined3d_bit_scan(&map); if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, i, &wined3d_buffer, &offset, &stride))) -- 2.19.2

3 2

[PATCH v2 1/3] wined3d: Move wined3d_bit_scan() to public header.
by Józef Kucia 25 Jan '19

25 Jan '19

wine/port.h is required for ffs(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d8/buffer.c | 1 + dlls/d3d8/d3d8_main.c | 1 + dlls/d3d8/directx.c | 1 + dlls/d3d8/shader.c | 1 + dlls/d3d8/surface.c | 1 + dlls/d3d8/swapchain.c | 1 + dlls/d3d8/texture.c | 1 + dlls/d3d8/vertexdeclaration.c | 6 +----- dlls/d3d8/volume.c | 1 + dlls/d3d9/buffer.c | 1 + dlls/d3d9/d3d9_main.c | 1 + dlls/d3d9/directx.c | 1 + dlls/d3d9/query.c | 1 + dlls/d3d9/shader.c | 1 + dlls/d3d9/stateblock.c | 1 + dlls/d3d9/surface.c | 1 + dlls/d3d9/swapchain.c | 1 + dlls/d3d9/texture.c | 1 + dlls/d3d9/vertexdeclaration.c | 1 + dlls/d3d9/volume.c | 1 + dlls/wined3d/wined3d_private.h | 7 ------- include/wine/wined3d.h | 7 +++++++ 22 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 3b980003b310..0a6767be70ed 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -17,6 +17,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 92c5032acbeb..a6c67008ed5a 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include "wine/port.h" #include "initguid.h" #include "d3d8_private.h" #include "wine/debug.h" diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index d97882705b58..09188cc2aef7 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "wine/port.h" #include <stdarg.h> diff --git a/dlls/d3d8/shader.c b/dlls/d3d8/shader.c index 2a4fbde88c09..6c166330bfe9 100644 --- a/dlls/d3d8/shader.c +++ b/dlls/d3d8/shader.c @@ -18,6 +18,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 7f90389905af..0d8793788d75 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index c9abfffffda3..186e3cd8439c 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index ccbf60e05af1..6f17e9da5fd4 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -17,6 +17,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index 0cae3cd8c6c0..709e04bace40 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -1,6 +1,4 @@ /* - * IDirect3DVertexDeclaration8 implementation - * * Copyright 2007 Henri Verbeet * * This library is free software; you can redistribute it and/or @@ -18,10 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* IDirect3DVertexDeclaration8 is internal to our implementation. - * It's not visible in the API. */ - #include "config.h" +#include "wine/port.h" #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 29eab6a69001..00dd78a533e2 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 840d7e95ea4f..b6cd646dee2f 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index c23fa54d99b5..bd0524b9da2a 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -22,6 +22,7 @@ */ #include "config.h" +#include "wine/port.h" #include "initguid.h" #include "d3d9_private.h" diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 3f9c188f3e7f..eab114d19c62 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 12ff95b5a060..49a8a12d415e 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/shader.c b/dlls/d3d9/shader.c index bc347386b85d..549350852a15 100644 --- a/dlls/d3d9/shader.c +++ b/dlls/d3d9/shader.c @@ -18,6 +18,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 6f39488fc115..8431ef770029 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 7d4d93b5e8fe..ded7dc4f4906 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 00ead0fc3e3e..46da32e92f50 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index c73cbc0d5231..8dc1ceea6982 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 5075309638f3..b64452552384 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index cb0485cd7f49..7bf12570a891 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0df3f2ab2a5e..7b265f366285 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4582,13 +4582,6 @@ static inline BOOL is_rasterization_disabled(const struct wined3d_shader *geomet && geometry_shader->u.gs.so_desc.rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM; } -static inline int wined3d_bit_scan(unsigned int *x) -{ - int bit_offset = ffs(*x) - 1; - *x ^= 1u << bit_offset; - return bit_offset; -} - static inline DWORD wined3d_extract_bits(const DWORD *bitstream, unsigned int offset, unsigned int count) { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b0b1abc508e6..2a8afe8fca6f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2782,6 +2782,13 @@ static inline unsigned int wined3d_log2i(unsigned int x) #endif } +static inline int wined3d_bit_scan(unsigned int *x) +{ + int bit_offset = ffs(*x) - 1; + *x ^= 1u << bit_offset; + return bit_offset; +} + static inline void wined3d_box_set(struct wined3d_box *box, unsigned int left, unsigned int top, unsigned int right, unsigned int bottom, unsigned int front, unsigned int back) { -- 2.19.2

3 2