March 2016 - Wine-Commits - list.winehq.org

Józef Kucia : d3d11/tests: Add more create texture tests.
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: d6bef36f229ad2570be5308f715f684d6f2dcedc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6bef36f229ad2570be5308f7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 15 10:52:44 2016 +0100 d3d11/tests: Add more create texture 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/d3d11/tests/d3d11.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index d707067..ebed409 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -759,6 +759,9 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R8G8_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R8_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_BIND_DEPTH_STENCIL, FALSE, TRUE}, + {DXGI_FORMAT_D24_UNORM_S8_UINT, D3D11_BIND_RENDER_TARGET, FALSE, TRUE}, + {DXGI_FORMAT_D32_FLOAT, D3D11_BIND_RENDER_TARGET, FALSE, TRUE}, }; if (!(device = create_device(NULL))) @@ -1065,9 +1068,15 @@ static void test_create_texture3d(void) } tests[] = { + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_VERTEX_BUFFER, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_INDEX_BUFFER, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_CONSTANT_BUFFER, FALSE, TRUE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R10G10B10A2_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_BIND_DEPTH_STENCIL, FALSE, TRUE}, + {DXGI_FORMAT_D24_UNORM_S8_UINT, D3D11_BIND_RENDER_TARGET, FALSE, TRUE}, + {DXGI_FORMAT_D32_FLOAT, D3D11_BIND_RENDER_TARGET, FALSE, TRUE}, }; if (!(device = create_device(NULL)))

1 0

Józef Kucia : d3d11/tests: Move typeless textures test to test_create_texture{2d, 3d}().
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: 75c9178c9808544090e38c4362bed965570b369e URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c9178c9808544090e38c436… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 15 10:52:43 2016 +0100 d3d11/tests: Move typeless textures test to test_create_texture{2d, 3d}(). 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 | 180 ++++++++++++++++++++--------------------------- 1 file changed, 77 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75c9178c9808544090e38…

1 0

Józef Kucia : d3d10core/tests: Move typeless textures test to test_create_texture{2d, 3d}().
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: d4c9ba84272793053a1a2d5f24d2cb640c2bd09f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4c9ba84272793053a1a2d5f2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 15 10:52:42 2016 +0100 d3d10core/tests: Move typeless textures test to test_create_texture{2d, 3d}(). 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 | 180 ++++++++++++++++++------------------------ 1 file changed, 77 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d4c9ba84272793053a1a2…

1 0

Józef Kucia : d3d11/tests: Add test for ClearDepthStencilView().
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: 03ee99b43c2a01ce0e6f77fc0bbc71570a695336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ee99b43c2a01ce0e6f77fc0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 15 10:52:53 2016 +0100 d3d11/tests: Add test for ClearDepthStencilView(). 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 | 136 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 131 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index e8b6914..636bec9 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -21,6 +21,7 @@ #include "initguid.h" #include "d3d11.h" #include "wine/test.h" +#include <limits.h> static const D3D_FEATURE_LEVEL d3d11_feature_levels[] = { @@ -64,6 +65,22 @@ static ULONG get_refcount(IUnknown *iface) return IUnknown_Release(iface); } +static BOOL compare_float(float f, float g, unsigned int ulps) +{ + int x = *(int *)&f; + int y = *(int *)&g; + + if (x < 0) + x = INT_MIN - x; + if (y < 0) + y = INT_MIN - y; + + if (abs(x - y) > ulps) + return FALSE; + + return TRUE; +} + static BOOL compare_color(DWORD c1, DWORD c2, BYTE max_diff) { if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) @@ -130,15 +147,16 @@ static void get_texture_readback(ID3D11Texture2D *texture, struct texture_readba static DWORD get_readback_color(struct texture_readback *rb, unsigned int x, unsigned int y) { - return rb->texture - ? ((DWORD *)rb->map_desc.pData)[rb->map_desc.RowPitch * y / sizeof(DWORD) + x] : 0xdeadbeef; + return ((DWORD *)rb->map_desc.pData)[rb->map_desc.RowPitch * y / sizeof(DWORD) + x]; } -static void release_texture_readback(struct texture_readback *rb) +static float get_readback_float(struct texture_readback *rb, unsigned int x, unsigned int y) { - if (!rb->texture) - return; + return ((float *)rb->map_desc.pData)[rb->map_desc.RowPitch * y / sizeof(float) + x]; +} +static void release_texture_readback(struct texture_readback *rb) +{ ID3D11DeviceContext_Unmap(rb->immediate_context, rb->texture, 0); ID3D11Resource_Release(rb->texture); ID3D11DeviceContext_Release(rb->immediate_context); @@ -185,6 +203,35 @@ static void check_texture_color_(unsigned int line, ID3D11Texture2D *texture, "Got unexpected color 0x%08x at (%u, %u).\n", color, x, y); } +#define check_texture_float(r, f, d) check_texture_float_(__LINE__, r, f, d) +static void check_texture_float_(unsigned int line, ID3D11Texture2D *texture, + float expected_value, BYTE max_diff) +{ + struct texture_readback rb; + unsigned int x = 0, y = 0; + BOOL all_match = TRUE; + float value = 0.0f; + + get_texture_readback(texture, &rb); + for (y = 0; y < rb.height; ++y) + { + for (x = 0; x < rb.width; ++x) + { + value = get_readback_float(&rb, x, y); + if (!compare_float(value, expected_value, max_diff)) + { + all_match = FALSE; + break; + } + } + if (!all_match) + break; + } + release_texture_readback(&rb); + ok_(__FILE__, line)(all_match, + "Got unexpected value %.8e at (%u, %u).\n", value, x, y); +} + static ID3D11Device *create_device(const D3D_FEATURE_LEVEL *feature_level) { static const D3D_FEATURE_LEVEL default_feature_level[] = @@ -5082,6 +5129,84 @@ done: ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_clear_depth_stencil_view(void) +{ + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11Texture2D *depth_texture; + ID3D11DeviceContext *context; + ID3D11DepthStencilView *dsv; + ID3D11Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + ID3D11Device_GetImmediateContext(device, &context); + + texture_desc.Width = 640; + texture_desc.Height = 480; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_D32_FLOAT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_DEPTH_STENCIL; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &depth_texture); + ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)depth_texture, NULL, &dsv); + ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + check_texture_float(depth_texture, 1.0f, 0); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 0.25f, 0); + check_texture_float(depth_texture, 0.25f, 0); + + ID3D11Texture2D_Release(depth_texture); + ID3D11DepthStencilView_Release(dsv); + + texture_desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &depth_texture); + ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)depth_texture, NULL, &dsv); + ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH | D3D11_CLEAR_STENCIL, 1.0f, 0); + todo_wine check_texture_color(depth_texture, 0x00ffffff, 0); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH | D3D11_CLEAR_STENCIL, 0.0f, 0xff); + todo_wine check_texture_color(depth_texture, 0xff000000, 0); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH | D3D11_CLEAR_STENCIL, 1.0f, 0xff); + check_texture_color(depth_texture, 0xffffffff, 0); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH | D3D11_CLEAR_STENCIL, 0.0f, 0); + check_texture_color(depth_texture, 0x00000000, 0); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0xff); + todo_wine check_texture_color(depth_texture, 0x00ffffff, 0); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_STENCIL, 0.0f, 0xff); + check_texture_color(depth_texture, 0xffffffff, 0); + + ID3D11Texture2D_Release(depth_texture); + ID3D11DepthStencilView_Release(dsv); + + ID3D11DeviceContext_Release(context); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -5115,4 +5240,5 @@ START_TEST(d3d11) test_resource_map(); test_multisample_init(); test_check_multisample_quality_levels(); + test_clear_depth_stencil_view(); }

1 0

Józef Kucia : d3d10core/tests: Add test for ClearDepthStencilView().
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: 57d0a872f3baab3b5d005bb36776f3c6e6141eaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d0a872f3baab3b5d005bb36… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 15 10:52:52 2016 +0100 d3d10core/tests: Add test for ClearDepthStencilView(). 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 | 114 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 109 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 00d4482..f31d92a 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -130,15 +130,16 @@ static void get_texture_readback(ID3D10Texture2D *texture, struct texture_readba static DWORD get_readback_color(struct texture_readback *rb, unsigned int x, unsigned int y) { - return rb->texture - ? ((DWORD *)rb->mapped_texture.pData)[rb->mapped_texture.RowPitch * y / sizeof(DWORD) + x] : 0xdeadbeef; + return ((DWORD *)rb->mapped_texture.pData)[rb->mapped_texture.RowPitch * y / sizeof(DWORD) + x]; } -static void release_texture_readback(struct texture_readback *rb) +static float get_readback_float(struct texture_readback *rb, unsigned int x, unsigned int y) { - if (!rb->texture) - return; + return ((float *)rb->mapped_texture.pData)[rb->mapped_texture.RowPitch * y / sizeof(float) + x]; +} +static void release_texture_readback(struct texture_readback *rb) +{ ID3D10Texture2D_Unmap(rb->texture, 0); ID3D10Texture2D_Release(rb->texture); } @@ -184,6 +185,35 @@ static void check_texture_color_(unsigned int line, ID3D10Texture2D *texture, "Got unexpected color 0x%08x at (%u, %u).\n", color, x, y); } +#define check_texture_float(r, f, d) check_texture_float_(__LINE__, r, f, d) +static void check_texture_float_(unsigned int line, ID3D10Texture2D *texture, + float expected_value, BYTE max_diff) +{ + struct texture_readback rb; + unsigned int x = 0, y = 0; + BOOL all_match = TRUE; + float value = 0.0f; + + get_texture_readback(texture, &rb); + for (y = 0; y < rb.height; ++y) + { + for (x = 0; x < rb.width; ++x) + { + value = get_readback_float(&rb, x, y); + if (!compare_float(value, expected_value, max_diff)) + { + all_match = FALSE; + break; + } + } + if (!all_match) + break; + } + release_texture_readback(&rb); + ok_(__FILE__, line)(all_match, + "Got unexpected value %.8e at (%u, %u).\n", value, x, y); +} + static ID3D10Device *create_device(void) { ID3D10Device *device; @@ -5678,6 +5708,79 @@ static void test_swapchain_flip(void) DestroyWindow(window); } +static void test_clear_depth_stencil_view(void) +{ + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10Texture2D *depth_texture; + ID3D10DepthStencilView *dsv; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + texture_desc.Width = 640; + texture_desc.Height = 480; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_D32_FLOAT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_DEPTH_STENCIL; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &depth_texture); + ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)depth_texture, NULL, &dsv); + ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); + + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); + check_texture_float(depth_texture, 1.0f, 0); + + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 0.25f, 0); + check_texture_float(depth_texture, 0.25f, 0); + + ID3D10Texture2D_Release(depth_texture); + ID3D10DepthStencilView_Release(dsv); + + texture_desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &depth_texture); + ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)depth_texture, NULL, &dsv); + ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); + + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH | D3D10_CLEAR_STENCIL, 1.0f, 0); + todo_wine check_texture_color(depth_texture, 0x00ffffff, 0); + + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH | D3D10_CLEAR_STENCIL, 0.0f, 0xff); + todo_wine check_texture_color(depth_texture, 0xff000000, 0); + + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH | D3D10_CLEAR_STENCIL, 1.0f, 0xff); + check_texture_color(depth_texture, 0xffffffff, 0); + + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH | D3D10_CLEAR_STENCIL, 0.0f, 0); + check_texture_color(depth_texture, 0x00000000, 0); + + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0xff); + todo_wine check_texture_color(depth_texture, 0x00ffffff, 0); + + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_STENCIL, 0.0f, 0xff); + check_texture_color(depth_texture, 0xffffffff, 0); + + ID3D10Texture2D_Release(depth_texture); + ID3D10DepthStencilView_Release(dsv); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { test_feature_level(); @@ -5711,4 +5814,5 @@ START_TEST(device) test_check_multisample_quality_levels(); test_cb_relative_addressing(); test_swapchain_flip(); + test_clear_depth_stencil_view(); }

1 0

Józef Kucia : d3d11: Implement d3d10_device_ClearDepthStencilView().
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: 82d21786cdacc86f3ce8cb252696d940d03374dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d21786cdacc86f3ce8cb252… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 15 10:52:51 2016 +0100 d3d11: Implement d3d10_device_ClearDepthStencilView(). 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/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index b820383..845a33e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3324,8 +3324,21 @@ static void STDMETHODCALLTYPE d3d10_device_ClearRenderTargetView(ID3D10Device1 * static void STDMETHODCALLTYPE d3d10_device_ClearDepthStencilView(ID3D10Device1 *iface, ID3D10DepthStencilView *depth_stencil_view, UINT flags, FLOAT depth, UINT8 stencil) { - FIXME("iface %p, depth_stencil_view %p, flags %#x, depth %f, stencil %u stub!\n", + struct d3d_device *device = impl_from_ID3D10Device(iface); + struct d3d_depthstencil_view *view = unsafe_impl_from_ID3D10DepthStencilView(depth_stencil_view); + DWORD wined3d_flags; + HRESULT hr; + + TRACE("iface %p, depth_stencil_view %p, flags %#x, depth %.8e, stencil %u.\n", iface, depth_stencil_view, flags, depth, stencil); + + wined3d_flags = wined3d_clear_flags_from_d3d11_clear_flags(flags); + + wined3d_mutex_lock(); + if (FAILED(hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, view->wined3d_view, NULL, + wined3d_flags, NULL, depth, stencil))) + ERR("Failed to clear view, hr %#x.\n", hr); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_device_GenerateMips(ID3D10Device1 *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_ClearDepthStencilView().
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: 526c4612c8d3a1665a55fcd4bfa8091fb5b2db01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=526c4612c8d3a1665a55fcd4b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 15 10:52:50 2016 +0100 d3d11: Implement d3d11_immediate_context_ClearDepthStencilView(). 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/d3d11_private.h | 1 + dlls/d3d11/device.c | 17 +++++++++++++++-- dlls/d3d11/utils.c | 18 ++++++++++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 072afb4..a83a754 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -67,6 +67,7 @@ DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) DECLSPEC struct wined3d_resource *wined3d_resource_from_d3d11_resource(ID3D11Resource *resource) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; DWORD wined3d_map_flags_from_d3d11_map_type(D3D11_MAP map_type) DECLSPEC_HIDDEN; +DWORD wined3d_clear_flags_from_d3d11_clear_flags(UINT clear_flags) DECLSPEC_HIDDEN; enum D3D11_USAGE d3d11_usage_from_d3d10_usage(enum D3D10_USAGE usage) DECLSPEC_HIDDEN; enum D3D10_USAGE d3d10_usage_from_d3d11_usage(enum D3D11_USAGE usage) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0be9331..b820383 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -905,7 +905,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearRenderTargetView(ID3D const struct wined3d_color color = {color_rgba[0], color_rgba[1], color_rgba[2], color_rgba[3]}; HRESULT hr; - TRACE("iface %p, render_target_view %p, color_rgba {%.8e %.8e %.8e %.8e}.\n", + TRACE("iface %p, render_target_view %p, color_rgba {%.8e, %.8e, %.8e, %.8e}.\n", iface, render_target_view, color_rgba[0], color_rgba[1], color_rgba[2], color_rgba[3]); wined3d_mutex_lock(); @@ -932,8 +932,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearUnorderedAccessViewFl static void STDMETHODCALLTYPE d3d11_immediate_context_ClearDepthStencilView(ID3D11DeviceContext *iface, ID3D11DepthStencilView *depth_stencil_view, UINT flags, FLOAT depth, UINT8 stencil) { - FIXME("iface %p, depth_stencil_view %p, flags %#x, depth %f, stencil %u stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_depthstencil_view *view = unsafe_impl_from_ID3D11DepthStencilView(depth_stencil_view); + DWORD wined3d_flags; + HRESULT hr; + + TRACE("iface %p, depth_stencil_view %p, flags %#x, depth %.8e, stencil %u.\n", iface, depth_stencil_view, flags, depth, stencil); + + wined3d_flags = wined3d_clear_flags_from_d3d11_clear_flags(flags); + + wined3d_mutex_lock(); + if (FAILED(hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, view->wined3d_view, NULL, + wined3d_flags, NULL, depth, stencil))) + ERR("Failed to clear view, hr %#x.\n", hr); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_GenerateMips(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index d05ff3d..6d50de5 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -593,6 +593,24 @@ DWORD wined3d_map_flags_from_d3d11_map_type(D3D11_MAP map_type) } } +DWORD wined3d_clear_flags_from_d3d11_clear_flags(UINT clear_flags) +{ + DWORD wined3d_clear_flags = 0; + + if (clear_flags & D3D11_CLEAR_DEPTH) + wined3d_clear_flags |= WINED3DCLEAR_ZBUFFER; + if (clear_flags & D3D11_CLEAR_STENCIL) + wined3d_clear_flags |= WINED3DCLEAR_STENCIL; + + if (clear_flags & ~(D3D11_CLEAR_DEPTH | D3D11_CLEAR_STENCIL)) + { + FIXME("Unhandled clear flags %#x.\n", + clear_flags & ~(D3D11_CLEAR_DEPTH | D3D11_CLEAR_STENCIL)); + } + + return wined3d_clear_flags; +} + HRESULT d3d_get_private_data(struct wined3d_private_store *store, REFGUID guid, UINT *data_size, void *data) {

1 0

Józef Kucia : wined3d: Implement stencil clear in wined3d_device_clear_rendertarget_view().
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: 3ae4be8696f6abeb2a83b6265d1e6b2127b6922d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ae4be8696f6abeb2a83b6265… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 15 10:52:49 2016 +0100 wined3d: Implement stencil clear in wined3d_device_clear_rendertarget_view(). 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/arb_program_shader.c | 4 ++-- dlls/wined3d/device.c | 8 +------- dlls/wined3d/surface.c | 12 +++++++----- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index cdd6167..7c4c1db 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7931,9 +7931,9 @@ static HRESULT arbfp_blit_color_fill(struct wined3d_device *device, struct wined } static HRESULT arbfp_blit_depth_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view, - const RECT *rect, float depth) + const RECT *rect, DWORD clear_flags, float depth, DWORD stencil) { - FIXME("Depth filling not implemented by arbfp_blit.\n"); + FIXME("Depth/stencil filling not implemented by arbfp_blit.\n"); return WINED3DERR_INVALIDCALL; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index be8d36f..37d9ee9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4092,12 +4092,6 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi if (!flags) return WINED3D_OK; - if (flags & WINED3DCLEAR_STENCIL) - { - FIXME("Stencil clear not implemented.\n"); - return E_NOTIMPL; - } - resource = view->resource; if (resource->type != WINED3D_RTYPE_TEXTURE_2D) { @@ -4132,7 +4126,7 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi if (blit_op == WINED3D_BLIT_OP_COLOR_FILL) return blitter->color_fill(device, view, rect, color); else - return blitter->depth_fill(device, view, rect, depth); + return blitter->depth_fill(device, view, rect, flags, depth, stencil); } struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(const struct wined3d_device *device, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f7ca370..dcc946c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -927,7 +927,7 @@ static HRESULT wined3d_surface_depth_fill(struct wined3d_surface *surface, const return hr; } - hr = blitter->depth_fill(device, view, rect, depth); + hr = blitter->depth_fill(device, view, rect, WINED3DCLEAR_ZBUFFER, depth, 0); wined3d_rendertarget_view_decref(view); return hr; @@ -3584,12 +3584,13 @@ static HRESULT ffp_blit_color_fill(struct wined3d_device *device, struct wined3d } static HRESULT ffp_blit_depth_fill(struct wined3d_device *device, - struct wined3d_rendertarget_view *view, const RECT *rect, float depth) + struct wined3d_rendertarget_view *view, const RECT *rect, DWORD clear_flags, + float depth, DWORD stencil) { const RECT draw_rect = {0, 0, view->width, view->height}; struct wined3d_fb_state fb = {NULL, view}; - device_clear_render_targets(device, 0, &fb, 1, rect, &draw_rect, WINED3DCLEAR_ZBUFFER, 0, depth, 0); + device_clear_render_targets(device, 0, &fb, 1, rect, &draw_rect, clear_flags, NULL, depth, stencil); return WINED3D_OK; } @@ -4279,9 +4280,10 @@ static HRESULT cpu_blit_color_fill(struct wined3d_device *device, struct wined3d } static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, - struct wined3d_rendertarget_view *view, const RECT *rect, float depth) + struct wined3d_rendertarget_view *view, const RECT *rect, DWORD clear_flags, + float depth, DWORD stencil) { - FIXME("Depth filling not implemented by cpu_blit.\n"); + FIXME("Depth/stencil filling not implemented by cpu_blit.\n"); return WINED3DERR_INVALIDCALL; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ec7de5a..23d8565 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1473,8 +1473,8 @@ struct blit_shader const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format); HRESULT (*color_fill)(struct wined3d_device *device, struct wined3d_rendertarget_view *view, const RECT *rect, const struct wined3d_color *color); - HRESULT (*depth_fill)(struct wined3d_device *device, - struct wined3d_rendertarget_view *view, const RECT *rect, float depth); + HRESULT (*depth_fill)(struct wined3d_device *device, struct wined3d_rendertarget_view *view, + const RECT *rect, DWORD clear_flags, float depth, DWORD stencil); void (*blit_surface)(struct wined3d_device *device, enum wined3d_blit_op op, DWORD filter, struct wined3d_surface *src_surface, const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect,

1 0

Józef Kucia : wined3d: Implement depth clear in wined3d_device_clear_rendertarget_view().
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: c21dbb5149b613e5c5ffed6818358679a48af83e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c21dbb5149b613e5c5ffed681… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 15 10:52:48 2016 +0100 wined3d: Implement depth clear in wined3d_device_clear_rendertarget_view(). 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/device.c | 6 ++++-- dlls/d3d9/device.c | 3 ++- dlls/wined3d/device.c | 35 ++++++++++++++++++++++++++++++----- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 ++- 5 files changed, 39 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 240c995..0be9331 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -909,7 +909,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearRenderTargetView(ID3D iface, render_target_view, color_rgba[0], color_rgba[1], color_rgba[2], color_rgba[3]); wined3d_mutex_lock(); - if (FAILED(hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, view->wined3d_view, NULL, &color))) + if (FAILED(hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, view->wined3d_view, NULL, + WINED3DCLEAR_TARGET, &color, 0.0f, 0))) ERR("Failed to clear view, hr %#x.\n", hr); wined3d_mutex_unlock(); } @@ -3301,7 +3302,8 @@ static void STDMETHODCALLTYPE d3d10_device_ClearRenderTargetView(ID3D10Device1 * iface, render_target_view, color_rgba[0], color_rgba[1], color_rgba[2], color_rgba[3]); wined3d_mutex_lock(); - if (FAILED(hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, view->wined3d_view, NULL, &color))) + if (FAILED(hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, view->wined3d_view, NULL, + WINED3DCLEAR_TARGET, &color, 0.0f, 0))) ERR("Failed to clear view, hr %#x.\n", hr); wined3d_mutex_unlock(); } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 918e1e0..0ed2aff 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1450,7 +1450,8 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, } hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, - d3d9_surface_get_rendertarget_view(surface_impl), rect, &c); + d3d9_surface_get_rendertarget_view(surface_impl), rect, + WINED3DCLEAR_TARGET, &c, 0.0f, 0); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 53e6420..be8d36f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4078,13 +4078,25 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str } HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, - struct wined3d_rendertarget_view *view, const RECT *rect, const struct wined3d_color *color) + struct wined3d_rendertarget_view *view, const RECT *rect, DWORD flags, + const struct wined3d_color *color, float depth, DWORD stencil) { + const struct blit_shader *blitter; struct wined3d_resource *resource; + enum wined3d_blit_op blit_op; RECT r; - TRACE("device %p, view %p, rect %s, color %s.\n", - device, view, wine_dbgstr_rect(rect), debug_color(color)); + TRACE("device %p, view %p, rect %s, flags %#x, color %s, depth %.8e, stencil %u.\n", + device, view, wine_dbgstr_rect(rect), flags, debug_color(color), depth, stencil); + + if (!flags) + return WINED3D_OK; + + if (flags & WINED3DCLEAR_STENCIL) + { + FIXME("Stencil clear not implemented.\n"); + return E_NOTIMPL; + } resource = view->resource; if (resource->type != WINED3D_RTYPE_TEXTURE_2D) @@ -4105,9 +4117,22 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi rect = &r; } - resource = wined3d_texture_get_sub_resource(wined3d_texture_from_resource(resource), view->sub_resource_idx); + if (flags & WINED3DCLEAR_TARGET) + blit_op = WINED3D_BLIT_OP_COLOR_FILL; + else + blit_op = WINED3D_BLIT_OP_DEPTH_FILL; + + if (!(blitter = wined3d_select_blitter(&device->adapter->gl_info, &device->adapter->d3d_info, + blit_op, NULL, 0, 0, NULL, rect, resource->usage, resource->pool, resource->format))) + { + FIXME("No blitter is capable of performing the requested fill operation.\n"); + return WINED3DERR_INVALIDCALL; + } - return surface_color_fill(surface_from_resource(resource), rect, color); + if (blit_op == WINED3D_BLIT_OP_COLOR_FILL) + return blitter->color_fill(device, view, rect, color); + else + return blitter->depth_fill(device, view, rect, depth); } struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(const struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 247e4de..82e0d4f 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -36,7 +36,7 @@ @ cdecl wined3d_device_begin_scene(ptr) @ cdecl wined3d_device_begin_stateblock(ptr) @ cdecl wined3d_device_clear(ptr long ptr long ptr float long) -@ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr ptr) +@ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr long ptr float long) @ cdecl wined3d_device_copy_resource(ptr ptr ptr) @ cdecl wined3d_device_copy_sub_resource_region(ptr ptr long long long long ptr long ptr) @ cdecl wined3d_device_create(ptr long long ptr long long ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e678c39..d69d11e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2054,7 +2054,8 @@ HRESULT __cdecl wined3d_device_begin_stateblock(struct wined3d_device *device); HRESULT __cdecl wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float z, DWORD stencil); HRESULT __cdecl wined3d_device_clear_rendertarget_view(struct wined3d_device *device, - struct wined3d_rendertarget_view *view, const RECT *rect, const struct wined3d_color *color); + struct wined3d_rendertarget_view *view, const RECT *rect, DWORD flags, + const struct wined3d_color *color, float depth, DWORD stencil); void __cdecl wined3d_device_copy_resource(struct wined3d_device *device, struct wined3d_resource *dst_resource, struct wined3d_resource *src_resource); HRESULT __cdecl wined3d_device_copy_sub_resource_region(struct wined3d_device *device,

1 0

Hugh McMaster : reg: Fail if multiple /v switches are passed in.
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: bd278b1983d0913b28f85cfd897e1e6484bd5f35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd278b1983d0913b28f85cfd8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 15 23:23:56 2016 +1100 reg: Fail if multiple /v switches are passed in. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 6 +++--- programs/reg/tests/reg.c | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 29be40e..9dbce32 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -602,7 +602,7 @@ int wmain(int argc, WCHAR *argvW[]) { if (!lstrcmpiW(argvW[i], slashVW)) { - if (!(value_name = argvW[++i])) + if (value_name || !(value_name = argvW[++i])) { output_message(STRING_INVALID_CMDLINE); return 1; @@ -659,7 +659,7 @@ int wmain(int argc, WCHAR *argvW[]) { if (!lstrcmpiW(argvW[i], slashVW)) { - if (!(value_name = argvW[++i])) + if (value_name || !(value_name = argvW[++i])) { output_message(STRING_INVALID_CMDLINE); return 1; @@ -696,7 +696,7 @@ int wmain(int argc, WCHAR *argvW[]) { if (!lstrcmpiW(argvW[i], slashVW)) { - if (!(value_name = argvW[++i])) + if (value_name || !(value_name = argvW[++i])) { output_message(STRING_INVALID_CMDLINE); return 1; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index d1db5c4..927288d 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -532,6 +532,13 @@ static void test_v_flags(void) run_reg_exe("reg delete HKCU\\" KEY_BASE " /f /v", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + /* Multiple /v switches */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v Wine /t REG_DWORD /d 0x1 /v Test /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /v Test /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } START_TEST(reg)

1 0