[PATCH 0/3] MR2405: ddraw: SetSurfaceDesc() and ddraw_surface_create() refactoring, part 4.

[PATCH 1/3] ddraw: Move the rest of the surface desc population to ddraw_surface_create() from device_parent_texture_sub_resource_created().

[Zebediah Figura]

From: Zebediah Figura

Cf. 191db92fd590.

Put all this code in the same place, and possibly move towards getting rid of
the texture_sub_resource_created() callback entirely.
---
 dlls/ddraw/surface.c | 48 +++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index fc713bc9b82..c80083a4eac 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -6175,6 +6175,7 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw,
         {
             struct wined3d_sub_resource_desc wined3d_mip_desc;
             unsigned int sub_resource_idx = i * levels + j;
+            unsigned int row_pitch, slice_pitch;
             struct ddraw_surface *mip;
             DDSURFACEDESC2 *mip_desc;

@@ -6182,6 +6183,30 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw,

mip->sysmem_fallback = sysmem_fallback;
             mip_desc = &mip->surface_desc;
+
+            *mip_desc = *desc;
+
+            wined3d_texture_get_pitch(*wined3d_texture, j, &row_pitch, &slice_pitch);
+            if (format_is_compressed(&desc->u4.ddpfPixelFormat))
+            {
+                if (desc->dwFlags & DDSD_LPSURFACE)
+                    mip_desc->u1.dwLinearSize = ~0u;
+                else
+                    mip_desc->u1.dwLinearSize = slice_pitch;
+                mip_desc->dwFlags |= DDSD_LINEARSIZE;
+                mip_desc->dwFlags &= ~DDSD_PITCH;
+            }
+            else
+            {
+                if (!(desc->dwFlags & DDSD_LPSURFACE))
+                    mip_desc->u1.lPitch = row_pitch;
+                mip_desc->dwFlags |= DDSD_PITCH;
+                mip_desc->dwFlags &= ~DDSD_LINEARSIZE;
+            }
+
+            mip_desc->dwFlags &= ~DDSD_LPSURFACE;
+            mip_desc->lpSurface = NULL;
+
             if (desc->ddsCaps.dwCaps & DDSCAPS_MIPMAP)
                 mip_desc->u2.dwMipMapCount = levels - j;

@@ -6788,8 +6813,6 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw,
         const struct wined3d_parent_ops **parent_ops)
 {
     struct ddraw_texture *texture = wined3d_texture_get_parent(wined3d_texture);
-    unsigned int texture_level, row_pitch, slice_pitch;
-    DDSURFACEDESC2 *desc = &surface->surface_desc;
     unsigned int version = texture->version;

surface->IDirectDrawSurface7_iface.lpVtbl = &ddraw_surface7_vtbl;
@@ -6820,29 +6843,8 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw,
         surface->texture_outer = (IUnknown *)&surface->IDirectDrawSurface_iface;
     }

-    *desc = texture->surface_desc;
     surface->first_attached = surface;

-    texture_level = desc->ddsCaps.dwCaps & DDSCAPS_MIPMAP ? sub_resource_idx % desc->u2.dwMipMapCount : 0;
-    wined3d_texture_get_pitch(wined3d_texture, texture_level, &row_pitch, &slice_pitch);
-    if (format_is_compressed(&desc->u4.ddpfPixelFormat))
-    {
-        if (desc->dwFlags & DDSD_LPSURFACE)
-            desc->u1.dwLinearSize = ~0u;
-        else
-            desc->u1.dwLinearSize = slice_pitch;
-        desc->dwFlags |= DDSD_LINEARSIZE;
-        desc->dwFlags &= ~(DDSD_LPSURFACE | DDSD_PITCH);
-    }
-    else
-    {
-        if (!(desc->dwFlags & DDSD_LPSURFACE))
-            desc->u1.lPitch = row_pitch;
-        desc->dwFlags |= DDSD_PITCH;
-        desc->dwFlags &= ~(DDSD_LPSURFACE | DDSD_LINEARSIZE);
-    }
-    desc->lpSurface = NULL;
-
     wined3d_texture_incref(surface->wined3d_texture = wined3d_texture);
     surface->sub_resource_idx = sub_resource_idx;
     *parent_ops = &ddraw_surface_wined3d_parent_ops;

[PATCH 2/3] ddraw: Do not return a wined3d_texture from ddraw_surface_create_wined3d_texture().

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/ddraw/surface.c | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index c80083a4eac..6dcb1af13db 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -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,
         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;
     const DDSURFACEDESC2 *desc = &texture->surface_desc;
     struct wined3d_texture *draw_texture = NULL;
     struct wined3d_resource_desc wined3d_desc;
+    struct wined3d_texture *wined3d_texture;
     struct ddraw_surface *parent, *root;
     unsigned int bind_flags;
     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,
                 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;

-        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)
         {
             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);
+            parent->wined3d_texture = wined3d_texture;
+            wined3d_texture_set_sub_resource_parent(wined3d_texture, i, parent);
+            wined3d_texture_incref(wined3d_texture);
         }
     }
     else
     {
         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)))
+                texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture)))
             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_MULTISAMPLE_NONE, 0, desc->lpSurface, pitch)))
     {
@@ -6164,7 +6165,7 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw,
         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;

for (i = 0; i < layers; ++i)
@@ -6179,14 +6180,14 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw,
             struct ddraw_surface *mip;
             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_desc = &mip->surface_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 (desc->dwFlags & DDSD_LPSURFACE)
@@ -6212,7 +6213,7 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw,

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->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,
                 (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);
         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;

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)
 {
     DDPIXELFORMAT wined3d_display_mode_format;
-    struct wined3d_texture *wined3d_texture;
     struct ddraw_surface *root, **attach;
     struct wined3d_display_mode mode;
     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;

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);
         heap_free(texture);
@@ -6773,7 +6773,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
             desc->u5.dwBackBufferCount = 0;

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);
                 hr = hr_ddraw_from_wined3d(hr);

[PATCH 3/3] ddraw: Rename ddraw_surface_create_wined3d_texture() to ddraw_texture_init().

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/ddraw/surface.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 6dcb1af13db..4d8812cf106 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -6049,9 +6049,8 @@ 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,
-        unsigned int layers, unsigned int levels, struct ddraw_texture *texture,
-        bool sysmem_fallback, bool reserve_memory)
+static HRESULT ddraw_texture_init(struct ddraw_texture *texture, struct ddraw *ddraw,
+        unsigned int layers, unsigned int levels, bool sysmem_fallback, bool reserve_memory)
 {
     struct wined3d_device *wined3d_device = ddraw->wined3d_device;
     const DDSURFACEDESC2 *desc = &texture->surface_desc;
@@ -6734,8 +6733,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
             && desc->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY
             && wined3d_display_mode_format.u1.dwRGBBitCount <= 16;

-    if (FAILED(hr = ddraw_surface_create_wined3d_texture(ddraw, layers, levels,
-            texture, sysmem_fallback, reserve_memory)))
+    if (FAILED(hr = ddraw_texture_init(texture, ddraw, layers, levels, sysmem_fallback, reserve_memory)))
     {
         WARN("Failed to create wined3d texture, hr %#lx.\n", hr);
         heap_free(texture);
@@ -6772,8 +6770,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, 1, 1,
-                    texture, sysmem_fallback, reserve_memory)))
+            if (FAILED(hr = ddraw_texture_init(texture, ddraw, 1, 1, sysmem_fallback, reserve_memory)))
             {
                 heap_free(texture);
                 hr = hr_ddraw_from_wined3d(hr);

[PATCH 0/3] MR2405: ddraw: SetSurfaceDesc() and ddraw_surface_create() refactoring, part 4. - approved

[Jan Sikorski (＠jsikorski)]

This merge request was approved by Jan Sikorski.