[PATCH 0/5] MR2316: ddraw: SetSurfaceDesc() refactoring, part 2.
From: Zebediah Figura <zfigura(a)codeweavers.com> It makes use of the wined3d_format, and we want to move wined3d desc creation to ddraw_surface_create_wined3d_texture() so that we can use it to recreate the wined3d texture in SetSurfaceDesc(). --- dlls/ddraw/surface.c | 48 ++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index aec0bba8dc3..d01ab5294a1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5995,10 +5995,11 @@ static HRESULT ddraw_surface_reserve_memory(struct wined3d_texture *wined3d_text return hr; } -static HRESULT ddraw_surface_create_wined3d_texture(struct wined3d_device *wined3d_device, +static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, const struct wined3d_resource_desc *wined3d_desc, unsigned int layers, unsigned int levels, struct ddraw_texture *texture, struct wined3d_texture **wined3d_texture) { + struct wined3d_device *wined3d_device = ddraw->wined3d_device; const DDSURFACEDESC2 *desc = &texture->surface_desc; struct wined3d_resource_desc draw_texture_desc; struct wined3d_texture *draw_texture; @@ -6007,6 +6008,30 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct wined3d_device *wined unsigned int i; HRESULT hr; + /* Validate the pitch. */ + if (desc->dwFlags & DDSD_LPSURFACE) + { + if (format_is_compressed(&desc->u4.ddpfPixelFormat)) + { + if ((desc->dwFlags & DDSD_LINEARSIZE) + && desc->u1.dwLinearSize < wined3d_calculate_format_pitch(ddraw->wined3d_adapter, + wined3d_desc->format, wined3d_desc->width) * ((wined3d_desc->height + 3) / 4)) + { + WARN("Invalid linear size %lu specified.\n", desc->u1.dwLinearSize); + return DDERR_INVALIDPARAMS; + } + } + else + { + if (desc->u1.lPitch < wined3d_calculate_format_pitch(ddraw->wined3d_adapter, + wined3d_desc->format, wined3d_desc->width) || desc->u1.lPitch & 3) + { + WARN("Invalid pitch %lu specified.\n", desc->u1.lPitch); + return DDERR_INVALIDPARAMS; + } + } + } + bind_flags = 0; if ((desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) || (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE)) @@ -6526,15 +6551,6 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ heap_free(texture); return DDERR_INVALIDPARAMS; } - - if ((desc->dwFlags & DDSD_LINEARSIZE) - && desc->u1.dwLinearSize < wined3d_calculate_format_pitch(ddraw->wined3d_adapter, - wined3d_desc.format, wined3d_desc.width) * ((desc->dwHeight + 3) / 4)) - { - WARN("Invalid linear size %lu specified.\n", desc->u1.dwLinearSize); - heap_free(texture); - return DDERR_INVALIDPARAMS; - } } else { @@ -6545,14 +6561,6 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_INVALIDPARAMS; } - if (desc->u1.lPitch < wined3d_calculate_format_pitch(ddraw->wined3d_adapter, - wined3d_desc.format, wined3d_desc.width) || desc->u1.lPitch & 3) - { - WARN("Invalid pitch %lu specified.\n", desc->u1.lPitch); - heap_free(texture); - return DDERR_INVALIDPARAMS; - } - pitch = desc->u1.lPitch; } } @@ -6590,7 +6598,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ layers = 6; } - if (FAILED(hr = ddraw_surface_create_wined3d_texture(ddraw->wined3d_device, &wined3d_desc, layers, levels, + if (FAILED(hr = ddraw_surface_create_wined3d_texture(ddraw, &wined3d_desc, layers, levels, texture, &wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#lx.\n", hr); @@ -6724,7 +6732,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ desc->ddsCaps.dwCaps |= DDSCAPS_BACKBUFFER; desc->u5.dwBackBufferCount = 0; - if (FAILED(hr = ddraw_surface_create_wined3d_texture(ddraw->wined3d_device, &wined3d_desc, 1, 1, + if (FAILED(hr = ddraw_surface_create_wined3d_texture(ddraw, &wined3d_desc, 1, 1, texture, &wined3d_texture))) { heap_free(texture); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2316
From: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ddraw/surface.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d01ab5294a1..3825a9d4075 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5995,6 +5995,19 @@ static HRESULT ddraw_surface_reserve_memory(struct wined3d_texture *wined3d_text return hr; } +static bool need_draw_texture(unsigned int draw_bind_flags, const struct wined3d_resource_desc *desc) +{ + if (!draw_bind_flags) + return false; + + /* If we have a GPU texture that includes all the necessary bind flags, we + * don't need a separate draw texture. */ + if ((desc->access & WINED3D_RESOURCE_ACCESS_GPU) && ((desc->bind_flags & draw_bind_flags) == draw_bind_flags)) + return false; + + return true; +} + static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, const struct wined3d_resource_desc *wined3d_desc, unsigned int layers, unsigned int levels, struct ddraw_texture *texture, struct wined3d_texture **wined3d_texture) @@ -6042,7 +6055,7 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) bind_flags |= WINED3D_BIND_RENDER_TARGET; - if (!bind_flags || (wined3d_desc->access & WINED3D_RESOURCE_ACCESS_GPU && !(bind_flags & ~wined3d_desc->bind_flags))) + if (!need_draw_texture(bind_flags, wined3d_desc)) goto no_draw_texture; draw_texture_desc = *wined3d_desc; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2316
From: Zebediah Figura <zfigura(a)codeweavers.com> And, more saliently, to allow moving more common code to the end of the function. --- dlls/ddraw/surface.c | 90 +++++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 42 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3825a9d4075..e963d337ca3 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6014,8 +6014,7 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, { struct wined3d_device *wined3d_device = ddraw->wined3d_device; const DDSURFACEDESC2 *desc = &texture->surface_desc; - struct wined3d_resource_desc draw_texture_desc; - struct wined3d_texture *draw_texture; + struct wined3d_texture *draw_texture = NULL; struct ddraw_surface *parent; unsigned int bind_flags; unsigned int i; @@ -6055,21 +6054,21 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) bind_flags |= WINED3D_BIND_RENDER_TARGET; - if (!need_draw_texture(bind_flags, wined3d_desc)) - goto no_draw_texture; + if (need_draw_texture(bind_flags, wined3d_desc)) + { + struct wined3d_resource_desc draw_texture_desc; - draw_texture_desc = *wined3d_desc; - draw_texture_desc.bind_flags = bind_flags; - draw_texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; - draw_texture_desc.usage = WINED3DUSAGE_PRIVATE; + draw_texture_desc = *wined3d_desc; + draw_texture_desc.bind_flags = bind_flags; + draw_texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; + draw_texture_desc.usage = WINED3DUSAGE_PRIVATE; - if (FAILED(hr = wined3d_texture_create(wined3d_device, &draw_texture_desc, layers, - levels, 0, NULL, texture, &ddraw_texture_wined3d_parent_ops, &draw_texture))) - { - WARN("Failed to create draw texture, hr %#lx.\n", hr); - goto no_draw_texture; + if (SUCCEEDED(hr = wined3d_texture_create(wined3d_device, &draw_texture_desc, layers, + levels, 0, NULL, texture, &ddraw_texture_wined3d_parent_ops, &draw_texture))) + wined3d_texture_decref(draw_texture); + else + WARN("Failed to create draw texture, hr %#lx.\n", hr); } - wined3d_texture_decref(draw_texture); /* Some applications assume surfaces will always be mapped at the same * address. Some of those also assume that this address is valid even when @@ -6077,40 +6076,47 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, * visible on the screen. The game Nox is such an application, * Commandos: Behind Enemy Lines is another. Setting * WINED3D_TEXTURE_CREATE_GET_DC_LENIENT will ensure this. */ - if (FAILED(hr = wined3d_texture_create(wined3d_device, wined3d_desc, layers, levels, - WINED3D_TEXTURE_CREATE_GET_DC_LENIENT, NULL, NULL, &ddraw_null_wined3d_parent_ops, - wined3d_texture))) - { - parent = wined3d_texture_get_sub_resource_parent(draw_texture, 0); - if (texture->version == 7) - IDirectDrawSurface7_Release(&parent->IDirectDrawSurface7_iface); - else if (texture->version == 4) - IDirectDrawSurface4_Release(&parent->IDirectDrawSurface4_iface); - else - IDirectDrawSurface_Release(&parent->IDirectDrawSurface_iface); - return hr; + + if (draw_texture) + { + if (FAILED(hr = wined3d_texture_create(wined3d_device, wined3d_desc, + layers, levels, WINED3D_TEXTURE_CREATE_GET_DC_LENIENT, NULL, + NULL, &ddraw_null_wined3d_parent_ops, wined3d_texture))) + { + parent = wined3d_texture_get_sub_resource_parent(draw_texture, 0); + if (texture->version == 7) + IDirectDrawSurface7_Release(&parent->IDirectDrawSurface7_iface); + else if (texture->version == 4) + IDirectDrawSurface4_Release(&parent->IDirectDrawSurface4_iface); + else + IDirectDrawSurface_Release(&parent->IDirectDrawSurface_iface); + return hr; + } + + wined3d_resource_set_parent(wined3d_texture_get_resource(*wined3d_texture), texture); + for (i = 0; i < layers * levels; ++i) + { + parent = wined3d_texture_get_sub_resource_parent(draw_texture, i); + assert(parent->wined3d_texture == draw_texture); + parent->draw_texture = draw_texture; + parent->wined3d_texture = *wined3d_texture; + wined3d_texture_set_sub_resource_parent(*wined3d_texture, i, parent); + wined3d_texture_incref(*wined3d_texture); + } } - wined3d_resource_set_parent(wined3d_texture_get_resource(*wined3d_texture), texture); - for (i = 0; i < layers * levels; ++i) + else { - parent = wined3d_texture_get_sub_resource_parent(draw_texture, i); - assert(parent->wined3d_texture == draw_texture); - parent->draw_texture = draw_texture; - parent->wined3d_texture = *wined3d_texture; - wined3d_texture_set_sub_resource_parent(*wined3d_texture, i, parent); - wined3d_texture_incref(*wined3d_texture); + if (FAILED(hr = wined3d_texture_create(wined3d_device, wined3d_desc, + layers, levels, WINED3D_TEXTURE_CREATE_GET_DC_LENIENT, NULL, + texture, &ddraw_texture_wined3d_parent_ops, wined3d_texture))) + return hr; } + wined3d_texture_decref(*wined3d_texture); + TRACE("Surface %p, created draw_texture %p, wined3d_texture %p.\n", - wined3d_texture_get_sub_resource_parent(draw_texture, 0), draw_texture, wined3d_texture); + wined3d_texture_get_sub_resource_parent(*wined3d_texture, 0), draw_texture, *wined3d_texture); return D3D_OK; - -no_draw_texture: - if (SUCCEEDED(hr = wined3d_texture_create(wined3d_device, wined3d_desc, layers, levels, - WINED3D_TEXTURE_CREATE_GET_DC_LENIENT, NULL, texture, &ddraw_texture_wined3d_parent_ops, - wined3d_texture))) - wined3d_texture_decref(*wined3d_texture); - return hr; } HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_desc, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2316
From: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ddraw/surface.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e963d337ca3..0a6381c184c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6017,6 +6017,7 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, struct wined3d_texture *draw_texture = NULL; struct ddraw_surface *parent; unsigned int bind_flags; + unsigned int pitch = 0; unsigned int i; HRESULT hr; @@ -6041,6 +6042,8 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, WARN("Invalid pitch %lu specified.\n", desc->u1.lPitch); return DDERR_INVALIDPARAMS; } + + pitch = desc->u1.lPitch; } } @@ -6112,6 +6115,14 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, return hr; } + if ((desc->dwFlags & DDSD_LPSURFACE) && FAILED(hr = wined3d_texture_update_desc(*wined3d_texture, 0, + wined3d_desc->width, wined3d_desc->height, wined3d_desc->format, + WINED3D_MULTISAMPLE_NONE, 0, desc->lpSurface, pitch))) + { + ERR("Failed to set surface memory, hr %#lx.\n", hr); + return hr; + } + wined3d_texture_decref(*wined3d_texture); TRACE("Surface %p, created draw_texture %p, wined3d_texture %p.\n", @@ -6132,7 +6143,6 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ struct ddraw_texture *texture; BOOL sysmem_fallback = FALSE; unsigned int layers = 1; - unsigned int pitch = 0; BOOL reserve_memory; UINT levels, i, j; HRESULT hr; @@ -6579,8 +6589,6 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ heap_free(texture); return DDERR_INVALIDPARAMS; } - - pitch = desc->u1.lPitch; } } @@ -6706,14 +6714,6 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ } } - if ((desc->dwFlags & DDSD_LPSURFACE) && FAILED(hr = wined3d_texture_update_desc(wined3d_texture, 0, - wined3d_desc.width, wined3d_desc.height, wined3d_desc.format, - WINED3D_MULTISAMPLE_NONE, 0, desc->lpSurface, pitch))) - { - ERR("Failed to set surface memory, hr %#lx.\n", hr); - goto fail; - } - reserve_memory = !(desc->dwFlags & DDSD_LPSURFACE) && desc->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY && wined3d_display_mode_format.u1.dwRGBBitCount <= 16; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2316
From: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ddraw/surface.c | 165 ++++++++++++++++++++++--------------------- 1 file changed, 85 insertions(+), 80 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0a6381c184c..c6d39b5c2dc 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5995,6 +5995,65 @@ static HRESULT ddraw_surface_reserve_memory(struct wined3d_texture *wined3d_text return hr; } +static void wined3d_resource_desc_from_ddraw(struct ddraw *ddraw, + struct wined3d_resource_desc *wined3d_desc, const DDSURFACEDESC2 *desc) +{ + const DWORD caps = desc->ddsCaps.dwCaps; + const DWORD caps2 = desc->ddsCaps.dwCaps2; + + wined3d_desc->resource_type = WINED3D_RTYPE_TEXTURE_2D; + wined3d_desc->format = wined3dformat_from_ddrawformat(&desc->u4.ddpfPixelFormat); + wined3d_desc->multisample_type = WINED3D_MULTISAMPLE_NONE; + wined3d_desc->multisample_quality = 0; + wined3d_desc->usage = 0; + wined3d_desc->bind_flags = 0; + wined3d_desc->access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + wined3d_desc->width = desc->dwWidth; + wined3d_desc->height = desc->dwHeight; + wined3d_desc->depth = 1; + wined3d_desc->size = 0; + + if ((caps & DDSCAPS_SYSTEMMEMORY) && !(caps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE))) + { + wined3d_desc->access = WINED3D_RESOURCE_ACCESS_CPU + | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + } + else + { + if (!(ddraw->flags & DDRAW_NO3D)) + { + if (caps & DDSCAPS_TEXTURE) + wined3d_desc->bind_flags |= WINED3D_BIND_SHADER_RESOURCE; + if (caps & DDSCAPS_ZBUFFER) + wined3d_desc->bind_flags |= WINED3D_BIND_DEPTH_STENCIL; + else if (caps & DDSCAPS_3DDEVICE) + wined3d_desc->bind_flags |= WINED3D_BIND_RENDER_TARGET; + } + + if (caps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) + { + wined3d_desc->bind_flags &= ~WINED3D_BIND_RENDER_TARGET; + wined3d_desc->access |= WINED3D_RESOURCE_ACCESS_GPU; + wined3d_desc->usage |= WINED3DUSAGE_MANAGED; + } + else if (caps & DDSCAPS_VIDEOMEMORY) + { + /* Dynamic resources can't be written by the GPU. */ + if (!(wined3d_desc->bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL))) + wined3d_desc->usage |= WINED3DUSAGE_DYNAMIC; + } + } + + if (caps & DDSCAPS_OVERLAY) + wined3d_desc->usage |= WINED3DUSAGE_OVERLAY; + + if (caps & DDSCAPS_OWNDC) + wined3d_desc->usage |= WINED3DUSAGE_OWNDC; + + if (caps2 & DDSCAPS2_CUBEMAP) + wined3d_desc->usage |= WINED3DUSAGE_LEGACY_CUBEMAP; +} + static bool need_draw_texture(unsigned int draw_bind_flags, const struct wined3d_resource_desc *desc) { if (!draw_bind_flags) @@ -6008,19 +6067,27 @@ static bool need_draw_texture(unsigned int draw_bind_flags, const struct wined3d return true; } -static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, - const struct wined3d_resource_desc *wined3d_desc, unsigned int layers, unsigned int levels, - struct ddraw_texture *texture, struct wined3d_texture **wined3d_texture) +static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, unsigned int layers, + unsigned int levels, struct ddraw_texture *texture, struct wined3d_texture **wined3d_texture) { struct wined3d_device *wined3d_device = ddraw->wined3d_device; const DDSURFACEDESC2 *desc = &texture->surface_desc; struct wined3d_texture *draw_texture = NULL; + struct wined3d_resource_desc wined3d_desc; struct ddraw_surface *parent; unsigned int bind_flags; unsigned int pitch = 0; unsigned int i; HRESULT hr; + wined3d_resource_desc_from_ddraw(ddraw, &wined3d_desc, desc); + + if (wined3d_desc.format == WINED3DFMT_UNKNOWN) + { + WARN("Unsupported / unknown pixelformat.\n"); + return DDERR_INVALIDPIXELFORMAT; + } + /* Validate the pitch. */ if (desc->dwFlags & DDSD_LPSURFACE) { @@ -6028,7 +6095,7 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, { if ((desc->dwFlags & DDSD_LINEARSIZE) && desc->u1.dwLinearSize < wined3d_calculate_format_pitch(ddraw->wined3d_adapter, - wined3d_desc->format, wined3d_desc->width) * ((wined3d_desc->height + 3) / 4)) + wined3d_desc.format, wined3d_desc.width) * ((wined3d_desc.height + 3) / 4)) { WARN("Invalid linear size %lu specified.\n", desc->u1.dwLinearSize); return DDERR_INVALIDPARAMS; @@ -6037,7 +6104,7 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, else { if (desc->u1.lPitch < wined3d_calculate_format_pitch(ddraw->wined3d_adapter, - wined3d_desc->format, wined3d_desc->width) || desc->u1.lPitch & 3) + wined3d_desc.format, wined3d_desc.width) || desc->u1.lPitch & 3) { WARN("Invalid pitch %lu specified.\n", desc->u1.lPitch); return DDERR_INVALIDPARAMS; @@ -6057,11 +6124,11 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) bind_flags |= WINED3D_BIND_RENDER_TARGET; - if (need_draw_texture(bind_flags, wined3d_desc)) + if (need_draw_texture(bind_flags, &wined3d_desc)) { struct wined3d_resource_desc draw_texture_desc; - draw_texture_desc = *wined3d_desc; + draw_texture_desc = wined3d_desc; draw_texture_desc.bind_flags = bind_flags; draw_texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; draw_texture_desc.usage = WINED3DUSAGE_PRIVATE; @@ -6082,7 +6149,7 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, if (draw_texture) { - if (FAILED(hr = wined3d_texture_create(wined3d_device, wined3d_desc, + if (FAILED(hr = wined3d_texture_create(wined3d_device, &wined3d_desc, layers, levels, WINED3D_TEXTURE_CREATE_GET_DC_LENIENT, NULL, NULL, &ddraw_null_wined3d_parent_ops, wined3d_texture))) { @@ -6109,14 +6176,14 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, } else { - if (FAILED(hr = wined3d_texture_create(wined3d_device, wined3d_desc, + if (FAILED(hr = wined3d_texture_create(wined3d_device, &wined3d_desc, layers, levels, WINED3D_TEXTURE_CREATE_GET_DC_LENIENT, NULL, texture, &ddraw_texture_wined3d_parent_ops, wined3d_texture))) return hr; } if ((desc->dwFlags & DDSD_LPSURFACE) && FAILED(hr = wined3d_texture_update_desc(*wined3d_texture, 0, - wined3d_desc->width, wined3d_desc->height, wined3d_desc->format, + wined3d_desc.width, wined3d_desc.height, wined3d_desc.format, WINED3D_MULTISAMPLE_NONE, 0, desc->lpSurface, pitch))) { ERR("Failed to set surface memory, hr %#lx.\n", hr); @@ -6135,7 +6202,6 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ { struct wined3d_sub_resource_desc wined3d_mip_desc; struct ddraw_surface *root, *mip, **attach; - struct wined3d_resource_desc wined3d_desc; DDPIXELFORMAT wined3d_display_mode_format; struct wined3d_texture *wined3d_texture; struct wined3d_display_mode mode; @@ -6333,15 +6399,6 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ desc->u4.ddpfPixelFormat = wined3d_display_mode_format; } - wined3d_desc.resource_type = WINED3D_RTYPE_TEXTURE_2D; - wined3d_desc.format = wined3dformat_from_ddrawformat(&desc->u4.ddpfPixelFormat); - if (wined3d_desc.format == WINED3DFMT_UNKNOWN) - { - WARN("Unsupported / unknown pixelformat.\n"); - heap_free(texture); - return DDERR_INVALIDPIXELFORMAT; - } - /* No width or no height? Use the screen size. */ if (!(desc->dwFlags & DDSD_WIDTH) || !(desc->dwFlags & DDSD_HEIGHT)) { @@ -6402,16 +6459,6 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ } } - wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; - wined3d_desc.multisample_quality = 0; - wined3d_desc.usage = 0; - wined3d_desc.bind_flags = 0; - wined3d_desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; - wined3d_desc.width = desc->dwWidth; - wined3d_desc.height = desc->dwHeight; - wined3d_desc.depth = 1; - wined3d_desc.size = 0; - if ((desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) && (ddraw->flags & DDRAW_NO3D)) { WARN("The application requests a 3D capable surface, but the ddraw object was created without 3D support.\n"); @@ -6479,7 +6526,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ if (!(ddraw->flags & DDRAW_NO3D) && SUCCEEDED(hr = wined3d_check_device_format(ddraw->wined3d, ddraw->wined3d_adapter, WINED3D_DEVICE_TYPE_HAL, mode.format_id, - usage, bind_flags, WINED3D_RTYPE_TEXTURE_2D, wined3d_desc.format))) + usage, bind_flags, WINED3D_RTYPE_TEXTURE_2D, wined3dformat_from_ddrawformat(&desc->u4.ddpfPixelFormat)))) { desc->ddsCaps.dwCaps |= DDSCAPS_VIDEOMEMORY; } @@ -6505,46 +6552,15 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_NOOVERLAYHW; } - if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) - { - wined3d_desc.access = WINED3D_RESOURCE_ACCESS_CPU - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; - } - else - { - if (!(ddraw->flags & DDRAW_NO3D)) - { - if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) - wined3d_desc.bind_flags |= WINED3D_BIND_SHADER_RESOURCE; - if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) - wined3d_desc.bind_flags |= WINED3D_BIND_DEPTH_STENCIL; - else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) - wined3d_desc.bind_flags |= WINED3D_BIND_RENDER_TARGET; - } + if (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) + desc->ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; - if (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) - { - wined3d_desc.bind_flags &= ~WINED3D_BIND_RENDER_TARGET; - wined3d_desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; - /* Managed textures have the system memory flag set. */ - desc->ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; - wined3d_desc.usage |= WINED3DUSAGE_MANAGED; - } - else if (desc->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) - { - /* Videomemory adds localvidmem. This is mutually exclusive with - * systemmemory and texturemanage. */ - desc->ddsCaps.dwCaps |= DDSCAPS_LOCALVIDMEM; - /* Dynamic resources can't be written by the GPU. */ - if (!(wined3d_desc.bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL))) - wined3d_desc.usage |= WINED3DUSAGE_DYNAMIC; - } - } + if (desc->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) + desc->ddsCaps.dwCaps |= DDSCAPS_LOCALVIDMEM; if (desc->dwFlags & DDSD_LPSURFACE) { - if (wined3d_desc.access & WINED3D_RESOURCE_ACCESS_GPU) + if (!(desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY)) { WARN("User memory surfaces should not be GPU accessible.\n"); heap_free(texture); @@ -6613,20 +6629,10 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_NODIRECTDRAWHW; } - if (desc->ddsCaps.dwCaps & (DDSCAPS_OVERLAY)) - wined3d_desc.usage |= WINED3DUSAGE_OVERLAY; - - if (desc->ddsCaps.dwCaps & DDSCAPS_OWNDC) - wined3d_desc.usage |= WINED3DUSAGE_OWNDC; - if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) - { - wined3d_desc.usage |= WINED3DUSAGE_LEGACY_CUBEMAP; layers = 6; - } - if (FAILED(hr = ddraw_surface_create_wined3d_texture(ddraw, &wined3d_desc, layers, levels, - texture, &wined3d_texture))) + if (FAILED(hr = ddraw_surface_create_wined3d_texture(ddraw, layers, levels, texture, &wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#lx.\n", hr); heap_free(texture); @@ -6751,8 +6757,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ desc->ddsCaps.dwCaps |= DDSCAPS_BACKBUFFER; desc->u5.dwBackBufferCount = 0; - if (FAILED(hr = ddraw_surface_create_wined3d_texture(ddraw, &wined3d_desc, 1, 1, - texture, &wined3d_texture))) + if (FAILED(hr = ddraw_surface_create_wined3d_texture(ddraw, 1, 1, texture, &wined3d_texture))) { heap_free(texture); hr = hr_ddraw_from_wined3d(hr); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2316
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=130202 Your paranoid android. === debian11 (32 bit report) === ddraw: dsurface.c:2397: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT1, pool D3DPOOL_MANAGED dsurface.c:2409: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT1, pool D3DPOOL_MANAGED dsurface.c:2424: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT1, pool D3DPOOL_MANAGED dsurface.c:2436: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT1, pool D3DPOOL_MANAGED dsurface.c:2397: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT2, pool D3DPOOL_MANAGED dsurface.c:2409: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT2, pool D3DPOOL_MANAGED dsurface.c:2424: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT2, pool D3DPOOL_MANAGED dsurface.c:2436: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT2, pool D3DPOOL_MANAGED dsurface.c:2397: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT3, pool D3DPOOL_MANAGED dsurface.c:2409: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT3, pool D3DPOOL_MANAGED dsurface.c:2424: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT3, pool D3DPOOL_MANAGED dsurface.c:2436: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT3, pool D3DPOOL_MANAGED dsurface.c:2397: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT4, pool D3DPOOL_MANAGED dsurface.c:2409: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT4, pool D3DPOOL_MANAGED dsurface.c:2424: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT4, pool D3DPOOL_MANAGED dsurface.c:2436: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT4, pool D3DPOOL_MANAGED dsurface.c:2397: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT5, pool D3DPOOL_MANAGED dsurface.c:2409: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT5, pool D3DPOOL_MANAGED dsurface.c:2424: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT5, pool D3DPOOL_MANAGED dsurface.c:2436: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT5, pool D3DPOOL_MANAGED === debian11 (32 bit zh:CN report) === ddraw: dsurface.c:2397: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT1, pool D3DPOOL_MANAGED dsurface.c:2409: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT1, pool D3DPOOL_MANAGED dsurface.c:2424: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT1, pool D3DPOOL_MANAGED dsurface.c:2436: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT1, pool D3DPOOL_MANAGED dsurface.c:2397: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT2, pool D3DPOOL_MANAGED dsurface.c:2409: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT2, pool D3DPOOL_MANAGED dsurface.c:2424: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT2, pool D3DPOOL_MANAGED dsurface.c:2436: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT2, pool D3DPOOL_MANAGED dsurface.c:2397: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT3, pool D3DPOOL_MANAGED dsurface.c:2409: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT3, pool D3DPOOL_MANAGED dsurface.c:2424: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT3, pool D3DPOOL_MANAGED dsurface.c:2436: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT3, pool D3DPOOL_MANAGED dsurface.c:2397: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT4, pool D3DPOOL_MANAGED dsurface.c:2409: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT4, pool D3DPOOL_MANAGED dsurface.c:2424: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT4, pool D3DPOOL_MANAGED dsurface.c:2436: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT4, pool D3DPOOL_MANAGED dsurface.c:2397: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT5, pool D3DPOOL_MANAGED dsurface.c:2409: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT5, pool D3DPOOL_MANAGED dsurface.c:2424: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT5, pool D3DPOOL_MANAGED dsurface.c:2436: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT5, pool D3DPOOL_MANAGED === debian11b (64 bit WoW report) === ddraw: dsurface.c:2397: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT1, pool D3DPOOL_MANAGED dsurface.c:2409: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT1, pool D3DPOOL_MANAGED dsurface.c:2424: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT1, pool D3DPOOL_MANAGED dsurface.c:2436: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT1, pool D3DPOOL_MANAGED dsurface.c:2397: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT2, pool D3DPOOL_MANAGED dsurface.c:2409: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT2, pool D3DPOOL_MANAGED dsurface.c:2424: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT2, pool D3DPOOL_MANAGED dsurface.c:2436: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT2, pool D3DPOOL_MANAGED dsurface.c:2397: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT3, pool D3DPOOL_MANAGED dsurface.c:2409: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT3, pool D3DPOOL_MANAGED dsurface.c:2424: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT3, pool D3DPOOL_MANAGED dsurface.c:2436: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT3, pool D3DPOOL_MANAGED dsurface.c:2397: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT4, pool D3DPOOL_MANAGED dsurface.c:2409: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT4, pool D3DPOOL_MANAGED dsurface.c:2424: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT4, pool D3DPOOL_MANAGED dsurface.c:2436: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT4, pool D3DPOOL_MANAGED dsurface.c:2397: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT5, pool D3DPOOL_MANAGED dsurface.c:2409: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT5, pool D3DPOOL_MANAGED dsurface.c:2424: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT5, pool D3DPOOL_MANAGED dsurface.c:2436: Test failed: Partial block lock failed, expected success, format D3DFMT_DXT5, pool D3DPOOL_MANAGED
The dsurface failures seem legit & caused by the last patch..? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2316#note_26107
participants (4)
-
Jan Sikorski (＠jsikorski) -
Marvin -
Zebediah Figura
-
Zebediah Figura (＠zfigura)