wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Stefan Dösinger : wined3d: Call wined3d_surface_prepare() in surface_load_sysmem().
by Alexandre Julliard 08 Mar '16

08 Mar '16

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 08 Mar '16

08 Mar '16

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

Henri Verbeet : wined3d: Pass a texture and sub-resource index to surface_convert_format().
by Alexandre Julliard 08 Mar '16

08 Mar '16

Module: wine Branch: master Commit: fea913351dba469405a65b8a3e0205fe0673b7e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fea913351dba469405a65b8a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 17:05:53 2016 +0100 wined3d: Pass a texture and sub-resource index to surface_convert_format(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 779febf..b136ecb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1974,61 +1974,59 @@ static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_fo return NULL; } -static struct wined3d_texture *surface_convert_format(struct wined3d_surface *source, enum wined3d_format_id to_fmt) +static struct wined3d_texture *surface_convert_format(struct wined3d_texture *src_texture, + unsigned int sub_resource_idx, enum wined3d_format_id format) { struct wined3d_map_desc src_map, dst_map; const struct d3dfmt_converter_desc *conv; - struct wined3d_texture *ret = NULL; + struct wined3d_texture *dst_texture; struct wined3d_resource_desc desc; - struct wined3d_surface *dst; - conv = find_converter(source->resource.format->id, to_fmt); - if (!conv) + if (!(conv = find_converter(src_texture->resource.format->id, format))) { FIXME("Cannot find a conversion function from format %s to %s.\n", - debug_d3dformat(source->resource.format->id), debug_d3dformat(to_fmt)); + debug_d3dformat(src_texture->resource.format->id), debug_d3dformat(format)); return NULL; } /* FIXME: Multisampled conversion? */ - wined3d_resource_get_desc(&source->resource, &desc); + wined3d_resource_get_desc(src_texture->sub_resources[sub_resource_idx].resource, &desc); desc.resource_type = WINED3D_RTYPE_TEXTURE_2D; - desc.format = to_fmt; + desc.format = format; desc.usage = 0; desc.pool = WINED3D_POOL_SCRATCH; - if (FAILED(wined3d_texture_create(source->resource.device, &desc, 1, + if (FAILED(wined3d_texture_create(src_texture->resource.device, &desc, 1, WINED3D_TEXTURE_CREATE_MAPPABLE | WINED3D_TEXTURE_CREATE_DISCARD, - NULL, NULL, &wined3d_null_parent_ops, &ret))) + NULL, NULL, &wined3d_null_parent_ops, &dst_texture))) { - ERR("Failed to create a destination surface for conversion.\n"); + ERR("Failed to create a destination texture for conversion.\n"); return NULL; } - dst = surface_from_resource(wined3d_texture_get_sub_resource(ret, 0)); memset(&src_map, 0, sizeof(src_map)); memset(&dst_map, 0, sizeof(dst_map)); - if (FAILED(wined3d_surface_map(source, &src_map, NULL, WINED3D_MAP_READONLY))) + if (FAILED(wined3d_resource_map(&src_texture->resource, sub_resource_idx, + &src_map, NULL, WINED3D_MAP_READONLY))) { - ERR("Failed to lock the source surface.\n"); - wined3d_texture_decref(ret); + ERR("Failed to map the source texture.\n"); + wined3d_texture_decref(dst_texture); return NULL; } - if (FAILED(wined3d_surface_map(dst, &dst_map, NULL, 0))) + if (FAILED(wined3d_resource_map(&dst_texture->resource, 0, &dst_map, NULL, 0))) { - ERR("Failed to lock the destination surface.\n"); - wined3d_surface_unmap(source); - wined3d_texture_decref(ret); + ERR("Failed to map the destination texture.\n"); + wined3d_resource_unmap(&src_texture->resource, sub_resource_idx); + wined3d_texture_decref(dst_texture); return NULL; } - conv->convert(src_map.data, dst_map.data, src_map.row_pitch, dst_map.row_pitch, - source->resource.width, source->resource.height); + conv->convert(src_map.data, dst_map.data, src_map.row_pitch, dst_map.row_pitch, desc.width, desc.height); - wined3d_surface_unmap(dst); - wined3d_surface_unmap(source); + wined3d_resource_unmap(&dst_texture->resource, 0); + wined3d_resource_unmap(&src_texture->resource, sub_resource_idx); - return ret; + return dst_texture; } static HRESULT _Blt_ColorFill(BYTE *buf, unsigned int width, unsigned int height, @@ -4137,7 +4135,8 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * { if (dst_surface->resource.format->id != src_surface->resource.format->id) { - if (!(src_texture = surface_convert_format(src_surface, dst_format->id))) + if (!(src_texture = surface_convert_format(src_surface->container, + surface_get_sub_resource_idx(src_surface), dst_format->id))) { /* The conv function writes a FIXME */ WARN("Cannot convert source surface format to dest format.\n");

1 0

Henri Verbeet : wined3d: Use the resource map/ unmap functions in wined3d_device_set_cursor_properties().
by Alexandre Julliard 08 Mar '16

08 Mar '16

Module: wine Branch: master Commit: 60865da5a5d18aca7addf63582c3a79efc42ccf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60865da5a5d18aca7addf6358… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 17:05:52 2016 +0100 wined3d: Use the resource map/unmap functions in wined3d_device_set_cursor_properties(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fbbbc2c..f094752 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4340,7 +4340,8 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device return E_OUTOFMEMORY; memset(mask_bits, 0xff, mask_size); - wined3d_surface_map(cursor_image, &map_desc, NULL, WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY); + wined3d_resource_map(&texture->resource, sub_resource_idx, &map_desc, NULL, + WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY); cursor_info.fIcon = FALSE; cursor_info.xHotspot = x_hotspot; cursor_info.yHotspot = y_hotspot; @@ -4348,7 +4349,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device cursor_image->resource.height, 1, 1, mask_bits); cursor_info.hbmColor = CreateBitmap(cursor_image->resource.width, cursor_image->resource.height, 1, 32, map_desc.data); - wined3d_surface_unmap(cursor_image); + wined3d_resource_unmap(&texture->resource, sub_resource_idx); /* Create our cursor and clean up. */ cursor = CreateIconIndirect(&cursor_info);

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to wined3d_device_create_cursor_texture ().
by Alexandre Julliard 08 Mar '16

08 Mar '16

Module: wine Branch: master Commit: ead77caae3568345e998139f575a7aab621cef84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ead77caae3568345e998139f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 17:05:51 2016 +0100 wined3d: Pass a texture and sub-resource index to wined3d_device_create_cursor_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f9b47a2..fbbbc2c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4228,7 +4228,7 @@ void CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *device, } static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined3d_device *device, - struct wined3d_surface *cursor_image) + struct wined3d_texture *cursor_image, unsigned int sub_resource_idx) { struct wined3d_sub_resource_data data; struct wined3d_resource_desc desc; @@ -4236,9 +4236,9 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined struct wined3d_texture *texture; HRESULT hr; - if (FAILED(wined3d_surface_map(cursor_image, &map_desc, NULL, WINED3D_MAP_READONLY))) + if (FAILED(wined3d_resource_map(&cursor_image->resource, sub_resource_idx, &map_desc, NULL, WINED3D_MAP_READONLY))) { - ERR("Failed to map source surface.\n"); + ERR("Failed to map source texture.\n"); return NULL; } @@ -4252,14 +4252,14 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined desc.multisample_quality = 0; desc.usage = WINED3DUSAGE_DYNAMIC; desc.pool = WINED3D_POOL_DEFAULT; - desc.width = cursor_image->resource.width; - desc.height = cursor_image->resource.height; + desc.width = cursor_image->sub_resources[sub_resource_idx].resource->width; + desc.height = cursor_image->sub_resources[sub_resource_idx].resource->height; desc.depth = 1; desc.size = 0; hr = wined3d_texture_create(device, &desc, 1, WINED3D_TEXTURE_CREATE_MAPPABLE, &data, NULL, &wined3d_null_parent_ops, &texture); - wined3d_surface_unmap(cursor_image); + wined3d_resource_unmap(&cursor_image->resource, sub_resource_idx); if (FAILED(hr)) { ERR("Failed to create cursor texture.\n"); @@ -4320,7 +4320,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device * release it after setting the cursor image. Windows doesn't * addref the set surface, so we can't do this either without * creating circular refcount dependencies. */ - if (!(device->cursor_texture = wined3d_device_create_cursor_texture(device, cursor_image))) + if (!(device->cursor_texture = wined3d_device_create_cursor_texture(device, texture, sub_resource_idx))) { ERR("Failed to create cursor texture.\n"); return WINED3DERR_INVALIDCALL;

1 0

Henri Verbeet : wined3d: Replace device_update_volume() with a function to update multiple levels of a 3D texture.
by Alexandre Julliard 08 Mar '16

08 Mar '16

Module: wine Branch: master Commit: 561373344c75647992f19b2e9ab41af8ecec0f01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=561373344c75647992f19b2e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 17:05:50 2016 +0100 wined3d: Replace device_update_volume() with a function to update multiple levels of a 3D texture. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 80 ++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 43 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2305b2c..f9b47a2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3535,49 +3535,56 @@ void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device wined3d_cs_emit_draw(device->cs, start_idx, index_count, start_instance, instance_count, TRUE); } -/* This is a helper function for UpdateTexture, there is no UpdateVolume method in D3D. */ -static HRESULT device_update_volume(struct wined3d_device *device, - struct wined3d_volume *src_volume, struct wined3d_volume *dst_volume) +static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device, + struct wined3d_texture *src_texture, unsigned int src_level, + struct wined3d_texture *dst_texture, unsigned int level_count) { struct wined3d_const_bo_address data; - struct wined3d_map_desc src; - HRESULT hr; struct wined3d_context *context; + struct wined3d_map_desc src; + HRESULT hr = WINED3D_OK; + unsigned int i; - TRACE("device %p, src_volume %p, dst_volume %p.\n", - device, src_volume, dst_volume); + TRACE("device %p, src_texture %p, src_level %u, dst_texture %p, level_count %u.\n", + device, src_texture, src_level, dst_texture, level_count); - if (src_volume->resource.format != dst_volume->resource.format) + if (src_texture->resource.format != dst_texture->resource.format) { - FIXME("Source and destination formats do not match.\n"); + WARN("Source and destination formats do not match.\n"); return WINED3DERR_INVALIDCALL; } - if (src_volume->resource.width != dst_volume->resource.width - || src_volume->resource.height != dst_volume->resource.height - || src_volume->resource.depth != dst_volume->resource.depth) + + if (src_texture->sub_resources[src_level].resource->width != dst_texture->resource.width + || src_texture->sub_resources[src_level].resource->height != dst_texture->resource.height + || src_texture->sub_resources[src_level].resource->depth != dst_texture->resource.depth) { - FIXME("Source and destination sizes do not match.\n"); + WARN("Source and destination dimensions do not match.\n"); return WINED3DERR_INVALIDCALL; } - if (FAILED(hr = wined3d_volume_map(src_volume, &src, NULL, WINED3D_MAP_READONLY))) - return hr; - context = context_acquire(device, NULL); - /* Only a prepare, since we're uploading the entire volume. */ - wined3d_texture_prepare_texture(dst_volume->container, context, FALSE); - wined3d_texture_bind_and_dirtify(dst_volume->container, context, FALSE); + /* Only a prepare, since we're uploading entire volumes. */ + wined3d_texture_prepare_texture(dst_texture, context, FALSE); + wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); - data.buffer_object = 0; - data.addr = src.data; - wined3d_volume_upload_data(dst_volume, context, &data); - wined3d_volume_invalidate_location(dst_volume, ~WINED3D_LOCATION_TEXTURE_RGB); + for (i = 0; i < level_count; ++i) + { + if (FAILED(hr = wined3d_resource_map(&src_texture->resource, + src_level + i, &src, NULL, WINED3D_MAP_READONLY))) + goto done; - context_release(context); + data.buffer_object = 0; + data.addr = src.data; + wined3d_volume_upload_data(dst_texture->sub_resources[i].u.volume, context, &data); + wined3d_volume_invalidate_location(dst_texture->sub_resources[i].u.volume, ~WINED3D_LOCATION_TEXTURE_RGB); - hr = wined3d_volume_unmap(src_volume); + if (FAILED(hr = wined3d_resource_unmap(&src_texture->resource, src_level + i))) + goto done; + } +done: + context_release(context); return hr; } @@ -3671,32 +3678,19 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, } } } - break; + return WINED3D_OK; } case WINED3D_RTYPE_TEXTURE_3D: - { - for (i = 0; i < level_count; ++i) - { - hr = device_update_volume(device, - volume_from_resource(wined3d_texture_get_sub_resource(src_texture, - i + src_skip_levels)), - volume_from_resource(wined3d_texture_get_sub_resource(dst_texture, i))); - if (FAILED(hr)) - { - WARN("Failed to update volume, hr %#x.\n", hr); - return hr; - } - } - break; - } + if (FAILED(hr = wined3d_device_update_texture_3d(device, + src_texture, src_skip_levels, dst_texture, level_count))) + WARN("Failed to update 3D texture, hr %#x.\n", hr); + return hr; default: FIXME("Unsupported texture type %#x.\n", type); return WINED3DERR_INVALIDCALL; } - - return WINED3D_OK; } HRESULT CDECL wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes)

1 0

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

08 Mar '16

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: Introduce d3d11_test_context for visual tests.
by Alexandre Julliard 08 Mar '16

08 Mar '16

Module: wine Branch: master Commit: 57a15f2fd762960f291af9701ef46206cb1c7f25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57a15f2fd762960f291af9701… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 7 13:57:11 2016 +0100 d3d11/tests: Introduce d3d11_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/d3d11/tests/d3d11.c | 489 ++++++++++++++++------------------------------- 1 file changed, 163 insertions(+), 326 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57a15f2fd762960f291af…

1 0

Józef Kucia : d3d11/tests: Add test for creating DSV with DXGI_FORMAT_UNKNOWN.
by Alexandre Julliard 08 Mar '16

08 Mar '16

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 : d3d10core/tests: Add test for creating DSV with DXGI_FORMAT_UNKNOWN.
by Alexandre Julliard 08 Mar '16

08 Mar '16

Module: wine Branch: master Commit: 07ce50d8643720fe95550a27e82386cc6497dbc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ce50d8643720fe95550a27e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 7 13:57:09 2016 +0100 d3d10core/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/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 2df0b38..a2a0e38 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -867,6 +867,20 @@ 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); ID3D10DepthStencilView_Release(dsview); + + dsv_desc.Format = DXGI_FORMAT_UNKNOWN; + hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, &dsv_desc, &dsview); + ok(SUCCEEDED(hr), "Failed to create a depthstencil view, hr %#x.\n", hr); + + memset(&dsv_desc, 0, sizeof(dsv_desc)); + ID3D10DepthStencilView_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 == D3D10_DSV_DIMENSION_TEXTURE2D, + "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); + ok(!U(dsv_desc).Texture2D.MipSlice, "Got Unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); + + ID3D10DepthStencilView_Release(dsview); + ID3D10Texture2D_Release(texture); refcount = ID3D10Device_Release(device);

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
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