September 2018 - Wine-devel

[PATCH] wined3d: Add GL_ARB_shader_viewport_layer_array extension.
by Józef Kucia 25 Sep '18

25 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 4 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 1d360d104bf8..1722438a5a10 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -113,6 +113,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_shader_storage_buffer_object", ARB_SHADER_STORAGE_BUFFER_OBJECT}, {"GL_ARB_shader_texture_image_samples", ARB_SHADER_TEXTURE_IMAGE_SAMPLES}, {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD }, + {"GL_ARB_shader_viewport_layer_array", ARB_SHADER_VIEWPORT_LAYER_ARRAY}, {"GL_ARB_shading_language_100", ARB_SHADING_LANGUAGE_100 }, {"GL_ARB_shading_language_420pack", ARB_SHADING_LANGUAGE_420PACK }, {"GL_ARB_shading_language_packing", ARB_SHADING_LANGUAGE_PACKING }, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 52348084c388..0db7fdc038b0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8140,6 +8140,8 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context shader_addline(buffer, "#extension GL_ARB_draw_instanced : enable\n"); if (shader_glsl_use_explicit_attrib_location(gl_info)) shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n"); + if (gl_info->supported[ARB_SHADER_VIEWPORT_LAYER_ARRAY]) + shader_addline(buffer, "#extension GL_ARB_shader_viewport_layer_array : enable\n"); /* Base Declarations */ shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 525c29803a50..06aa21c33fa6 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -93,6 +93,7 @@ enum wined3d_gl_extension ARB_SAMPLER_OBJECTS, ARB_SEAMLESS_CUBE_MAP, ARB_SHADER_ATOMIC_COUNTERS, + ARB_SHADER_VIEWPORT_LAYER_ARRAY, ARB_SHADER_BIT_ENCODING, ARB_SHADER_IMAGE_LOAD_STORE, ARB_SHADER_IMAGE_SIZE, -- 2.16.4

2 1

[PATCH 5/5] wined3d: Derive allowed shader versions from the current feature level.
by Józef Kucia 25 Sep '18

25 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/shader.c | 27 --------------------------- dlls/d3d8/shader.c | 2 -- dlls/d3d9/shader.c | 2 -- dlls/wined3d/shader.c | 37 ++++++++++++++++++++++++++++++------- include/wine/wined3d.h | 1 - 5 files changed, 30 insertions(+), 39 deletions(-) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 759c5702746d..a1da9effc2b8 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -517,27 +517,6 @@ static const struct wined3d_parent_ops d3d_vertex_shader_wined3d_parent_ops = d3d_vertex_shader_wined3d_object_destroyed, }; -static unsigned int d3d_sm_from_feature_level(D3D_FEATURE_LEVEL feature_level) -{ - switch (feature_level) - { - case D3D_FEATURE_LEVEL_11_1: - case D3D_FEATURE_LEVEL_11_0: - return 5; - case D3D_FEATURE_LEVEL_10_1: - case D3D_FEATURE_LEVEL_10_0: - return 4; - case D3D_FEATURE_LEVEL_9_3: - return 3; - case D3D_FEATURE_LEVEL_9_2: - case D3D_FEATURE_LEVEL_9_1: - return 2; - default: - ERR("Unexpected feature_level %#x.\n", feature_level); - } - return 0; -} - static HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length) { @@ -557,7 +536,6 @@ static HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d wined3d_mutex_unlock(); return hr; } - desc.max_version = d3d_sm_from_feature_level(device->feature_level); hr = wined3d_shader_create_vs(device->wined3d_device, &desc, shader, &d3d_vertex_shader_wined3d_parent_ops, &shader->wined3d_shader); @@ -769,7 +747,6 @@ static HRESULT d3d11_hull_shader_init(struct d3d11_hull_shader *shader, struct d wined3d_mutex_unlock(); return hr; } - desc.max_version = d3d_sm_from_feature_level(device->feature_level); hr = wined3d_shader_create_hs(device->wined3d_device, &desc, shader, &d3d11_hull_shader_wined3d_parent_ops, &shader->wined3d_shader); @@ -971,7 +948,6 @@ static HRESULT d3d11_domain_shader_init(struct d3d11_domain_shader *shader, stru wined3d_mutex_unlock(); return hr; } - desc.max_version = d3d_sm_from_feature_level(device->feature_level); hr = wined3d_shader_create_ds(device->wined3d_device, &desc, shader, &d3d11_domain_shader_wined3d_parent_ops, &shader->wined3d_shader); @@ -1477,7 +1453,6 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, WARN("Failed to extract shader, hr %#x.\n", hr); return hr; } - desc.max_version = d3d_sm_from_feature_level(device->feature_level); memset(&so_desc, 0, sizeof(so_desc)); if (so_entries) @@ -1827,7 +1802,6 @@ static HRESULT d3d_pixel_shader_init(struct d3d_pixel_shader *shader, struct d3d wined3d_mutex_unlock(); return hr; } - desc.max_version = d3d_sm_from_feature_level(device->feature_level); hr = wined3d_shader_create_ps(device->wined3d_device, &desc, shader, &d3d_pixel_shader_wined3d_parent_ops, &shader->wined3d_shader); @@ -2037,7 +2011,6 @@ static HRESULT d3d11_compute_shader_init(struct d3d11_compute_shader *shader, st wined3d_mutex_unlock(); return hr; } - desc.max_version = d3d_sm_from_feature_level(device->feature_level); hr = wined3d_shader_create_cs(device->wined3d_device, &desc, shader, &d3d11_compute_shader_wined3d_parent_ops, &shader->wined3d_shader); diff --git a/dlls/d3d8/shader.c b/dlls/d3d8/shader.c index 8192b238ebd7..8a6881200e8b 100644 --- a/dlls/d3d8/shader.c +++ b/dlls/d3d8/shader.c @@ -121,7 +121,6 @@ HRESULT d3d8_vertex_shader_init(struct d3d8_vertex_shader *shader, struct d3d8_d desc.input_signature.element_count = 0; desc.output_signature.element_count = 0; desc.patch_constant_signature.element_count = 0; - desc.max_version = 1; wined3d_mutex_lock(); hr = wined3d_shader_create_vs(device->wined3d_device, &desc, shader, @@ -173,7 +172,6 @@ HRESULT d3d8_pixel_shader_init(struct d3d8_pixel_shader *shader, struct d3d8_dev desc.input_signature.element_count = 0; desc.output_signature.element_count = 0; desc.patch_constant_signature.element_count = 0; - desc.max_version = 1; wined3d_mutex_lock(); hr = wined3d_shader_create_ps(device->wined3d_device, &desc, shader, diff --git a/dlls/d3d9/shader.c b/dlls/d3d9/shader.c index 9cb398388b91..5fc356c8e8af 100644 --- a/dlls/d3d9/shader.c +++ b/dlls/d3d9/shader.c @@ -148,7 +148,6 @@ HRESULT vertexshader_init(struct d3d9_vertexshader *shader, struct d3d9_device * desc.input_signature.element_count = 0; desc.output_signature.element_count = 0; desc.patch_constant_signature.element_count = 0; - desc.max_version = 3; wined3d_mutex_lock(); hr = wined3d_shader_create_vs(device->wined3d_device, &desc, shader, @@ -302,7 +301,6 @@ HRESULT pixelshader_init(struct d3d9_pixelshader *shader, struct d3d9_device *de desc.input_signature.element_count = 0; desc.output_signature.element_count = 0; desc.patch_constant_signature.element_count = 0; - desc.max_version = 3; wined3d_mutex_lock(); hr = wined3d_shader_create_ps(device->wined3d_device, &desc, shader, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 20d4f0773dd7..62ec97154141 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3321,8 +3321,8 @@ const struct wined3d_shader_backend_ops none_shader_backend = shader_none_has_ffp_proj_control, }; -static HRESULT shader_set_function(struct wined3d_shader *shader, DWORD float_const_count, - enum wined3d_shader_type type, unsigned int max_version) +static HRESULT shader_set_function(struct wined3d_shader *shader, + unsigned int float_const_count, enum wined3d_shader_type type, unsigned int max_version) { const struct wined3d_d3d_info *d3d_info = &shader->device->adapter->d3d_info; struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; @@ -3351,12 +3351,12 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, DWORD float_co if (reg_maps->shader_version.type != type) { - WARN("Wrong shader type %d.\n", reg_maps->shader_version.type); + WARN("Wrong shader type %#x.\n", reg_maps->shader_version.type); return WINED3DERR_INVALIDCALL; } if (reg_maps->shader_version.major > max_version) { - WARN("Shader version %d not supported by this D3D API version.\n", reg_maps->shader_version.major); + WARN("Shader version %u not supported by this device.\n", reg_maps->shader_version.major); return WINED3DERR_INVALIDCALL; } switch (type) @@ -3636,17 +3636,40 @@ static HRESULT shader_signature_copy(struct wined3d_shader_signature *dst, return WINED3D_OK; } +static unsigned int shader_max_version_from_feature_level(enum wined3d_feature_level level) +{ + switch (level) + { + case WINED3D_FEATURE_LEVEL_11_1: + case WINED3D_FEATURE_LEVEL_11: + return 5; + case WINED3D_FEATURE_LEVEL_10_1: + case WINED3D_FEATURE_LEVEL_10: + return 4; + case WINED3D_FEATURE_LEVEL_9_SM3: + return 3; + case WINED3D_FEATURE_LEVEL_9_SM2: + case WINED3D_FEATURE_LEVEL_9_1: + return 2; + default: + return 1; + } +} + static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device *device, const struct wined3d_shader_desc *desc, DWORD float_const_count, enum wined3d_shader_type type, void *parent, const struct wined3d_parent_ops *parent_ops) { + unsigned int max_version; size_t byte_code_size; SIZE_T total; HRESULT hr; char *ptr; - TRACE("byte_code %p, byte_code_size %#lx, format %#x, max_version %#x.\n", - desc->byte_code, (long)desc->byte_code_size, desc->format, desc->max_version); + TRACE("byte_code %p, byte_code_size %#lx, format %#x.\n", + desc->byte_code, (long)desc->byte_code_size, desc->format); + + max_version = shader_max_version_from_feature_level(device->feature_level); if (!(shader->frontend = shader_select_frontend(desc->format))) { @@ -3732,7 +3755,7 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device memcpy(shader->function, desc->byte_code, byte_code_size); shader->functionLength = byte_code_size; - if (FAILED(hr = shader_set_function(shader, float_const_count, type, desc->max_version))) + if (FAILED(hr = shader_set_function(shader, float_const_count, type, max_version))) { WARN("Failed to set function, hr %#x.\n", hr); shader_cleanup(shader); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ef89caf0633f..dc613fff2b2b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2063,7 +2063,6 @@ struct wined3d_shader_desc struct wined3d_shader_signature input_signature; struct wined3d_shader_signature output_signature; struct wined3d_shader_signature patch_constant_signature; - unsigned int max_version; }; struct wined3d_stream_output_element -- 2.16.4

2 1

[PATCH 4/5] d3d11: Trace skipped DXBC chunks.
by Józef Kucia 25 Sep '18

25 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 2 -- dlls/d3d11/shader.c | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 3049193ce284..e26554afabfc 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -47,10 +47,8 @@ #define TAG_OSG5 MAKE_TAG('O', 'S', 'G', '5') #define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') #define TAG_PCSG MAKE_TAG('P', 'C', 'S', 'G') -#define TAG_RDEF MAKE_TAG('R', 'D', 'E', 'F') #define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R') #define TAG_SHEX MAKE_TAG('S', 'H', 'E', 'X') -#define TAG_STAT MAKE_TAG('S', 'T', 'A', 'T') struct d3d_device; diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index c8d512f4d18f..759c5702746d 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -136,12 +136,8 @@ static HRESULT shdr_handler(const char *data, DWORD data_size, DWORD tag, void * } break; - case TAG_RDEF: - case TAG_STAT: - break; - default: - FIXME("Unhandled chunk %s.\n", debugstr_an((const char *)&tag, 4)); + TRACE("Skipping chunk %s.\n", debugstr_an((const char *)&tag, 4)); break; } -- 2.16.4

2 1

[PATCH 3/5] wined3d: Cleanup fallback cards list.
by Józef Kucia 25 Sep '18

25 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/directx.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 925a5bc9eb8f..852b40584b7f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -637,7 +637,6 @@ enum wined3d_pci_device wined3d_gpu_from_feature_level(enum wined3d_pci_vendor * card_fallback_amd[] = { {WINED3D_FEATURE_LEVEL_5, CARD_AMD_RAGE_128PRO}, - {WINED3D_FEATURE_LEVEL_6, CARD_AMD_RAGE_128PRO}, {WINED3D_FEATURE_LEVEL_7, CARD_AMD_RADEON_7200}, {WINED3D_FEATURE_LEVEL_8, CARD_AMD_RADEON_8500}, {WINED3D_FEATURE_LEVEL_9_SM2, CARD_AMD_RADEON_9500}, @@ -649,10 +648,7 @@ enum wined3d_pci_device wined3d_gpu_from_feature_level(enum wined3d_pci_vendor * card_fallback_intel[] = { {WINED3D_FEATURE_LEVEL_5, CARD_INTEL_845G}, - {WINED3D_FEATURE_LEVEL_6, CARD_INTEL_845G}, - {WINED3D_FEATURE_LEVEL_7, CARD_INTEL_845G}, {WINED3D_FEATURE_LEVEL_8, CARD_INTEL_915G}, - {WINED3D_FEATURE_LEVEL_9_SM2, CARD_INTEL_915G}, {WINED3D_FEATURE_LEVEL_9_SM3, CARD_INTEL_945G}, {WINED3D_FEATURE_LEVEL_10, CARD_INTEL_G45}, {WINED3D_FEATURE_LEVEL_11, CARD_INTEL_IVBD}, -- 2.16.4

2 1

[PATCH 2/5] dxgi: Merge dxgi_check_feature_level_support() into dxgi_adapter_CheckInterfaceSupport().
by Józef Kucia 25 Sep '18

25 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/adapter.c | 30 ++++++++++++++------------ dlls/dxgi/dxgi_private.h | 3 --- dlls/dxgi/utils.c | 56 ------------------------------------------------ 3 files changed, 16 insertions(+), 73 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 1f81d7717e1b..4bc57a244d1f 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -209,9 +209,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, D static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IWineDXGIAdapter *iface, REFGUID guid, LARGE_INTEGER *umd_version) { - static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_10_0; struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); struct wined3d_adapter_identifier adapter_id; + struct wined3d_caps caps; + struct wined3d *wined3d; HRESULT hr; TRACE("iface %p, guid %s, umd_version %p.\n", iface, debugstr_guid(guid), umd_version); @@ -224,23 +225,24 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IWineDXGIAda return DXGI_ERROR_UNSUPPORTED; } - if (!dxgi_check_feature_level_support(adapter->factory, adapter, &feature_level, 1)) - return DXGI_ERROR_UNSUPPORTED; + adapter_id.driver_size = 0; + adapter_id.description_size = 0; + adapter_id.device_name_size = 0; - if (umd_version) - { - adapter_id.driver_size = 0; - adapter_id.description_size = 0; - adapter_id.device_name_size = 0; + wined3d_mutex_lock(); + wined3d = adapter->factory->wined3d; + hr = wined3d_get_device_caps(wined3d, adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, &caps); + if (SUCCEEDED(hr)) + hr = wined3d_get_adapter_identifier(wined3d, adapter->ordinal, 0, &adapter_id); + wined3d_mutex_unlock(); - wined3d_mutex_lock(); - hr = wined3d_get_adapter_identifier(adapter->factory->wined3d, adapter->ordinal, 0, &adapter_id); - wined3d_mutex_unlock(); - if (FAILED(hr)) - return hr; + if (FAILED(hr)) + return hr; + if (caps.max_feature_level < WINED3D_FEATURE_LEVEL_10) + return DXGI_ERROR_UNSUPPORTED; + if (umd_version) *umd_version = adapter_id.driver_version; - } return S_OK; } diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 8c3e41a390bb..78f188634fcb 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -199,7 +199,4 @@ struct dxgi_surface HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, IUnknown *outer, struct wined3d_texture *wined3d_texture) DECLSPEC_HIDDEN; -D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory, struct dxgi_adapter *adapter, - const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) DECLSPEC_HIDDEN; - #endif /* __WINE_DXGI_PRIVATE_H */ diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index ad8e2a23f2ae..73b37fda8b57 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -619,59 +619,3 @@ HRESULT dxgi_set_private_data_interface(struct wined3d_private_store *store, return hr; } - -static enum wined3d_feature_level wined3d_feature_level_from_d3d(D3D_FEATURE_LEVEL feature_level) -{ - switch (feature_level) - { - case D3D_FEATURE_LEVEL_11_1: - return WINED3D_FEATURE_LEVEL_11_1; - case D3D_FEATURE_LEVEL_11_0: - return WINED3D_FEATURE_LEVEL_11; - case D3D_FEATURE_LEVEL_10_1: - return WINED3D_FEATURE_LEVEL_10_1; - case D3D_FEATURE_LEVEL_10_0: - return WINED3D_FEATURE_LEVEL_10; - case D3D_FEATURE_LEVEL_9_3: - return WINED3D_FEATURE_LEVEL_9_SM3; - case D3D_FEATURE_LEVEL_9_2: - return WINED3D_FEATURE_LEVEL_9_SM2; - case D3D_FEATURE_LEVEL_9_1: - return WINED3D_FEATURE_LEVEL_9_1; - default: - FIXME("Unhandled feature level %#x.\n", feature_level); - return 0; - } -} - -D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory, struct dxgi_adapter *adapter, - const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) -{ - enum wined3d_feature_level wined3d_feature_level; - struct wined3d_caps caps; - unsigned int i; - HRESULT hr; - - wined3d_mutex_lock(); - hr = wined3d_get_device_caps(factory->wined3d, adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, &caps); - wined3d_mutex_unlock(); - - if (FAILED(hr)) - level_count = 0; - - for (i = 0; i < level_count; ++i) - { - wined3d_feature_level = wined3d_feature_level_from_d3d(feature_levels[i]); - if (wined3d_feature_level && caps.max_feature_level >= wined3d_feature_level) - { - TRACE("Choosing supported feature level %s.\n", - debug_feature_level(feature_levels[i])); - return feature_levels[i]; - } - - TRACE("Feature level %s not supported, trying next fallback if available.\n", - debug_feature_level(feature_levels[i])); - } - - return 0; -} -- 2.16.4

2 1

[PATCH 1/5] dxgi: Simplify dxgi_adapter_GetDesc().
by Józef Kucia 25 Sep '18

25 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/adapter.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index b7d7a0a65aae..1f81d7717e1b 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -200,9 +200,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, D if (!desc) return E_INVALIDARG; - if (FAILED(hr = dxgi_adapter_GetDesc1(iface, &desc1))) - return hr; - memcpy(desc, &desc1, sizeof(*desc)); + if (SUCCEEDED(hr = dxgi_adapter_GetDesc1(iface, &desc1))) + memcpy(desc, &desc1, sizeof(*desc)); return hr; } -- 2.16.4

2 1

[PATCH vkd3d 7/9] vkd3d: Add WARN() for "out of device memory" errors.
by Józef Kucia 25 Sep '18

25 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 682822e8b89a..05d15b2ccd62 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -387,8 +387,9 @@ HRESULT hresult_from_vk_result(VkResult vr) { case VK_SUCCESS: return S_OK; - case VK_ERROR_OUT_OF_HOST_MEMORY: case VK_ERROR_OUT_OF_DEVICE_MEMORY: + WARN("Out of device memory.\n"); + case VK_ERROR_OUT_OF_HOST_MEMORY: return E_OUTOFMEMORY; default: FIXME("Unhandled VkResult %d.\n", vr); -- 2.16.4

2 1

[PATCH vkd3d 9/9] tests: Add test for GetResourceAllocationInfo().
by Józef Kucia 25 Sep '18

25 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 61030104038d..69b9fe7f0284 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -19558,6 +19558,79 @@ static void test_combined_clip_and_cull_distances(void) destroy_test_context(&context); } +static void test_resource_allocation_info(void) +{ + D3D12_RESOURCE_ALLOCATION_INFO info; + D3D12_RESOURCE_DESC desc; + ID3D12Device *device; + unsigned int i, j; + ULONG refcount; + + static const unsigned int alignments[] = + { + 0, + D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT, + D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, + D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT, + }; + static const unsigned int buffer_sizes[] = + { + 1, + 16, + 256, + 1024, + D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT, + D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT + 1, + D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, + D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT + 1, + D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT, + D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT + 1, + }; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; + desc.Alignment = 0; + desc.Width = 32; + desc.Height = 1; + desc.DepthOrArraySize = 1; + desc.MipLevels = 1; + desc.Format = DXGI_FORMAT_UNKNOWN; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + desc.Flags = 0; + + for (i = 0; i < ARRAY_SIZE(alignments); ++i) + { + for (j = 0; j < ARRAY_SIZE(buffer_sizes); ++j) + { + desc.Alignment = alignments[i]; + desc.Width = buffer_sizes[j]; + info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &desc); + if (!desc.Alignment || desc.Alignment == D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) + { + check_alignment(info.SizeInBytes, info.Alignment); + } + else + { + ok(info.SizeInBytes == ~(UINT64)0, + "Got unexpected size %"PRIu64".\n", info.SizeInBytes); + ok(info.Alignment == D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, + "Got unexpected alignment %"PRIu64".\n", info.Alignment); + } + } + } + + + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_suballocate_small_textures(void) { D3D12_GPU_VIRTUAL_ADDRESS gpu_address; @@ -19758,5 +19831,6 @@ START_TEST(d3d12) run_test(test_cpu_descriptors_lifetime); run_test(test_clip_distance); run_test(test_combined_clip_and_cull_distances); + run_test(test_resource_allocation_info); run_test(test_suballocate_small_textures); } -- 2.16.4

2 1

[PATCH vkd3d 8/9] tests: Add test for suballocation of small textures.
by Józef Kucia 25 Sep '18

25 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5f2d2d8e50bf..61030104038d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -193,6 +193,14 @@ static void check_heap_desc_(unsigned int line, const D3D12_HEAP_DESC *desc, "Got flags %#x, expected %#x.\n", desc->Flags, expected.Flags); } +#define check_alignment(a, b) check_alignment_(__LINE__, a, b) +static void check_alignment_(unsigned int line, uint64_t size, uint64_t alignment) +{ + uint64_t aligned_size = align(size, alignment); + ok_(line)(aligned_size == size, "Got unaligned size %"PRIu64", expected %"PRIu64".\n", + size, aligned_size); +} + static void uav_barrier(ID3D12GraphicsCommandList *list, ID3D12Resource *resource) { D3D12_RESOURCE_BARRIER barrier; @@ -19550,6 +19558,89 @@ static void test_combined_clip_and_cull_distances(void) destroy_test_context(&context); } +static void test_suballocate_small_textures(void) +{ + D3D12_GPU_VIRTUAL_ADDRESS gpu_address; + D3D12_RESOURCE_ALLOCATION_INFO info; + D3D12_RESOURCE_DESC resource_desc; + ID3D12Resource *textures[10]; + D3D12_HEAP_DESC heap_desc; + ID3D12Device *device; + ID3D12Heap *heap; + unsigned int i; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Alignment = 0; + resource_desc.Width = 32; + resource_desc.Height = 32; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_desc.Flags = 0; + + resource_desc.Alignment = D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT; + + info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &resource_desc); + trace("Size %"PRIu64", alignment %"PRIu64".\n", info.SizeInBytes, info.Alignment); + check_alignment(info.SizeInBytes, info.Alignment); + if (info.Alignment != D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT) + { + resource_desc.Alignment = 0; + info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &resource_desc); + trace("Size %"PRIu64", alignment %"PRIu64".\n", info.SizeInBytes, info.Alignment); + check_alignment(info.SizeInBytes, info.Alignment); + } + + heap_desc.SizeInBytes = ARRAY_SIZE(textures) * info.SizeInBytes; + memset(&heap_desc.Properties, 0, sizeof(heap_desc.Properties)); + heap_desc.Properties.Type = D3D12_HEAP_TYPE_DEFAULT; + heap_desc.Alignment = 0; + heap_desc.Flags = D3D12_HEAP_FLAG_DENY_BUFFERS | D3D12_HEAP_FLAG_DENY_RT_DS_TEXTURES; + hr = ID3D12Device_CreateHeap(device, &heap_desc, &IID_ID3D12Heap, (void **)&heap); + ok(hr == S_OK, "Failed to create heap, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(textures); ++i) + { + hr = ID3D12Device_CreatePlacedResource(device, heap, i * info.SizeInBytes, + &resource_desc, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE, + NULL, &IID_ID3D12Resource, (void **)&textures[i]); + ok(hr == S_OK, "Failed to create placed resource %u, hr %#x.\n", i, hr); + + check_interface(textures[i], &IID_ID3D12Object, TRUE); + check_interface(textures[i], &IID_ID3D12DeviceChild, TRUE); + check_interface(textures[i], &IID_ID3D12Pageable, TRUE); + check_interface(textures[i], &IID_ID3D12Resource, TRUE); + + gpu_address = ID3D12Resource_GetGPUVirtualAddress(textures[i]); + ok(!gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address); + } + + refcount = get_refcount(heap); + ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount); + + for (i = 0; i < ARRAY_SIZE(textures); ++i) + { + refcount = ID3D12Resource_Release(textures[i]); + ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount); + } + + refcount = ID3D12Heap_Release(heap); + ok(!refcount, "ID3D12Heap has %u references left.\n", (unsigned int)refcount); + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + START_TEST(d3d12) { bool enable_debug_layer = false; @@ -19667,4 +19758,5 @@ START_TEST(d3d12) run_test(test_cpu_descriptors_lifetime); run_test(test_clip_distance); run_test(test_combined_clip_and_cull_distances); + run_test(test_suballocate_small_textures); } -- 2.16.4

2 1

[PATCH vkd3d 5/9] vkd3d: Allocate device memory for heaps.
by Józef Kucia 25 Sep '18

25 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 158 ++++++++++++++++++++++++--------------------- libs/vkd3d/vkd3d_private.h | 2 + 2 files changed, 87 insertions(+), 73 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 82ff701037a3..272fa70585f7 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -18,6 +18,79 @@ #include "vkd3d_private.h" +static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32_t memory_type_mask, + const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags) +{ + VkPhysicalDeviceMemoryProperties *memory_info = &device->memory_properties; + VkMemoryPropertyFlags required_flags; + unsigned int i; + + switch (heap_properties->Type) + { + case D3D12_HEAP_TYPE_DEFAULT: + required_flags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + break; + + case D3D12_HEAP_TYPE_CUSTOM: + FIXME("Custom heaps not supported yet.\n"); + /* fall-through */ + case D3D12_HEAP_TYPE_UPLOAD: + case D3D12_HEAP_TYPE_READBACK: + required_flags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; + break; + + default: + WARN("Invalid heap type %#x.\n", heap_properties->Type); + return ~0u; + } + + for (i = 0; i < memory_info->memoryTypeCount; ++i) + { + if (!(memory_type_mask & (1u << i))) + continue; + if ((memory_info->memoryTypes[i].propertyFlags & required_flags) == required_flags) + return i; + } + + return ~0u; +} + +static HRESULT vkd3d_allocate_device_memory(struct d3d12_device *device, + const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, + const VkMemoryRequirements *memory_requirements, VkDeviceMemory *vk_memory) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkMemoryAllocateInfo allocate_info; + VkResult vr; + + TRACE("Memory requirements: size %#"PRIx64", alignment %#"PRIx64".\n", + memory_requirements->size, memory_requirements->alignment); + + allocate_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; + allocate_info.pNext = NULL; + allocate_info.allocationSize = memory_requirements->size; + allocate_info.memoryTypeIndex = vkd3d_select_memory_type(device, + memory_requirements->memoryTypeBits, heap_properties, heap_flags); + + if (allocate_info.memoryTypeIndex == ~0u) + { + FIXME("Failed to find suitable memory type (allowed types %#x).\n", memory_requirements->memoryTypeBits); + *vk_memory = VK_NULL_HANDLE; + return E_FAIL; + } + + TRACE("Allocating memory type %u.\n", allocate_info.memoryTypeIndex); + + if ((vr = VK_CALL(vkAllocateMemory(device->vk_device, &allocate_info, NULL, vk_memory))) < 0) + { + WARN("Failed to allocate device memory, vr %d.\n", vr); + *vk_memory = VK_NULL_HANDLE; + return hresult_from_vk_result(vr); + } + + return S_OK; +} + /* ID3D12Heap */ static inline struct d3d12_heap *impl_from_ID3D12Heap(ID3D12Heap *iface) { @@ -66,6 +139,9 @@ static ULONG STDMETHODCALLTYPE d3d12_heap_Release(ID3D12Heap *iface) if (!refcount) { struct d3d12_device *device = heap->device; + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + + VK_CALL(vkFreeMemory(device->vk_device, heap->vk_memory, NULL)); vkd3d_free(heap); @@ -181,6 +257,7 @@ static HRESULT validate_heap_desc(const D3D12_HEAP_DESC *desc) static HRESULT d3d12_heap_init(struct d3d12_heap *heap, struct d3d12_device *device, const D3D12_HEAP_DESC *desc) { + VkMemoryRequirements memory_requirements; HRESULT hr; heap->ID3D12Heap_iface.lpVtbl = &d3d12_heap_vtbl; @@ -202,6 +279,14 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, if (FAILED(hr = validate_heap_desc(&heap->desc))) return hr; + memory_requirements.size = heap->desc.SizeInBytes; + memory_requirements.alignment = heap->desc.Alignment; + memory_requirements.memoryTypeBits = ~(uint32_t)0; + + if (FAILED(hr = vkd3d_allocate_device_memory(device, &heap->desc.Properties, + heap->desc.Flags, &memory_requirements, &heap->vk_memory))) + return hr; + heap->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -433,79 +518,6 @@ HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device, return hr; } -static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32_t memory_type_mask, - const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags) -{ - VkPhysicalDeviceMemoryProperties *memory_info = &device->memory_properties; - VkMemoryPropertyFlags required_flags; - unsigned int i; - - switch (heap_properties->Type) - { - case D3D12_HEAP_TYPE_DEFAULT: - required_flags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; - break; - - case D3D12_HEAP_TYPE_CUSTOM: - FIXME("Custom heaps not supported yet.\n"); - /* fall-through */ - case D3D12_HEAP_TYPE_UPLOAD: - case D3D12_HEAP_TYPE_READBACK: - required_flags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; - break; - - default: - WARN("Invalid heap type %#x.\n", heap_properties->Type); - return ~0u; - } - - for (i = 0; i < memory_info->memoryTypeCount; ++i) - { - if (!(memory_type_mask & (1u << i))) - continue; - if ((memory_info->memoryTypes[i].propertyFlags & required_flags) == required_flags) - return i; - } - - return ~0u; -} - -static HRESULT vkd3d_allocate_device_memory(struct d3d12_device *device, - const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, - const VkMemoryRequirements *memory_requirements, VkDeviceMemory *vk_memory) -{ - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - VkMemoryAllocateInfo allocate_info; - VkResult vr; - - TRACE("Memory requirements: size %#"PRIx64", alignment %#"PRIx64".\n", - memory_requirements->size, memory_requirements->alignment); - - allocate_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; - allocate_info.pNext = NULL; - allocate_info.allocationSize = memory_requirements->size; - allocate_info.memoryTypeIndex = vkd3d_select_memory_type(device, - memory_requirements->memoryTypeBits, heap_properties, heap_flags); - - if (allocate_info.memoryTypeIndex == ~0u) - { - FIXME("Failed to find suitable memory type (allowed types %#x).\n", memory_requirements->memoryTypeBits); - *vk_memory = VK_NULL_HANDLE; - return E_FAIL; - } - - TRACE("Allocating memory type %u.\n", allocate_info.memoryTypeIndex); - - if ((vr = VK_CALL(vkAllocateMemory(device->vk_device, &allocate_info, NULL, vk_memory))) < 0) - { - WARN("Failed to allocate device memory, vr %d.\n", vr); - *vk_memory = VK_NULL_HANDLE; - return hresult_from_vk_result(vr); - } - - return S_OK; -} - HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_buffer, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, VkDeviceMemory *vk_memory) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 189ee4324ef5..4865671dd0dc 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -190,6 +190,8 @@ struct d3d12_heap D3D12_HEAP_DESC desc; + VkDeviceMemory vk_memory; + struct d3d12_device *device; }; -- 2.16.4

2 1