system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 08:20:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

ddraw: Do not return a wined3d_texture from ddraw_surface_create_wined3d_texture().

Browse source
This commit is contained in:
Zebediah Figura 2022-12-24 22:12:24 -06:00 committed by Alexandre Julliard
parent 0ff2f3a856
commit d4072dc870
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
dlls/ddraw/surface.c
View file

@ -6051,12 +6051,13 @@ static bool need_draw_texture(unsigned int draw_bind_flags, const struct wined3d
static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw,
unsigned int layers, unsigned int levels, struct ddraw_texture *texture, unsigned int layers, unsigned int levels, struct ddraw_texture *texture,
bool sysmem_fallback, bool reserve_memory, struct wined3d_texture **wined3d_texture) bool sysmem_fallback, bool reserve_memory)
{ {
struct wined3d_device *wined3d_device = ddraw->wined3d_device; struct wined3d_device *wined3d_device = ddraw->wined3d_device;
const DDSURFACEDESC2 *desc = &texture->surface_desc; const DDSURFACEDESC2 *desc = &texture->surface_desc;
struct wined3d_texture *draw_texture = NULL; struct wined3d_texture *draw_texture = NULL;
struct wined3d_resource_desc wined3d_desc; struct wined3d_resource_desc wined3d_desc;
struct wined3d_texture *wined3d_texture;
struct ddraw_surface *parent, *root; struct ddraw_surface *parent, *root;
unsigned int bind_flags; unsigned int bind_flags;
unsigned int pitch = 0; unsigned int pitch = 0;
@ -6134,29 +6135,29 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw,
{ {
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, layers, levels, WINED3D_TEXTURE_CREATE_GET_DC_LENIENT, NULL,
NULL, &ddraw_null_wined3d_parent_ops, wined3d_texture))) NULL, &ddraw_null_wined3d_parent_ops, &wined3d_texture)))
goto fail; goto fail;
wined3d_resource_set_parent(wined3d_texture_get_resource(*wined3d_texture), texture); wined3d_resource_set_parent(wined3d_texture_get_resource(wined3d_texture), texture);
for (i = 0; i < layers * levels; ++i) for (i = 0; i < layers * levels; ++i)
{ {
parent = wined3d_texture_get_sub_resource_parent(draw_texture, i); parent = wined3d_texture_get_sub_resource_parent(draw_texture, i);
assert(parent->wined3d_texture == draw_texture); assert(parent->wined3d_texture == draw_texture);
parent->draw_texture = draw_texture; parent->draw_texture = draw_texture;
parent->wined3d_texture = *wined3d_texture; parent->wined3d_texture = wined3d_texture;
wined3d_texture_set_sub_resource_parent(*wined3d_texture, i, parent); wined3d_texture_set_sub_resource_parent(wined3d_texture, i, parent);
wined3d_texture_incref(*wined3d_texture); wined3d_texture_incref(wined3d_texture);
} }
} }
else 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, layers, levels, WINED3D_TEXTURE_CREATE_GET_DC_LENIENT, NULL,
texture, &ddraw_texture_wined3d_parent_ops, wined3d_texture))) texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture)))
return hr; return hr;
} }
if ((desc->dwFlags & DDSD_LPSURFACE) && FAILED(hr = wined3d_texture_update_desc(*wined3d_texture, 0, 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))) WINED3D_MULTISAMPLE_NONE, 0, desc->lpSurface, pitch)))
{ {
@ -6164,7 +6165,7 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw,
goto fail; goto fail;
} }
root = wined3d_texture_get_sub_resource_parent(*wined3d_texture, 0); root = wined3d_texture_get_sub_resource_parent(wined3d_texture, 0);
texture->root = root; texture->root = root;
for (i = 0; i < layers; ++i) for (i = 0; i < layers; ++i)
@ -6179,14 +6180,14 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw,
struct ddraw_surface *mip; struct ddraw_surface *mip;
DDSURFACEDESC2 *mip_desc; DDSURFACEDESC2 *mip_desc;
mip = wined3d_texture_get_sub_resource_parent(*wined3d_texture, sub_resource_idx); mip = wined3d_texture_get_sub_resource_parent(wined3d_texture, sub_resource_idx);
mip->sysmem_fallback = sysmem_fallback; mip->sysmem_fallback = sysmem_fallback;
mip_desc = &mip->surface_desc; mip_desc = &mip->surface_desc;
*mip_desc = *desc; *mip_desc = *desc;
wined3d_texture_get_pitch(*wined3d_texture, j, &row_pitch, &slice_pitch); wined3d_texture_get_pitch(wined3d_texture, j, &row_pitch, &slice_pitch);
if (format_is_compressed(&desc->u4.ddpfPixelFormat)) if (format_is_compressed(&desc->u4.ddpfPixelFormat))
{ {
if (desc->dwFlags & DDSD_LPSURFACE) if (desc->dwFlags & DDSD_LPSURFACE)
@ -6212,7 +6213,7 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw,
if (j) if (j)
{ {
wined3d_texture_get_sub_resource_desc(*wined3d_texture, sub_resource_idx, &wined3d_mip_desc); wined3d_texture_get_sub_resource_desc(wined3d_texture, sub_resource_idx, &wined3d_mip_desc);
mip_desc->dwWidth = wined3d_mip_desc.width; mip_desc->dwWidth = wined3d_mip_desc.width;
mip_desc->dwHeight = wined3d_mip_desc.height; mip_desc->dwHeight = wined3d_mip_desc.height;
@ -6274,15 +6275,15 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw,
ddraw_surface_set_wined3d_textures_colour_key(root, DDCKEY_SRCBLT, ddraw_surface_set_wined3d_textures_colour_key(root, DDCKEY_SRCBLT,
(struct wined3d_color_key *)&desc->ddckCKSrcBlt); (struct wined3d_color_key *)&desc->ddckCKSrcBlt);
wined3d_texture_decref(*wined3d_texture); wined3d_texture_decref(wined3d_texture);
if (reserve_memory && FAILED(hr = ddraw_surface_reserve_memory(*wined3d_texture, 1))) if (reserve_memory && FAILED(hr = ddraw_surface_reserve_memory(wined3d_texture, 1)))
{ {
hr = hr_ddraw_from_wined3d(hr); hr = hr_ddraw_from_wined3d(hr);
goto fail; goto fail;
} }
TRACE("Surface %p, created draw_texture %p, wined3d_texture %p.\n", root, draw_texture, *wined3d_texture); TRACE("Surface %p, created draw_texture %p, wined3d_texture %p.\n", root, draw_texture, wined3d_texture);
return D3D_OK; return D3D_OK;
fail: fail:
@ -6300,7 +6301,6 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
struct ddraw_surface **surface, IUnknown *outer_unknown, unsigned int version) struct ddraw_surface **surface, IUnknown *outer_unknown, unsigned int version)
{ {
DDPIXELFORMAT wined3d_display_mode_format; DDPIXELFORMAT wined3d_display_mode_format;
struct wined3d_texture *wined3d_texture;
struct ddraw_surface *root, **attach; struct ddraw_surface *root, **attach;
struct wined3d_display_mode mode; struct wined3d_display_mode mode;
struct ddraw_texture *texture; struct ddraw_texture *texture;
@ -6735,7 +6735,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
&& wined3d_display_mode_format.u1.dwRGBBitCount <= 16; && wined3d_display_mode_format.u1.dwRGBBitCount <= 16;
if (FAILED(hr = ddraw_surface_create_wined3d_texture(ddraw, layers, levels, if (FAILED(hr = ddraw_surface_create_wined3d_texture(ddraw, layers, levels,
texture, sysmem_fallback, reserve_memory, &wined3d_texture))) texture, sysmem_fallback, reserve_memory)))
{ {
WARN("Failed to create wined3d texture, hr %#lx.\n", hr); WARN("Failed to create wined3d texture, hr %#lx.\n", hr);
heap_free(texture); heap_free(texture);
@ -6773,7 +6773,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
desc->u5.dwBackBufferCount = 0; desc->u5.dwBackBufferCount = 0;
if (FAILED(hr = ddraw_surface_create_wined3d_texture(ddraw, 1, 1, if (FAILED(hr = ddraw_surface_create_wined3d_texture(ddraw, 1, 1,
texture, sysmem_fallback, reserve_memory, &wined3d_texture))) texture, sysmem_fallback, reserve_memory)))
{ {
heap_free(texture); heap_free(texture);
hr = hr_ddraw_from_wined3d(hr); hr = hr_ddraw_from_wined3d(hr);