wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Józef Kucia : d3d11/tests: Drop redundant feature level check.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: fa690f6be21ac9e25a234e3a9a048542d10c60cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa690f6be21ac9e25a234e3a9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 10 07:41:50 2016 +0100 d3d11/tests: Drop redundant feature level check. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index c42286a..2238380 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3852,13 +3852,6 @@ static void test_multiple_render_targets(void) return; } - if (ID3D11Device_GetFeatureLevel(device) < D3D_FEATURE_LEVEL_9_3) - { - skip("Feature level 9_3 or higher is required.\n"); - ID3D11Device_Release(device); - return; - } - hr = ID3D11Device_CreateInputLayout(device, layout_desc, sizeof(layout_desc) / sizeof(*layout_desc), vs_code, sizeof(vs_code), &input_layout); ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr);

1 0

Józef Kucia : d3d10core/tests: Introduce draw_quad().
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: 69433d23199b7fab6b35c6daef3af8dc7995d8ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=69433d23199b7fab6b35c6dae… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 10 07:41:49 2016 +0100 d3d10core/tests: Introduce draw_quad(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 440 ++++++++++-------------------------------- 1 file changed, 106 insertions(+), 334 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69433d23199b7fab6b35c…

1 0

Józef Kucia : d3d10core/tests: Introduce d3d10core_test_context for visual tests.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: 67ba537f7777c0caf292b9331d9d2cfdffd2afbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=67ba537f7777c0caf292b9331… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 10 07:41:48 2016 +0100 d3d10core/tests: Introduce d3d10core_test_context for visual tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 493 ++++++++++++++---------------------------- 1 file changed, 157 insertions(+), 336 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67ba537f7777c0caf292b…

1 0

Józef Kucia : wined3d: Improve ERR() message in shader_glsl_get_sample_function().
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: 4c355b1eb5fc5a2b849140b06079755702c26231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c355b1eb5fc5a2b849140b06… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 10 07:41:47 2016 +0100 wined3d: Improve ERR() message in shader_glsl_get_sample_function(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2970a95..136bd55 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2743,7 +2743,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context { static const DWORD texel_fetch_flags = WINED3D_GLSL_SAMPLE_LOAD | WINED3D_GLSL_SAMPLE_OFFSET; if (flags & ~texel_fetch_flags) - ERR("Unexpected flags for texelFetch %#x.\n", flags & ~texel_fetch_flags); + ERR("Unexpected flags %#x for texelFetch.\n", flags & ~texel_fetch_flags); base = "texelFetch"; type_part = "";

1 0

Józef Kucia : wined3d: Simplify shader_glsl_append_imm_ivec().
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: e09aa6fc9420ef3f2c311d6fa43fd0e685177856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e09aa6fc9420ef3f2c311d6fa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 10 07:41:46 2016 +0100 wined3d: Simplify shader_glsl_append_imm_ivec(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 85244c8..2970a95 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -323,26 +323,22 @@ static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, co static void shader_glsl_append_imm_ivec(struct wined3d_string_buffer *buffer, const int *values, unsigned int size) { - const char *fmt = "%#x"; - char str[4][17] = {{0}}; int i; - if (1 > size || size > 4) + if (!size || size > 4) { ERR("Invalid vector size %u.\n", size); return; } - for (i = size - 1; i >= 0; --i) - { - sprintf(str[i], fmt, values[i]); - fmt = "%#x, "; - } + if (size > 1) + shader_addline(buffer, "ivec%u(", size); + + for (i = 0; i < size; ++i) + shader_addline(buffer, i ? ", %#x" : "%#x", values[i]); if (size > 1) - shader_addline(buffer, "ivec%u(%s%s%s%s)", size, str[0], str[1], str[2], str[3]); - else - shader_addline(buffer, str[0]); + shader_addline(buffer, ")"); } static const char *get_info_log_line(const char **ptr)

1 0

Matteo Bruni : d3d11/tests: Test creating SM4 shaders on feature level 9.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: 1c8983bf75b16f9b82eae72a13e6d5052a14ad0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c8983bf75b16f9b82eae72a1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 9 23:19:24 2016 +0100 d3d11/tests: Test creating SM4 shaders on feature level 9. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 133 +++++++++++++++++++++++++---------------------- 1 file changed, 72 insertions(+), 61 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 321fc2c..c42286a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2031,86 +2031,97 @@ static void test_create_shader(void) ok(hr == E_INVALIDARG, "Created a SM4 vertex shader from a pixel shader source, hr %#x, feature level %#x.\n", hr, feature_level); - if (feature_level < D3D_FEATURE_LEVEL_10_0) - { - refcount = ID3D11Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); - continue; - } - - expected_refcount = get_refcount((IUnknown *)device) + 1; + expected_refcount = get_refcount((IUnknown *)device) + (feature_level >= D3D_FEATURE_LEVEL_10_0); hr = ID3D11Device_CreateVertexShader(device, vs_4_0, sizeof(vs_4_0), NULL, &vs); - ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x, feature level %#x.\n", hr, feature_level); + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x, feature level %#x.\n", hr, feature_level); + else + ok(hr == E_INVALIDARG, "Created a SM4 vertex shader, hr %#x, feature level %#x.\n", hr, feature_level); refcount = get_refcount((IUnknown *)device); ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); - tmp = NULL; - expected_refcount = refcount + 1; - ID3D11VertexShader_GetDevice(vs, &tmp); - ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); - refcount = get_refcount((IUnknown *)device); - ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", - refcount, expected_refcount); - ID3D11Device_Release(tmp); - - hr = ID3D11VertexShader_QueryInterface(vs, &IID_ID3D10VertexShader, (void **)&iface); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Vertex shader should implement ID3D10VertexShader.\n"); - if (SUCCEEDED(hr)) IUnknown_Release(iface); - - refcount = ID3D11VertexShader_Release(vs); - ok(!refcount, "Vertex shader has %u references left.\n", refcount); + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + { + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11VertexShader_GetDevice(vs, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", + refcount, expected_refcount); + ID3D11Device_Release(tmp); + + hr = ID3D11VertexShader_QueryInterface(vs, &IID_ID3D10VertexShader, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Vertex shader should implement ID3D10VertexShader.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + refcount = ID3D11VertexShader_Release(vs); + ok(!refcount, "Vertex shader has %u references left.\n", refcount); + } /* pixel shader */ - expected_refcount = get_refcount((IUnknown *)device) + 1; + expected_refcount = get_refcount((IUnknown *)device) + (feature_level >= D3D_FEATURE_LEVEL_10_0); hr = ID3D11Device_CreatePixelShader(device, ps_4_0, sizeof(ps_4_0), NULL, &ps); - ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x, feature level %#x.\n", hr, feature_level); + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + ok(SUCCEEDED(hr), "Failed to create SM4 pixel shader, hr %#x, feature level %#x.\n", hr, feature_level); + else + ok(hr == E_INVALIDARG, "Created a SM4 pixel shader, hr %#x, feature level %#x.\n", hr, feature_level); refcount = get_refcount((IUnknown *)device); ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); - tmp = NULL; - expected_refcount = refcount + 1; - ID3D11PixelShader_GetDevice(ps, &tmp); - ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); - refcount = get_refcount((IUnknown *)device); - ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", - refcount, expected_refcount); - ID3D11Device_Release(tmp); - - hr = ID3D11PixelShader_QueryInterface(ps, &IID_ID3D10PixelShader, (void **)&iface); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Pixel shader should implement ID3D10PixelShader.\n"); - if (SUCCEEDED(hr)) IUnknown_Release(iface); - - refcount = ID3D11PixelShader_Release(ps); - ok(!refcount, "Pixel shader has %u references left.\n", refcount); + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + { + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11PixelShader_GetDevice(ps, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", + refcount, expected_refcount); + ID3D11Device_Release(tmp); + + hr = ID3D11PixelShader_QueryInterface(ps, &IID_ID3D10PixelShader, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Pixel shader should implement ID3D10PixelShader.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + refcount = ID3D11PixelShader_Release(ps); + ok(!refcount, "Pixel shader has %u references left.\n", refcount); + } /* geometry shader */ - expected_refcount = get_refcount((IUnknown *)device) + 1; + expected_refcount = get_refcount((IUnknown *)device) + (feature_level >= D3D_FEATURE_LEVEL_10_0); hr = ID3D11Device_CreateGeometryShader(device, gs_4_0, sizeof(gs_4_0), NULL, &gs); - ok(SUCCEEDED(hr), "Failed to create SM4 geometry shader, hr %#x.\n", hr); + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + ok(SUCCEEDED(hr), "Failed to create SM4 geometry shader, hr %#x, feature level %#x.\n", hr, feature_level); + else + ok(hr == E_INVALIDARG, "Created a SM4 geometry shader, hr %#x, feature level %#x.\n", hr, feature_level); refcount = get_refcount((IUnknown *)device); ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); - tmp = NULL; - expected_refcount = refcount + 1; - ID3D11GeometryShader_GetDevice(gs, &tmp); - ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); - refcount = get_refcount((IUnknown *)device); - ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", - refcount, expected_refcount); - ID3D11Device_Release(tmp); - - hr = ID3D11GeometryShader_QueryInterface(gs, &IID_ID3D10GeometryShader, (void **)&iface); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Geometry shader should implement ID3D10GeometryShader.\n"); - if (SUCCEEDED(hr)) IUnknown_Release(iface); - - refcount = ID3D11GeometryShader_Release(gs); - ok(!refcount, "Geometry shader has %u references left.\n", refcount); + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + { + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11GeometryShader_GetDevice(gs, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", + refcount, expected_refcount); + ID3D11Device_Release(tmp); + + hr = ID3D11GeometryShader_QueryInterface(gs, &IID_ID3D10GeometryShader, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Geometry shader should implement ID3D10GeometryShader.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + refcount = ID3D11GeometryShader_Release(gs); + ok(!refcount, "Geometry shader has %u references left.\n", refcount); + } refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Matteo Bruni : d3d11/tests: Add a test for the default feature level selection.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: 73c32df3834cdd8443af950a87abae5c221b730a URL: http://source.winehq.org/git/wine.git/?a=commit;h=73c32df3834cdd8443af950a8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 9 23:19:23 2016 +0100 d3d11/tests: Add a test for the default feature level selection. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f0ae840..321fc2c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -411,6 +411,15 @@ static void draw_quad_(unsigned int line, struct d3d11_test_context *context) static void test_create_device(void) { + static const D3D_FEATURE_LEVEL default_feature_levels[] = + { + D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_1, + D3D_FEATURE_LEVEL_10_0, + D3D_FEATURE_LEVEL_9_3, + D3D_FEATURE_LEVEL_9_2, + D3D_FEATURE_LEVEL_9_1, + }; D3D_FEATURE_LEVEL feature_level, supported_feature_level; DXGI_SWAP_CHAIN_DESC swapchain_desc, obtained_desc; ID3D11DeviceContext *immediate_context; @@ -440,6 +449,13 @@ static void test_create_device(void) ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", feature_level, supported_feature_level); + hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, default_feature_levels, + sizeof(default_feature_levels) / sizeof(default_feature_levels[0]), D3D11_SDK_VERSION, NULL, + &feature_level, NULL); + ok(SUCCEEDED(hr), "D3D11CreateDevice failed %#x.\n", hr); + ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", + feature_level, supported_feature_level); + hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, NULL, &immediate_context); ok(SUCCEEDED(hr), "D3D11CreateDevice failed %#x.\n", hr);

1 0

Matteo Bruni : d3d11: Pass the requested feature levels to dxgi.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: ce32dccee79088fdb64c5b01a96906e033529d21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce32dccee79088fdb64c5b01a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 9 23:19:22 2016 +0100 d3d11: Pass the requested feature levels to dxgi. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_main.c | 19 +++++++++++++++---- dlls/d3d11/tests/d3d11.c | 20 ++++++++++++++------ 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index e3ef209..ebd4808 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -132,7 +132,6 @@ HRESULT WINAPI D3D11CoreRegisterLayers(void) HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels, ID3D11Device **device) { - static const D3D_FEATURE_LEVEL level = D3D_FEATURE_LEVEL_10_0; IUnknown *dxgi_device; HMODULE d3d11; HRESULT hr; @@ -140,10 +139,8 @@ HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte TRACE("factory %p, adapter %p, flags %#x, feature_levels %p, levels %u, device %p.\n", factory, adapter, flags, feature_levels, levels, device); - FIXME("Ignoring feature levels.\n"); - d3d11 = GetModuleHandleA("d3d11.dll"); - hr = DXGID3D10CreateDevice(d3d11, factory, adapter, flags, &level, 1, (void **)&dxgi_device); + hr = DXGID3D10CreateDevice(d3d11, factory, adapter, flags, feature_levels, levels, (void **)&dxgi_device); if (FAILED(hr)) { WARN("Failed to create device, returning %#x.\n", hr); @@ -165,6 +162,15 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context) { + static const D3D_FEATURE_LEVEL default_feature_levels[] = + { + D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_1, + D3D_FEATURE_LEVEL_10_0, + D3D_FEATURE_LEVEL_9_3, + D3D_FEATURE_LEVEL_9_2, + D3D_FEATURE_LEVEL_9_1, + }; IDXGIFactory *factory; ID3D11Device *device; HRESULT hr; @@ -262,6 +268,11 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t } } + if (!feature_levels) + { + feature_levels = default_feature_levels; + levels = sizeof(default_feature_levels) / sizeof(default_feature_levels[0]); + } hr = D3D11CoreCreateDevice(factory, adapter, flags, feature_levels, levels, &device); IDXGIAdapter_Release(adapter); IDXGIFactory_Release(factory); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9d6add5..f0ae840 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1977,6 +1977,8 @@ static void test_create_shader(void) for (i = 0; i < sizeof(d3d11_feature_levels) / sizeof(*d3d11_feature_levels); ++i) { D3D_FEATURE_LEVEL feature_level = d3d11_feature_levels[i]; + BOOL todo = feature_level <= D3D_FEATURE_LEVEL_9_3; + if (!(device = create_device(&feature_level))) { skip("Failed to create device for feature level %#x.\n", feature_level); @@ -1985,16 +1987,22 @@ static void test_create_shader(void) /* level_9 shaders */ hr = ID3D11Device_CreatePixelShader(device, ps_4_0_level_9_0, sizeof(ps_4_0_level_9_0), NULL, &ps); - ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_0 shader, hr %#x, feature level %#x.\n", hr, feature_level); - ID3D11PixelShader_Release(ps); + todo_wine_if(todo) + ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_0 shader, hr %#x, feature level %#x.\n", hr, feature_level); + if (SUCCEEDED(hr)) + ID3D11PixelShader_Release(ps); hr = ID3D11Device_CreatePixelShader(device, ps_4_0_level_9_1, sizeof(ps_4_0_level_9_1), NULL, &ps); - ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_1 shader, hr %#x, feature level %#x.\n", hr, feature_level); - ID3D11PixelShader_Release(ps); + todo_wine_if(todo) + ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_1 shader, hr %#x, feature level %#x.\n", hr, feature_level); + if (SUCCEEDED(hr)) + ID3D11PixelShader_Release(ps); hr = ID3D11Device_CreatePixelShader(device, ps_4_0_level_9_3, sizeof(ps_4_0_level_9_3), NULL, &ps); - ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_3 shader, hr %#x, feature level %#x.\n", hr, feature_level); - ID3D11PixelShader_Release(ps); + todo_wine_if(todo) + ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_3 shader, hr %#x, feature level %#x.\n", hr, feature_level); + if (SUCCEEDED(hr)) + ID3D11PixelShader_Release(ps); /* vertex shader */ hr = ID3D11Device_CreateVertexShader(device, vs_2_0, sizeof(vs_2_0), NULL, &vs);

1 0

Matteo Bruni : d3d11: Only accept shader versions supported by the feature level of the device.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: ca3963b674433703816de861495af913c9579886 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca3963b674433703816de8614… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 9 23:19:21 2016 +0100 d3d11: Only accept shader versions supported by the feature level of the device. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/shader.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 0e277fc..06e4b8c 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -361,6 +361,27 @@ 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) { @@ -389,7 +410,7 @@ static HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d desc.byte_code = shader_info.shader_code; desc.input_signature = &input_signature; desc.output_signature = &output_signature; - desc.max_version = 4; + 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); @@ -708,7 +729,7 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, stru desc.byte_code = shader_info.shader_code; desc.input_signature = &input_signature; desc.output_signature = &output_signature; - desc.max_version = 4; + desc.max_version = d3d_sm_from_feature_level(device->feature_level); hr = wined3d_shader_create_gs(device->wined3d_device, &desc, shader, &d3d_geometry_shader_wined3d_parent_ops, &shader->wined3d_shader); @@ -1034,7 +1055,7 @@ static HRESULT d3d_pixel_shader_init(struct d3d_pixel_shader *shader, struct d3d desc.byte_code = shader_info.shader_code; desc.input_signature = &input_signature; desc.output_signature = &output_signature; - desc.max_version = 4; + 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);

1 0

Matteo Bruni : d3d11: Implement device_GetFeatureLevel().
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: 1e77bb01db6ae8c79125de90c983696e5e301e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e77bb01db6ae8c79125de90c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 9 23:19:20 2016 +0100 d3d11: Implement device_GetFeatureLevel(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/tests/d3d10_1.c | 4 ++-- dlls/d3d11/d3d11_main.c | 4 ++++ dlls/d3d11/d3d11_private.h | 2 ++ dlls/d3d11/device.c | 12 ++++++++---- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index f67896e..7eba447 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -82,7 +82,7 @@ static void test_create_device(void) } feature_level = ID3D10Device1_GetFeatureLevel(device); - ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", + todo_wine ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", feature_level, supported_feature_level); ID3D10Device1_Release(device); @@ -165,7 +165,7 @@ static void test_create_device(void) ok(!refcount, "Swapchain has %u references left.\n", refcount); feature_level = ID3D10Device1_GetFeatureLevel(device); - ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", + todo_wine ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", feature_level, supported_feature_level); refcount = ID3D10Device1_Release(device); diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index afc161f..e3ef209 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -104,6 +104,8 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba static void WINAPI layer_set_feature_level(enum dxgi_device_layer_id id, void *device, D3D_FEATURE_LEVEL feature_level) { + struct d3d_device *d3d_device = device; + TRACE("id %#x, device %p, feature_level %u.\n", id, device, feature_level); if (id != DXGI_DEVICE_LAYER_D3D10_DEVICE) @@ -111,6 +113,8 @@ static void WINAPI layer_set_feature_level(enum dxgi_device_layer_id id, void *d WARN("Unknown layer id %#x.\n", id); return; } + + d3d_device->feature_level = feature_level; } HRESULT WINAPI D3D11CoreRegisterLayers(void) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index a501a13..072afb4 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -394,6 +394,8 @@ struct d3d_device IUnknown *outer_unk; LONG refcount; + D3D_FEATURE_LEVEL feature_level; + struct d3d11_immediate_context immediate_context; struct wined3d_device_parent device_parent; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8b7d2f8..6ec154f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2536,9 +2536,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateDataInterface(ID3D11Devi static D3D_FEATURE_LEVEL STDMETHODCALLTYPE d3d11_device_GetFeatureLevel(ID3D11Device *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_device *device = impl_from_ID3D11Device(iface); + + TRACE("iface %p.\n", iface); - return D3D_FEATURE_LEVEL_10_0; + return device->feature_level; } static UINT STDMETHODCALLTYPE d3d11_device_GetCreationFlags(ID3D11Device *iface) @@ -4557,9 +4559,11 @@ static void STDMETHODCALLTYPE d3d10_device_GetTextFilterSize(ID3D10Device1 *ifac static D3D10_FEATURE_LEVEL1 STDMETHODCALLTYPE d3d10_device_GetFeatureLevel(ID3D10Device1 *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p.\n", iface); - return D3D10_FEATURE_LEVEL_10_1; + return device->feature_level; } static const struct ID3D10Device1Vtbl d3d10_device1_vtbl =

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2016