wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Michael Stefaniuc : ddraw/tests: Use wine_dbgstr_rect() in the ddraw2 tests.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: bfe3475d5a42129bf3b77234ffb4ad744310d924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe3475d5a42129bf3b77234f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 8 22:24:47 2016 +0200 ddraw/tests: Use wine_dbgstr_rect() in the ddraw2 tests. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 164 ++++++++++++++++++---------------------------- 1 file changed, 65 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bfe3475d5a42129bf3b77…

1 0

Michael Stefaniuc : ddraw/tests: Use wine_dbgstr_rect() in the ddraw1 tests.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: 420f2329abfdd09682848108a9e46ce461bb5fb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=420f2329abfdd09682848108a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 8 22:22:29 2016 +0200 ddraw/tests: Use wine_dbgstr_rect() in the ddraw1 tests. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 149 ++++++++++++++++++---------------------------- 1 file changed, 59 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=420f2329abfdd09682848…

1 0

Béla Gyebrószki : wined3d: Add Nvidia GeForce GTS 250.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: a6d7a1c6e4f027b29092fa504d5fba1b7833cc24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6d7a1c6e4f027b29092fa504… Author: Béla Gyebrószki <gyebro69(a)gmail.com> Date: Wed Jun 8 18:30:23 2016 +0200 wined3d: Add Nvidia GeForce GTS 250. Signed-off-by: Béla Gyebrószki <gyebro69(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3656b8b..48feeef 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1237,6 +1237,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_210, "NVIDIA GeForce 210", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT220, "NVIDIA GeForce GT 220", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT240, "NVIDIA GeForce GT 240", DRIVER_NVIDIA_GEFORCE8, 512 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS250, "NVIDIA GeForce GTS 250", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", DRIVER_NVIDIA_GEFORCE8, 896 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", DRIVER_NVIDIA_GEFORCE8, 1024}, @@ -1833,13 +1834,13 @@ cards_nvidia_binary[] = {"GTX 280", CARD_NVIDIA_GEFORCE_GTX280}, /* Geforce 200 - highend */ {"GTX 275", CARD_NVIDIA_GEFORCE_GTX275}, /* Geforce 200 - midend high */ {"GTX 260", CARD_NVIDIA_GEFORCE_GTX260}, /* Geforce 200 - midend */ + {"GTS 250", CARD_NVIDIA_GEFORCE_GTS250}, /* Geforce 200 - midend */ {"GT 240", CARD_NVIDIA_GEFORCE_GT240}, /* Geforce 200 - midend */ {"GT 220", CARD_NVIDIA_GEFORCE_GT220}, /* Geforce 200 - lowend */ {"GeForce 310", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ {"GeForce 305", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ {"GeForce 210", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ {"G 210", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ - {"GTS 250", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ {"GTS 150", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ {"9800", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ {"9700M GT", CARD_NVIDIA_GEFORCE_9700MGT}, /* Geforce 9 - midend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b4bc901..82d4712 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1777,6 +1777,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_210 = 0x0a23, CARD_NVIDIA_GEFORCE_GT220 = 0x0a20, CARD_NVIDIA_GEFORCE_GT240 = 0x0ca3, + CARD_NVIDIA_GEFORCE_GTS250 = 0x0615, CARD_NVIDIA_GEFORCE_GTX260 = 0x05e2, CARD_NVIDIA_GEFORCE_GTX275 = 0x05e6, CARD_NVIDIA_GEFORCE_GTX280 = 0x05e1,

1 0

Józef Kucia : d3d11: Normalize SRV descriptions for remaining view dimensions.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: 026d5839ba9198fa0acc198a5d196f5f6298155a URL: http://source.winehq.org/git/wine.git/?a=commit;h=026d5839ba9198fa0acc198a5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 8 14:55:02 2016 +0200 d3d11: Normalize SRV descriptions for remaining view dimensions. 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 | 24 +++++++++- dlls/d3d11/tests/d3d11.c | 104 +++++++++++++++++++++++++++++++++--------- dlls/d3d11/view.c | 19 ++++++++ 3 files changed, 125 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=026d5839ba9198fa0acc1…

1 0

Józef Kucia : d3d11/tests: Add more tests for creating depth stencil views.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: d5f383ca53c3d8fcce56e2f34a0570b6a601c5fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5f383ca53c3d8fcce56e2f34… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 8 14:55:01 2016 +0200 d3d11/tests: Add more tests for creating depth stencil views. 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 | 168 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 136 insertions(+), 32 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index b519e39..0f811ec 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -279,6 +279,72 @@ static void check_rtv_desc_(unsigned int line, const D3D11_RENDER_TARGET_VIEW_DE } } +struct dsv_desc +{ + DXGI_FORMAT format; + D3D11_DSV_DIMENSION dimension; + unsigned int miplevel_idx; + unsigned int layer_idx; + unsigned int layer_count; +}; + +static void get_dsv_desc(D3D11_DEPTH_STENCIL_VIEW_DESC *d3d11_desc, const struct dsv_desc *desc) +{ + d3d11_desc->Format = desc->format; + d3d11_desc->ViewDimension = desc->dimension; + d3d11_desc->Flags = 0; + if (desc->dimension == D3D11_DSV_DIMENSION_TEXTURE2D) + { + U(*d3d11_desc).Texture2D.MipSlice = desc->miplevel_idx; + } + else if (desc->dimension == D3D11_DSV_DIMENSION_TEXTURE2DARRAY) + { + U(*d3d11_desc).Texture2DArray.MipSlice = desc->miplevel_idx; + U(*d3d11_desc).Texture2DArray.FirstArraySlice = desc->layer_idx; + U(*d3d11_desc).Texture2DArray.ArraySize = desc->layer_count; + } + else + { + trace("Unhandled view dimension %#x.\n", desc->dimension); + } +} + +#define check_dsv_desc(a, b) check_dsv_desc_(__LINE__, a, b) +static void check_dsv_desc_(unsigned int line, const D3D11_DEPTH_STENCIL_VIEW_DESC *desc, + const struct dsv_desc *expected_desc) +{ + ok_(__FILE__, line)(desc->Format == expected_desc->format, + "Got format %#x, expected %#x.\n", desc->Format, expected_desc->format); + ok_(__FILE__, line)(desc->ViewDimension == expected_desc->dimension, + "Got view dimension %#x, expected %#x.\n", desc->ViewDimension, expected_desc->dimension); + + if (desc->ViewDimension != expected_desc->dimension) + return; + + if (desc->ViewDimension == D3D11_DSV_DIMENSION_TEXTURE2D) + { + ok_(__FILE__, line)(U(*desc).Texture2D.MipSlice == expected_desc->miplevel_idx, + "Got MipSlice %u, expected %u.\n", + U(*desc).Texture2D.MipSlice, expected_desc->miplevel_idx); + } + else if (desc->ViewDimension == D3D11_DSV_DIMENSION_TEXTURE2DARRAY) + { + ok_(__FILE__, line)(U(*desc).Texture2DArray.MipSlice == expected_desc->miplevel_idx, + "Got MipSlice %u, expected %u.\n", + U(*desc).Texture2DArray.MipSlice, expected_desc->miplevel_idx); + ok_(__FILE__, line)(U(*desc).Texture2DArray.FirstArraySlice == expected_desc->layer_idx, + "Got FirstArraySlice %u, expected %u.\n", + U(*desc).Texture2DArray.FirstArraySlice, expected_desc->layer_idx); + ok_(__FILE__, line)(U(*desc).Texture2DArray.ArraySize == expected_desc->layer_count, + "Got ArraySize %u, expected %u.\n", + U(*desc).Texture2DArray.ArraySize, expected_desc->layer_count); + } + else + { + trace("Unhandled view dimension %#x.\n", desc->ViewDimension); + } +} + #define create_buffer(a, b, c, d) create_buffer_(__LINE__, a, b, c, d) static ID3D11Buffer *create_buffer_(unsigned int line, ID3D11Device *device, unsigned int bind_flags, unsigned int size, const void *data) @@ -1948,8 +2014,48 @@ static void test_create_depthstencil_view(void) ID3D11DepthStencilView *dsview; ID3D11Device *device, *tmp; ID3D11Texture2D *texture; + IUnknown *iface; + unsigned int i; HRESULT hr; + static const struct + { + struct + { + unsigned int miplevel_count; + unsigned int array_size; + DXGI_FORMAT format; + } texture; + struct dsv_desc dsv_desc; + struct dsv_desc expected_dsv_desc; + } + tests[] = + { +#define FMT_UNKNOWN DXGI_FORMAT_UNKNOWN +#define D24_S8 DXGI_FORMAT_D24_UNORM_S8_UINT +#define TEX_2D D3D11_DSV_DIMENSION_TEXTURE2D +#define TEX_2D_ARRAY D3D11_DSV_DIMENSION_TEXTURE2DARRAY + {{ 1, 1, D24_S8}, {0}, {D24_S8, TEX_2D, 0}}, + {{10, 1, D24_S8}, {0}, {D24_S8, TEX_2D, 0}}, + {{10, 1, D24_S8}, {FMT_UNKNOWN, TEX_2D, 0}, {D24_S8, TEX_2D, 0}}, + {{10, 1, D24_S8}, {FMT_UNKNOWN, TEX_2D, 1}, {D24_S8, TEX_2D, 1}}, + {{10, 1, D24_S8}, {FMT_UNKNOWN, TEX_2D, 9}, {D24_S8, TEX_2D, 9}}, + {{ 1, 4, D24_S8}, {0}, {D24_S8, TEX_2D_ARRAY, 0, 0, 4}}, + {{10, 4, D24_S8}, {0}, {D24_S8, TEX_2D_ARRAY, 0, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 0, -1}, {D24_S8, TEX_2D_ARRAY, 0, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 1, 0, -1}, {D24_S8, TEX_2D_ARRAY, 1, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 3, 0, -1}, {D24_S8, TEX_2D_ARRAY, 3, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 5, 0, -1}, {D24_S8, TEX_2D_ARRAY, 5, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 9, 0, -1}, {D24_S8, TEX_2D_ARRAY, 9, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 1, -1}, {D24_S8, TEX_2D_ARRAY, 0, 1, 3}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 2, -1}, {D24_S8, TEX_2D_ARRAY, 0, 2, 2}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 3, -1}, {D24_S8, TEX_2D_ARRAY, 0, 3, 1}}, +#undef FMT_UNKNOWN +#undef D24_S8 +#undef TEX_2D +#undef TEX_2D_ARRAY + }; + if (!(device = create_device(NULL))) { skip("Failed to create device.\n"); @@ -1993,46 +2099,44 @@ static void test_create_depthstencil_view(void) ok(!U(dsv_desc).Texture2D.MipSlice, "Got unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); ID3D11DepthStencilView_Release(dsview); + ID3D11Texture2D_Release(texture); - dsv_desc.Format = DXGI_FORMAT_UNKNOWN; - - hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, &dsv_desc, &dsview); - ok(SUCCEEDED(hr), "Failed to create a depthstencil view, hr %#x.\n", hr); + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + D3D11_DEPTH_STENCIL_VIEW_DESC *current_desc; - memset(&dsv_desc, 0, sizeof(dsv_desc)); - ID3D11DepthStencilView_GetDesc(dsview, &dsv_desc); - ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); - ok(dsv_desc.ViewDimension == D3D11_DSV_DIMENSION_TEXTURE2D, - "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); - ok(!dsv_desc.Flags, "Got unexpected flags %#x.\n", dsv_desc.Flags); - ok(!U(dsv_desc).Texture2D.MipSlice, "Got unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); + texture_desc.MipLevels = tests[i].texture.miplevel_count; + texture_desc.ArraySize = tests[i].texture.array_size; + texture_desc.Format = tests[i].texture.format; - ID3D11DepthStencilView_Release(dsview); - ID3D11Texture2D_Release(texture); + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Test %u: Failed to create 2d texture, hr %#x.\n", i, hr); - texture_desc.ArraySize = 4; + if (tests[i].dsv_desc.dimension == D3D11_DSV_DIMENSION_UNKNOWN) + { + current_desc = NULL; + } + else + { + current_desc = &dsv_desc; + get_dsv_desc(current_desc, &tests[i].dsv_desc); + } - hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, current_desc, &dsview); + ok(SUCCEEDED(hr), "Test %u: Failed to create depth stencil view, hr %#x.\n", i, hr); - hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, NULL, &dsview); - ok(SUCCEEDED(hr), "Failed to create depthstencil view, hr %#x.\n", hr); + hr = ID3D11DepthStencilView_QueryInterface(dsview, &IID_ID3D10DepthStencilView, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Test %u: Depth stencil view should implement ID3D10DepthStencilView.\n", i); + if (SUCCEEDED(hr)) IUnknown_Release(iface); - memset(&dsv_desc, 0, sizeof(dsv_desc)); - ID3D11DepthStencilView_GetDesc(dsview, &dsv_desc); - ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); - ok(dsv_desc.ViewDimension == D3D11_DSV_DIMENSION_TEXTURE2DARRAY, - "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); - ok(!dsv_desc.Flags, "Got unexpected flags %#x.\n", dsv_desc.Flags); - ok(!U(dsv_desc).Texture2DArray.MipSlice, "Got unexpected mip slice %u.\n", - U(dsv_desc).Texture2DArray.MipSlice); - ok(!U(dsv_desc).Texture2DArray.FirstArraySlice, "Got unexpected first array slice %u.\n", - U(dsv_desc).Texture2DArray.FirstArraySlice); - ok(U(dsv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, - "Got unexpected array size %u.\n", U(dsv_desc).Texture2DArray.ArraySize); + memset(&dsv_desc, 0, sizeof(dsv_desc)); + ID3D11DepthStencilView_GetDesc(dsview, &dsv_desc); + check_dsv_desc(&dsv_desc, &tests[i].expected_dsv_desc); - ID3D11DepthStencilView_Release(dsview); - ID3D11Texture2D_Release(texture); + ID3D11DepthStencilView_Release(dsview); + ID3D11Texture2D_Release(texture); + } refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Józef Kucia : d3d11: Normalize "ArraySize" field in D3D11_DEPTH_STENCIL_VIEW_DESC.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: 6b1bd3ded0211380cabc931b4aed2f826447d47f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b1bd3ded0211380cabc931b4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 8 14:55:00 2016 +0200 d3d11: Normalize "ArraySize" field in D3D11_DEPTH_STENCIL_VIEW_DESC. 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/view.c | 56 +++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 5a2ef39..7f5abf7 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -124,50 +124,50 @@ static HRESULT set_dsdesc_from_resource(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3 static void normalize_dsv_desc(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Resource *resource) { D3D11_RESOURCE_DIMENSION dimension; - - if (desc->Format != DXGI_FORMAT_UNKNOWN) - return; + unsigned int layer_count; + DXGI_FORMAT format; ID3D11Resource_GetType(resource, &dimension); switch (dimension) { - case D3D11_RESOURCE_DIMENSION_TEXTURE1D: + case D3D11_RESOURCE_DIMENSION_TEXTURE2D: { - D3D11_TEXTURE1D_DESC texture_desc; - ID3D11Texture1D *texture; + const struct d3d_texture2d *texture; - if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Texture1D, (void **)&texture))) + if (!(texture = unsafe_impl_from_ID3D11Texture2D((ID3D11Texture2D *)resource))) { - ERR("Resource of type TEXTURE1D doesn't implement ID3D11Texture1D.\n"); - break; + ERR("Cannot get implementation from ID3D11Texture2D.\n"); + return; } - ID3D11Texture1D_GetDesc(texture, &texture_desc); - ID3D11Texture1D_Release(texture); - - if (desc->Format == DXGI_FORMAT_UNKNOWN) - desc->Format = texture_desc.Format; + format = texture->desc.Format; + layer_count = texture->desc.ArraySize; break; } - case D3D11_RESOURCE_DIMENSION_TEXTURE2D: - { - D3D11_TEXTURE2D_DESC texture_desc; - ID3D11Texture2D *texture; + default: + return; + } - if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Texture2D, (void **)&texture))) - { - ERR("Resource of type TEXTURE2D doesn't implement ID3D11Texture2D.\n"); - break; - } + if (desc->Format == DXGI_FORMAT_UNKNOWN) + desc->Format = format; - ID3D11Texture2D_GetDesc(texture, &texture_desc); - ID3D11Texture2D_Release(texture); + switch (desc->ViewDimension) + { + case D3D11_DSV_DIMENSION_TEXTURE1DARRAY: + if (desc->u.Texture1DArray.ArraySize == -1 && desc->u.Texture1DArray.FirstArraySlice < layer_count) + desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.ArraySize; + break; + + case D3D11_DSV_DIMENSION_TEXTURE2DARRAY: + if (desc->u.Texture2DArray.ArraySize == -1 && desc->u.Texture2DArray.FirstArraySlice < layer_count) + desc->u.Texture2DArray.ArraySize = layer_count - desc->u.Texture2DArray.FirstArraySlice; + break; - if (desc->Format == DXGI_FORMAT_UNKNOWN) - desc->Format = texture_desc.Format; + case D3D11_DSV_DIMENSION_TEXTURE2DMSARRAY: + if (desc->u.Texture2DMSArray.ArraySize == -1 && desc->u.Texture2DMSArray.FirstArraySlice < layer_count) + desc->u.Texture2DMSArray.ArraySize = layer_count - desc->u.Texture2DMSArray.FirstArraySlice; break; - } default: break;

1 0

Józef Kucia : d3d11/tests: Add more tests for creating render target views.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: 6252bd2b63164c64a644153cce9dc5469531c9a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6252bd2b63164c64a644153cc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 8 14:54:59 2016 +0200 d3d11/tests: Add more tests for creating render target views. 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 | 264 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 202 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6252bd2b63164c64a6441…

1 0

Józef Kucia : wined3d: Fix wined3d_rendertarget_view_desc validation for 3D textures.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: 6c39a1aeab074fce870f4a27273bffe9ad53c121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c39a1aeab074fce870f4a272… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 8 14:54:58 2016 +0200 wined3d: Fix wined3d_rendertarget_view_desc validation for 3D textures. 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/view.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 1604443..95e1162 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -109,12 +109,21 @@ static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view * else { struct wined3d_texture *texture = texture_from_resource(resource); + unsigned int depth_or_layer_count; + + if (resource->type == WINED3D_RTYPE_TEXTURE_3D) + depth_or_layer_count = wined3d_texture_get_level_depth(texture, desc->u.texture.level_idx); + else + depth_or_layer_count = texture->layer_count; if (desc->u.texture.level_idx >= texture->level_count - || desc->u.texture.layer_idx >= texture->layer_count - || desc->u.texture.layer_count > texture->layer_count - desc->u.texture.layer_idx) + || desc->u.texture.layer_idx >= depth_or_layer_count + || desc->u.texture.layer_count > depth_or_layer_count - desc->u.texture.layer_idx) return WINED3DERR_INVALIDCALL; - view->sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx; + + view->sub_resource_idx = desc->u.texture.level_idx; + if (resource->type != WINED3D_RTYPE_TEXTURE_3D) + view->sub_resource_idx += desc->u.texture.layer_idx * texture->level_count; view->buffer_offset = 0; view->width = wined3d_texture_get_level_width(texture, desc->u.texture.level_idx); view->height = wined3d_texture_get_level_height(texture, desc->u.texture.level_idx);

1 0

Józef Kucia : d3d11: Normalize "ArraySize" field in D3D11_RENDER_TARGET_VIEW_DESC.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: 723f73aeb69cb94c842f7ad5b29d3224fecbadd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=723f73aeb69cb94c842f7ad5b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 8 14:54:57 2016 +0200 d3d11: Normalize "ArraySize" field in D3D11_RENDER_TARGET_VIEW_DESC. 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/view.c | 73 +++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 26 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 7bec5b9..5a2ef39 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -282,7 +282,7 @@ static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3 desc->ViewDimension = D3D11_RTV_DIMENSION_TEXTURE3D; desc->u.Texture3D.MipSlice = 0; desc->u.Texture3D.FirstWSlice = 0; - desc->u.Texture3D.WSize = 1; + desc->u.Texture3D.WSize = texture_desc.Depth; return S_OK; } @@ -296,52 +296,73 @@ static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3 static void normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Resource *resource) { D3D11_RESOURCE_DIMENSION dimension; - - if (desc->Format != DXGI_FORMAT_UNKNOWN) - return; + unsigned int layer_count; + DXGI_FORMAT format; ID3D11Resource_GetType(resource, &dimension); switch (dimension) { - case D3D11_RESOURCE_DIMENSION_TEXTURE1D: + case D3D11_RESOURCE_DIMENSION_TEXTURE2D: { - D3D11_TEXTURE1D_DESC texture_desc; - ID3D11Texture1D *texture; + const struct d3d_texture2d *texture; - if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Texture1D, (void **)&texture))) + if (!(texture = unsafe_impl_from_ID3D11Texture2D((ID3D11Texture2D *)resource))) { - ERR("Resource of type TEXTURE1D doesn't implement ID3D11Texture1D.\n"); - break; + ERR("Cannot get implementation from ID3D11Texture2D.\n"); + return; } - ID3D11Texture1D_GetDesc(texture, &texture_desc); - ID3D11Texture1D_Release(texture); - - if (desc->Format == DXGI_FORMAT_UNKNOWN) - desc->Format = texture_desc.Format; + format = texture->desc.Format; + layer_count = texture->desc.ArraySize; break; } - case D3D11_RESOURCE_DIMENSION_TEXTURE2D: + case D3D11_RESOURCE_DIMENSION_TEXTURE3D: { - D3D11_TEXTURE2D_DESC texture_desc; - ID3D11Texture2D *texture; + const struct d3d_texture3d *texture; - if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Texture2D, (void **)&texture))) + if (!(texture = unsafe_impl_from_ID3D11Texture3D((ID3D11Texture3D *)resource))) { - ERR("Resource of type TEXTURE2D doesn't implement ID3D11Texture2D.\n"); - break; + ERR("Cannot get implementation from ID3D11Texture3D.\n"); + return; } - ID3D11Texture2D_GetDesc(texture, &texture_desc); - ID3D11Texture2D_Release(texture); - - if (desc->Format == DXGI_FORMAT_UNKNOWN) - desc->Format = texture_desc.Format; + format = texture->desc.Format; + layer_count = texture->desc.Depth; break; } default: + return; + } + + if (desc->Format == DXGI_FORMAT_UNKNOWN) + desc->Format = format; + + switch (desc->ViewDimension) + { + case D3D11_RTV_DIMENSION_TEXTURE1DARRAY: + if (desc->u.Texture1DArray.ArraySize == -1 && desc->u.Texture1DArray.FirstArraySlice < layer_count) + desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.ArraySize; + break; + + case D3D11_RTV_DIMENSION_TEXTURE2DARRAY: + if (desc->u.Texture2DArray.ArraySize == -1 && desc->u.Texture2DArray.FirstArraySlice < layer_count) + desc->u.Texture2DArray.ArraySize = layer_count - desc->u.Texture2DArray.FirstArraySlice; + break; + + case D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY: + if (desc->u.Texture2DMSArray.ArraySize == -1 && desc->u.Texture2DMSArray.FirstArraySlice < layer_count) + desc->u.Texture2DMSArray.ArraySize = layer_count - desc->u.Texture2DMSArray.FirstArraySlice; + break; + + case D3D11_RTV_DIMENSION_TEXTURE3D: + layer_count = max(1, layer_count >> desc->u.Texture3D.MipSlice); + if (desc->u.Texture3D.WSize == -1 && desc->u.Texture3D.FirstWSlice < layer_count) + desc->u.Texture3D.WSize = layer_count - desc->u.Texture3D.FirstWSlice; + break; + + default: break; } }

1 0

Józef Kucia : d3d10core/tests: Add more tests for creating shader resource views.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: cc9b4d8a9eb20eeb61dbaffb7b37619b217b7b2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc9b4d8a9eb20eeb61dbaffb7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 8 14:54:56 2016 +0200 d3d10core/tests: Add more tests for creating shader resource views. 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 | 211 +++++++++++++++++++++++++++++------------- 1 file changed, 145 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc9b4d8a9eb20eeb61dba…

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
60
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 June 2016