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

Paul Gofman : d3dx9: Support setting texture through SetValue in effect.
by Alexandre Julliard March 9, 2016

March 9, 2016

Module: wine Branch: master Commit: 1da5af93640e6a46070ae6cad68d5e67dee2694b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1da5af93640e6a46070ae6cad… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Mar 8 02:33:27 2016 +0300 d3dx9: Support setting texture through SetValue in effect. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 20 ++++++++++++++++++++ dlls/d3dx9_36/tests/effect.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a374d90..e42cf86 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1366,6 +1366,26 @@ static HRESULT d3dx9_base_effect_set_value(struct d3dx9_base_effect *base, { switch (param->type) { + case D3DXPT_TEXTURE: + case D3DXPT_TEXTURE1D: + case D3DXPT_TEXTURE2D: + case D3DXPT_TEXTURE3D: + case D3DXPT_TEXTURECUBE: + { + unsigned int i; + + for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) + { + IUnknown *unk = ((IUnknown **)data)[i]; + if (unk) + IUnknown_AddRef(unk); + + unk = ((IUnknown **)param->data)[i]; + if (unk) + IUnknown_Release(unk); + } + } + /* fallthrough */ case D3DXPT_VOID: case D3DXPT_BOOL: case D3DXPT_INT: diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index de7d1e9..a785f4d 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -2389,6 +2389,43 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) } } +static void test_effect_setvalue_object(IDirect3DDevice9 *device) +{ + ID3DXEffect *effect; + D3DXHANDLE parameter; + IDirect3DTexture9 *texture; + IDirect3DTexture9 *texture_set; + HRESULT hr; + ULONG count; + + hr = D3DXCreateEffect(device, test_effect_parameter_value_blob_object, + sizeof(test_effect_parameter_value_blob_object), NULL, NULL, 0, NULL, &effect, NULL); + ok(hr == D3D_OK, "Got result %#x, expected 0 (D3D_OK).\n", hr); + + parameter = effect->lpVtbl->GetParameterByName(effect, NULL, "tex"); + ok(parameter != NULL, "GetParameterByName failed, got %p\n", parameter); + + texture = NULL; + hr = D3DXCreateTexture(device, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, 0, D3DPOOL_DEFAULT, &texture); + ok(hr == D3D_OK, "Got result %#x, expected 0 (D3D_OK).\n", hr); + hr = effect->lpVtbl->SetValue(effect, parameter, &texture, sizeof(texture)); + ok(hr == D3D_OK, "Got result %#x, expected 0 (D3D_OK).\n", hr); + texture_set = NULL; + hr = effect->lpVtbl->GetValue(effect, parameter, &texture_set, sizeof(texture_set)); + ok(hr == D3D_OK, "Got result %#x, expected 0 (D3D_OK).\n", hr); + ok(texture == texture_set, "Texture does not match.\n"); + + count = IDirect3DTexture9_Release(texture_set); + ok(count == 2, "Got reference count %u, expected 2.\n", count); + texture_set = NULL; + hr = effect->lpVtbl->SetValue(effect, parameter, &texture_set, sizeof(texture_set)); + ok(hr == D3D_OK, "Got result %#x, expected 0 (D3D_OK).\n", hr); + count = IDirect3DTexture9_Release(texture); + ok(!count, "Got reference count %u, expected 0.\n", count); + + effect->lpVtbl->Release(effect); +} + /* * fxc.exe /Tfx_2_0 */ @@ -3008,6 +3045,7 @@ START_TEST(effect) test_create_effect_and_pool(device); test_create_effect_compiler(); test_effect_parameter_value(device); + test_effect_setvalue_object(device); test_effect_variable_names(device); test_effect_compilation_errors(device); test_effect_states(device);

1 0

Józef Kucia : d3d10core/tests: Add test for creating RTV with DXGI_FORMAT_UNKNOWN.
by Alexandre Julliard March 8, 2016

March 8, 2016

Module: wine Branch: master Commit: 1e5f819ceeb8450e808ae073d7165512d21a2200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e5f819ceeb8450e808ae073d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 7 13:57:07 2016 +0100 d3d10core/tests: Add test for creating RTV with DXGI_FORMAT_UNKNOWN. 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 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f51d56d..2df0b38 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1040,6 +1040,20 @@ static void test_create_rendertarget_view(void) if (SUCCEEDED(hr)) IUnknown_Release(iface); ID3D10RenderTargetView_Release(rtview); + + rtv_desc.Format = DXGI_FORMAT_UNKNOWN; + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &rtview); + ok(SUCCEEDED(hr), "Failed to create a rendertarget view, hr %#x.\n", hr); + + memset(&rtv_desc, 0, sizeof(rtv_desc)); + ID3D10RenderTargetView_GetDesc(rtview, &rtv_desc); + todo_wine ok(rtv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", rtv_desc.Format); + ok(rtv_desc.ViewDimension == D3D10_RTV_DIMENSION_TEXTURE2D, "Got unexpected view dimension %#x.\n", + rtv_desc.ViewDimension); + ok(!U(rtv_desc).Texture2D.MipSlice, "Got unexpected mip slice %#x.\n", U(rtv_desc).Texture2D.MipSlice); + + ID3D10RenderTargetView_Release(rtview); + ID3D10Texture2D_Release(texture); refcount = ID3D10Device_Release(device);

1 0

Nikolay Sivov : notepad: Make sure to use large enough buffer when composing window title ( Coverity).
by Alexandre Julliard March 8, 2016

March 8, 2016

Module: wine Branch: master Commit: ba5e12ae8332246d64d0f3b2827ff3d5e7b6c760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba5e12ae8332246d64d0f3b28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 7 22:04:25 2016 +0300 notepad: Make sure to use large enough buffer when composing window title (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/notepad/dialog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 1ea2ef9..94301b8 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -101,9 +101,9 @@ VOID ShowLastError(void) */ void UpdateWindowCaption(void) { - WCHAR szCaption[MAX_STRING_LEN]; - WCHAR szNotepad[MAX_STRING_LEN]; static const WCHAR hyphenW[] = { ' ','-',' ',0 }; + WCHAR szNotepad[64]; + WCHAR szCaption[ARRAY_SIZE(Globals.szFileTitle) + ARRAY_SIZE(hyphenW) + ARRAY_SIZE(szNotepad)]; if (Globals.szFileTitle[0] != '\0') lstrcpyW(szCaption, Globals.szFileTitle);

1 0

Michael Stefaniuc : riched20: Use SetRectEmpty() instead of open coding it.
by Alexandre Julliard March 8, 2016

March 8, 2016

Module: wine Branch: master Commit: a58822dba400c335ba86b9687766dec4358e74e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a58822dba400c335ba86b9687… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 8 11:48:07 2016 +0100 riched20: Use SetRectEmpty() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/txtsrv.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 18b26ac..3df7798 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -416,10 +416,7 @@ HRESULT WINAPI CreateTextServices(IUnknown *pUnkOuter, ITextHost *pITextHost, I ITextImpl->ITextServices_iface.lpVtbl = &textservices_vtbl; ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE, ES_LEFT); ITextImpl->editor->exStyleFlags = 0; - ITextImpl->editor->rcFormat.left = 0; - ITextImpl->editor->rcFormat.top = 0; - ITextImpl->editor->rcFormat.right = 0; - ITextImpl->editor->rcFormat.bottom = 0; + SetRectEmpty(&ITextImpl->editor->rcFormat); if (pUnkOuter) ITextImpl->outer_unk = pUnkOuter;

1 0

Nikolay Sivov : include: Added IDWriteFactory3 method definitions.
by Alexandre Julliard March 8, 2016

March 8, 2016

Module: wine Branch: master Commit: 39958094b93cac9c16498dc1536493cc503a4df9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39958094b93cac9c16498dc15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 7 21:43:58 2016 +0300 include: Added IDWriteFactory3 method definitions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite_3.idl | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index 967cd95..b69f29a 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -21,6 +21,7 @@ import "dwrite_2.idl"; interface IDWriteFontFaceReference; interface IDWriteFontFace3; interface IDWriteFontSet; +interface IDWriteFontSetBuilder; interface IDWriteFontDownloadQueue; typedef enum DWRITE_LOCALITY @@ -260,4 +261,50 @@ interface IDWriteTextLayout3 : IDWriteTextLayout2 ] interface IDWriteFactory3 : IDWriteFactory2 { + HRESULT CreateGlyphRunAnalysis( + DWRITE_GLYPH_RUN const *run, + DWRITE_MATRIX const *transform, + DWRITE_RENDERING_MODE1 rendering_mode, + DWRITE_MEASURING_MODE measuring_mode, + DWRITE_GRID_FIT_MODE gridfit_mode, + DWRITE_TEXT_ANTIALIAS_MODE antialias_mode, + FLOAT origin_x, + FLOAT origin_y, + IDWriteGlyphRunAnalysis **analysis); + + HRESULT CreateCustomRenderingParams( + FLOAT gamma, + FLOAT enhanced_contrast, + FLOAT grayscale_enhanced_contrast, + FLOAT cleartype_level, + DWRITE_PIXEL_GEOMETRY pixel_geometry, + DWRITE_RENDERING_MODE1 rendering_mode, + DWRITE_GRID_FIT_MODE gridfit_mode, + IDWriteRenderingParams3 **params); + + HRESULT CreateFontFaceReference( + WCHAR const *path, + FILETIME const *writetime, + UINT32 index, + DWRITE_FONT_SIMULATIONS simulations, + IDWriteFontFaceReference **reference); + + HRESULT CreateFontFaceReference_( + IDWriteFontFile *file, + UINT32 index, + DWRITE_FONT_SIMULATIONS simulations, + IDWriteFontFaceReference **reference); + + HRESULT GetSystemFontSet(IDWriteFontSet **fontset); + HRESULT CreateFontSetBuilder(IDWriteFontSetBuilder **builder); + HRESULT CreateFontCollectionFromFontSet( + IDWriteFontSet *fontset, + IDWriteFontCollection1 **collection); + + HRESULT GetSystemFontCollection( + BOOL include_downloadable, + IDWriteFontCollection1 **collection, + BOOL check_for_updates); + + HRESULT GetFontDownloadQueue(IDWriteFontDownloadQueue **queue); }

1 0

Stefan Dösinger : wined3d: Call wined3d_surface_prepare() in surface_load_sysmem().
by Alexandre Julliard March 8, 2016

March 8, 2016

Module: wine Branch: master Commit: 0771244873ed06c272446e15fff9f2f6727395e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0771244873ed06c272446e15f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 7 17:05:55 2016 +0100 wined3d: Call wined3d_surface_prepare() in surface_load_sysmem(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 9 +++------ dlls/wined3d/texture.c | 1 - 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d77cd3c..814d4ab 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1020,7 +1020,6 @@ static void surface_unload(struct wined3d_resource *resource) } else { - wined3d_surface_prepare(surface, context, surface->resource.map_binding); surface_load_location(surface, context, surface->resource.map_binding); surface_invalidate_location(surface, ~surface->resource.map_binding); } @@ -2194,11 +2193,11 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ gl_info = context->gl_info; } - wined3d_surface_prepare(surface, context, surface->resource.map_binding); if (flags & WINED3D_MAP_DISCARD) { TRACE("WINED3D_MAP_DISCARD flag passed, marking %s as up to date.\n", wined3d_debug_location(surface->resource.map_binding)); + wined3d_surface_prepare(surface, context, surface->resource.map_binding); surface_validate_location(surface, surface->resource.map_binding); } else @@ -3463,6 +3462,8 @@ static void surface_load_sysmem(struct wined3d_surface *surface, { const struct wined3d_gl_info *gl_info = context->gl_info; + wined3d_surface_prepare(surface, context, dst_location); + if (surface->locations & surface_simple_locations) { surface_copy_simple_location(surface, dst_location); @@ -3578,7 +3579,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { /* Performance warning... */ FIXME("Downloading RGB surface %p to reload it as sRGB.\n", surface); - wined3d_surface_prepare(surface, context, surface->resource.map_binding); surface_load_location(surface, context, surface->resource.map_binding); } } @@ -3589,7 +3589,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { /* Performance warning... */ FIXME("Downloading sRGB surface %p to reload it as RGB.\n", surface); - wined3d_surface_prepare(surface, context, surface->resource.map_binding); surface_load_location(surface, context, surface->resource.map_binding); } } @@ -3598,7 +3597,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { WARN("Trying to load a texture from sysmem, but no simple location is valid.\n"); /* Lets hope we get it from somewhere... */ - surface_prepare_system_memory(surface); surface_load_location(surface, context, WINED3D_LOCATION_SYSMEM); } @@ -3625,7 +3623,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, else surface->resource.map_binding = WINED3D_LOCATION_SYSMEM; - wined3d_surface_prepare(surface, context, surface->resource.map_binding); surface_load_location(surface, context, surface->resource.map_binding); wined3d_texture_remove_buffer_object(texture, surface_get_sub_resource_idx(surface), gl_info); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f5a7c16..71ce472 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -853,7 +853,6 @@ static void texture2d_sub_resource_add_dirty_region(struct wined3d_resource *sub struct wined3d_context *context; context = context_acquire(surface->container->resource.device, NULL); - wined3d_surface_prepare(surface, context, sub_resource->map_binding); surface_load_location(surface, context, sub_resource->map_binding); context_release(context); surface_invalidate_location(surface, ~sub_resource->map_binding);

1 0

Henri Verbeet : wined3d: Pass textures and sub-resource indices to surface_cpu_blt().
by Alexandre Julliard March 8, 2016

March 8, 2016

Module: wine Branch: master Commit: 9f17f922070c271c2ea1435382e0eb495ce2545d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f17f922070c271c2ea143538… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 17:05:54 2016 +0100 wined3d: Pass textures and sub-resource indices to surface_cpu_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 188 ++++++++++++++++++++++++++----------------------- 1 file changed, 98 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f17f922070c271c2ea14…

1 0

Józef Kucia : d3d11/tests: Introduce draw_quad().
by Alexandre Julliard March 8, 2016

March 8, 2016

Module: wine Branch: master Commit: c5bacb66dd49d79d0e5ece73cb228761b84cafc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5bacb66dd49d79d0e5ece73c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 7 13:57:12 2016 +0100 d3d11/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/d3d11/tests/d3d11.c | 444 +++++++++++------------------------------------ 1 file changed, 106 insertions(+), 338 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5bacb66dd49d79d0e5ec…

1 0

Józef Kucia : d3d11/tests: Add test for creating DSV with DXGI_FORMAT_UNKNOWN.
by Alexandre Julliard March 8, 2016

March 8, 2016

Module: wine Branch: master Commit: aac8805ec23eb4a7203a3601b1079743cd01d6bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=aac8805ec23eb4a7203a3601b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 7 13:57:10 2016 +0100 d3d11/tests: Add test for creating DSV with DXGI_FORMAT_UNKNOWN. 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 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0f70b25..b787275 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1273,6 +1273,21 @@ static void test_create_depthstencil_view(void) ok(U(dsv_desc).Texture2D.MipSlice == 0, "Got Unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); ID3D11DepthStencilView_Release(dsview); + + 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); + + memset(&dsv_desc, 0, sizeof(dsv_desc)); + ID3D11DepthStencilView_GetDesc(dsview, &dsv_desc); + todo_wine 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); + + ID3D11DepthStencilView_Release(dsview); + ID3D11Texture2D_Release(texture); refcount = ID3D11Device_Release(device);

1 0

Józef Kucia : d3d11/tests: Add test for creating RTV with DXGI_FORMAT_UNKNOWN.
by Alexandre Julliard March 8, 2016

March 8, 2016

Module: wine Branch: master Commit: e70b63fa843c1feaf73625c25629c4f4127fd5a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e70b63fa843c1feaf73625c25… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 7 13:57:08 2016 +0100 d3d11/tests: Add test for creating RTV with DXGI_FORMAT_UNKNOWN. 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 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f1e5c20..0f70b25 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1447,6 +1447,20 @@ static void test_create_rendertarget_view(void) if (SUCCEEDED(hr)) IUnknown_Release(iface); ID3D11RenderTargetView_Release(rtview); + + rtv_desc.Format = DXGI_FORMAT_UNKNOWN; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtview); + ok(SUCCEEDED(hr), "Failed to create a rendertarget view, hr %#x.\n", hr); + + memset(&rtv_desc, 0, sizeof(rtv_desc)); + ID3D11RenderTargetView_GetDesc(rtview, &rtv_desc); + todo_wine ok(rtv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", rtv_desc.Format); + ok(rtv_desc.ViewDimension == D3D11_RTV_DIMENSION_TEXTURE2D, "Got unexpected view dimension %#x.\n", + rtv_desc.ViewDimension); + ok(!U(rtv_desc).Texture2D.MipSlice, "Got unexpected mip slice %#x.\n", U(rtv_desc).Texture2D.MipSlice); + + ID3D11RenderTargetView_Release(rtview); + ID3D11Texture2D_Release(texture); refcount = ID3D11Device_Release(device);

1 0