wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Henri Verbeet : wined3d: Use WGL_WINE_query_renderer to query GPU information.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 1b483f32adbc372cc02530ebab8444c773587c3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b483f32adbc372cc02530eba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 16:55:14 2016 +0100 wined3d: Use WGL_WINE_query_renderer to query GPU information. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 145 +++++++++++++++++++++++++++------------------- dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 87 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b483f32adbc372cc0253…

1 0

Henri Verbeet : winex11: Implement WGL_WINE_query_renderer on top of GLX_MESA_query_renderer.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 97e8f047a4477d7645c285edbeef762c7c5ceb3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e8f047a4477d7645c285edb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 16:55:13 2016 +0100 winex11: Implement WGL_WINE_query_renderer on top of GLX_MESA_query_renderer. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 704d62a..8177b00 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -172,6 +172,8 @@ typedef XID GLXPbuffer; /** GLX_ARB_pixel_format_float */ #define GLX_RGBA_FLOAT_BIT 0x00000004 #define GLX_RGBA_FLOAT_TYPE 0x20B9 +/** GLX_MESA_query_renderer */ +#define GLX_RENDERER_ID_MESA 0x818E /** GLX_NV_float_buffer */ #define GLX_FLOAT_COMPONENTS_NV 0x20B0 @@ -405,6 +407,10 @@ static void (*pglXFreeMemoryNV)(GLvoid *pointer); /* MESA GLX Extensions */ static void (*pglXCopySubBufferMESA)(Display *dpy, GLXDrawable drawable, int x, int y, int width, int height); static int (*pglXSwapIntervalMESA)(unsigned int interval); +static Bool (*pglXQueryCurrentRendererIntegerMESA)(int attribute, unsigned int *value); +static const char *(*pglXQueryCurrentRendererStringMESA)(int attribute); +static Bool (*pglXQueryRendererIntegerMESA)(Display *dpy, int screen, int renderer, int attribute, unsigned int *value); +static const char *(*pglXQueryRendererStringMESA)(Display *dpy, int screen, int renderer, int attribute); /* Standard OpenGL */ static void (*pglFinish)(void); @@ -730,6 +736,16 @@ static BOOL has_opengl(void) pglXCopySubBufferMESA = pglXGetProcAddressARB((const GLubyte *) "glXCopySubBufferMESA"); } + if (has_extension( WineGLInfo.glxExtensions, "GLX_MESA_query_renderer" )) + { + pglXQueryCurrentRendererIntegerMESA = pglXGetProcAddressARB( + (const GLubyte *)"glXQueryCurrentRendererIntegerMESA" ); + pglXQueryCurrentRendererStringMESA = pglXGetProcAddressARB( + (const GLubyte *)"glXQueryCurrentRendererStringMESA" ); + pglXQueryRendererIntegerMESA = pglXGetProcAddressARB( (const GLubyte *)"glXQueryRendererIntegerMESA" ); + pglXQueryRendererStringMESA = pglXGetProcAddressARB( (const GLubyte *)"glXQueryRendererStringMESA" ); + } + X11DRV_WineGL_LoadExtensions(); init_pixel_formats( gdi_display ); return TRUE; @@ -2069,6 +2085,12 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg pContextAttribList += 2; ret->numAttribs++; break; + case WGL_RENDERER_ID_WINE: + pContextAttribList[0] = GLX_RENDERER_ID_MESA; + pContextAttribList[1] = attribList[1]; + pContextAttribList += 2; + ret->numAttribs++; + break; default: ERR("Unhandled attribList pair: %#x %#x\n", attribList[0], attribList[1]); } @@ -3050,6 +3072,26 @@ static BOOL X11DRV_wglSetPixelFormatWINE(HDC hdc, int format) return set_pixel_format(hdc, format, TRUE); } +static BOOL X11DRV_wglQueryCurrentRendererIntegerWINE( GLenum attribute, GLuint *value ) +{ + return pglXQueryCurrentRendererIntegerMESA( attribute, value ); +} + +static const char *X11DRV_wglQueryCurrentRendererStringWINE( GLenum attribute ) +{ + return pglXQueryCurrentRendererStringMESA( attribute ); +} + +static BOOL X11DRV_wglQueryRendererIntegerWINE( HDC dc, GLint renderer, GLenum attribute, GLuint *value ) +{ + return pglXQueryRendererIntegerMESA( gdi_display, DefaultScreen(gdi_display), renderer, attribute, value ); +} + +static const char *X11DRV_wglQueryRendererStringWINE( HDC dc, GLint renderer, GLenum attribute ) +{ + return pglXQueryRendererStringMESA( gdi_display, DefaultScreen(gdi_display), renderer, attribute ); +} + /** * glxRequireVersion (internal) * @@ -3195,6 +3237,15 @@ static void X11DRV_WineGL_LoadExtensions(void) */ register_extension( "WGL_WINE_pixel_format_passthrough" ); opengl_funcs.ext.p_wglSetPixelFormatWINE = X11DRV_wglSetPixelFormatWINE; + + if (has_extension( WineGLInfo.glxExtensions, "GLX_MESA_query_renderer" )) + { + register_extension( "WGL_WINE_query_renderer" ); + opengl_funcs.ext.p_wglQueryCurrentRendererIntegerWINE = X11DRV_wglQueryCurrentRendererIntegerWINE; + opengl_funcs.ext.p_wglQueryCurrentRendererStringWINE = X11DRV_wglQueryCurrentRendererStringWINE; + opengl_funcs.ext.p_wglQueryRendererIntegerWINE = X11DRV_wglQueryRendererIntegerWINE; + opengl_funcs.ext.p_wglQueryRendererStringWINE = X11DRV_wglQueryRendererStringWINE; + } }

1 0

Henri Verbeet : opengl32: Introduce WGL_WINE_query_renderer.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: ffb27c61c03d28154945738a74d288eb1f32c6ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb27c61c03d28154945738a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 16:55:12 2016 +0100 opengl32: Introduce WGL_WINE_query_renderer. This is a fairly straightforward adaptation of GLX_MESA_query_renderer to WGL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 27 ++++++++++++++++++++++- dlls/opengl32/opengl_ext.c | 8 +++++-- dlls/opengl32/opengl_ext.h | 5 +++++ dlls/opengl32/opengl_norm.c | 8 +++++++ dlls/opengl32/wgl.c | 52 +++++++++++++++++++++++++++++++++++++++++++++ include/wine/wgl.h | 12 +++++++++++ include/wine/wgl_driver.h | 6 +++++- 7 files changed, 114 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffb27c61c03d281549457…

1 0

Henri Verbeet : ddraw: Just return an error if we failed to find the predecessor in ddraw_surface_delete_attached_surface ().
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 644724d32cf832db895c4ed58a1e0ac31363077c URL: http://source.winehq.org/git/wine.git/?a=commit;h=644724d32cf832db895c4ed58… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 16:55:11 2016 +0100 ddraw: Just return an error if we failed to find the predecessor in ddraw_surface_delete_attached_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 9e28655..3709b94 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1982,16 +1982,16 @@ static HRESULT ddraw_surface_delete_attached_surface(struct ddraw_surface *surfa } /* Find the predecessor of the detached surface */ - while (prev) + while (prev->next_attached != attachment) { - if (prev->next_attached == attachment) - break; - prev = prev->next_attached; + if (!(prev = prev->next_attached)) + { + ERR("Failed to find predecessor of %p.\n", attachment); + wined3d_mutex_unlock(); + return DDERR_SURFACENOTATTACHED; + } } - /* There must be a surface, otherwise there's a bug */ - assert(prev); - /* Unchain the surface */ prev->next_attached = attachment->next_attached; attachment->next_attached = NULL;

1 0

Henri Verbeet : ddraw: Avoid d3d_device_update_depth_stencil() in ddraw_surface_delete_attached_surface().
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 130bd9d8c73a5199524645ce5f83544646c80642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=130bd9d8c73a5199524645ce5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 16:55:10 2016 +0100 ddraw: Avoid d3d_device_update_depth_stencil() in ddraw_surface_delete_attached_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4259c10..9e28655 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1997,9 +1997,14 @@ static HRESULT ddraw_surface_delete_attached_surface(struct ddraw_surface *surfa attachment->next_attached = NULL; attachment->first_attached = attachment; - /* Check if the wined3d depth stencil needs updating. */ - if (surface->ddraw->d3ddevice) - d3d_device_update_depth_stencil(surface->ddraw->d3ddevice); + /* Check if the wined3d depth stencil needs updating. Note that we don't + * just call d3d_device_update_depth_stencil() here since it uses + * QueryInterface(). Some applications, SCP - Containment Breach in + * particular, modify the QueryInterface() pointer in the surface vtbl + * but don't cleanup properly after the relevant dll is unloaded. */ + if (attachment->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER + && wined3d_device_get_depth_stencil_view(surface->ddraw->wined3d_device) == surface->wined3d_rtv) + wined3d_device_set_depth_stencil_view(surface->ddraw->wined3d_device, NULL); wined3d_mutex_unlock(); /* Set attached_iface to NULL before releasing it, the surface may go

1 0

Henri Verbeet : ddraw: Do not destroy surfaces that are still attached.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 9ff40749f92d773f6aed74ba5e018daf8e3838f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ff40749f92d773f6aed74ba5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 16:55:09 2016 +0100 ddraw: Do not destroy surfaces that are still attached. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d133e7e..4259c10 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -531,7 +531,14 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) ULONG ddraw_surface_release_iface(struct ddraw_surface *This) { - ULONG iface_count = InterlockedDecrement(&This->iface_count); + ULONG iface_count; + + /* Prevent the surface from being destroyed if it's still attached to + * another surface. It will be destroyed when the root is destroyed. */ + if (This->iface_count == 1 && This->attached_iface) + IUnknown_AddRef(This->attached_iface); + iface_count = InterlockedDecrement(&This->iface_count); + TRACE("%p decreasing iface count to %u.\n", This, iface_count); if (iface_count == 0) @@ -5623,20 +5630,10 @@ static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *paren TRACE("surface %p.\n", surface); - /* Check for attached surfaces and detach them. */ + /* This shouldn't happen, ddraw_surface_release_iface() should prevent the + * surface from being destroyed in this case. */ if (surface->first_attached != surface) - { - /* Well, this shouldn't happen: The surface being attached is - * referenced in AddAttachedSurface(), so it shouldn't be released - * until DeleteAttachedSurface() is called, because the refcount is - * held. It looks like the application released it often enough to - * force this. */ - WARN("Surface is still attached to surface %p.\n", surface->first_attached); - - /* The refcount will drop to -1 here */ - if (FAILED(ddraw_surface_delete_attached_surface(surface->first_attached, surface, surface->attached_iface))) - ERR("DeleteAttachedSurface failed.\n"); - } + ERR("Surface is still attached to surface %p.\n", surface->first_attached); while (surface->next_attached) if (FAILED(ddraw_surface_delete_attached_surface(surface,

1 0

Henri Verbeet : wined3d: Allow swapchain sample counts to be overridden with a registry key.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 91f0b0010347fc501ba6c0ad7179dd23c9dfa142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91f0b0010347fc501ba6c0ad7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 16:55:08 2016 +0100 wined3d: Allow swapchain sample counts to be overridden with a registry key. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/wined3d_main.c | 4 ++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 31 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 9f3a36b..3033773 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -814,6 +814,28 @@ static void swapchain_update_render_to_fbo(struct wined3d_swapchain *swapchain) swapchain->render_to_fbo = TRUE; } +static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_swapchain *swapchain, + enum wined3d_format_id format_id, enum wined3d_multisample_type *type, DWORD *quality) +{ + const struct wined3d_gl_info *gl_info; + const struct wined3d_format *format; + enum wined3d_multisample_type t; + + if (wined3d_settings.sample_count == ~0u) + return; + + gl_info = &swapchain->device->adapter->gl_info; + if (!(format = wined3d_get_format(gl_info, format_id))) + return; + + if ((t = min(wined3d_settings.sample_count, gl_info->limits.samples))) + while (!(format->multisample_types & 1u << (t - 1))) + ++t; + TRACE("Using sample count %u.\n", t); + *type = t; + *quality = 0; +} + static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { @@ -878,6 +900,8 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 } } swapchain->desc = *desc; + wined3d_swapchain_apply_sample_count_override(swapchain, swapchain->desc.backbuffer_format, + &swapchain->desc.multisample_type, &swapchain->desc.multisample_quality); swapchain_update_render_to_fbo(swapchain); TRACE("Creating front buffer.\n"); @@ -1277,6 +1301,8 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha swapchain, buffer_count, width, height, debug_d3dformat(format_id), multisample_type, multisample_quality); + wined3d_swapchain_apply_sample_count_override(swapchain, format_id, &multisample_type, &multisample_quality); + if (buffer_count && buffer_count != swapchain->desc.backbuffer_count) FIXME("Cannot change the back buffer count yet.\n"); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 45e41ad..71dc180 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -80,6 +80,7 @@ struct wined3d_settings wined3d_settings = 0, /* The default of memory is set in init_driver_info */ NULL, /* No wine logo by default */ TRUE, /* Multisampling enabled by default. */ + ~0u, /* Don't force a specific sample count by default. */ FALSE, /* No strict draw ordering. */ TRUE, /* Don't try to render onscreen by default. */ FALSE, /* Don't range check relative addressing indices in float constants. */ @@ -291,6 +292,9 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.allow_multisampling = FALSE; } } + if (!get_config_key_dword(hkey, appkey, "SampleCount", &wined3d_settings.sample_count)) + ERR_(winediag)("Forcing sample count to %u. This may not be compatible with all applications.\n", + wined3d_settings.sample_count); if (!get_config_key(hkey, appkey, "StrictDrawOrdering", buffer, size) && !strcmp(buffer,"enabled")) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 23d8565..206cac5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -288,6 +288,7 @@ struct wined3d_settings UINT64 emulated_textureram; char *logo; int allow_multisampling; + unsigned int sample_count; BOOL strict_draw_ordering; BOOL always_offscreen; BOOL check_float_constants;

1 0

Józef Kucia : d3d11/tests: Add test for ClearDepthStencilView().
by Alexandre Julliard 15 Mar '16

15 Mar '16

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

15 Mar '16

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

15 Mar '16

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

← Newer
1
...
38
39
40
41
42
43
44
...
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