[Bug 46224] New: ddraw-Create-rendering-targets-in-video-memory patch got borked between 3.19 and 3.20

https://bugs.winehq.org/show_bug.cgi?id=46224

Bug ID: 46224
           Summary: ddraw-Create-rendering-targets-in-video-memory patch
                    got borked between 3.19 and 3.20
           Product: Wine-staging
           Version: unspecified
          Hardware: x86
                OS: Linux
            Status: UNCONFIRMED
          Severity: normal
          Priority: P2
         Component: -unknown
          Assignee: [e-mail]
          Reporter: [e-mail]
                CC: [e-mail], [e-mail]
      Distribution: ---

Testing application - The Sims Complete Collection
With 3.19, the game launches just fine, and I get
`0009:fixme:ddraw:ddraw_surface_create Application wants to create rendering
target in system memory, using video memory instead` fixmes in the terminal
output, and the game starts.
In 3.20, the game aborts the launch, and I don't get the fixmes.
I suspect this rebase might have broke it:
https://github.com/wine-staging/wine-staging/commit/a423a7087ff2dad6f2def0cf...

[Bug 46224] ddraw-Create-rendering-targets-in-video-memory patch got borked between 3.19 and 3.20

https://bugs.winehq.org/show_bug.cgi?id=46224

Olivier F. R. Dierick  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |[e-mail]
     Ever confirmed|0                           |1
             Status|UNCONFIRMED                 |NEW
           Keywords|                            |regression
            Version|unspecified                 |3.20

--- Comment #1 from Olivier F. R. Dierick  ---
The issue is that the patchset has been completely removed from wine-staging
starting from 3.20.

Affects bug 40569 and bug 34906.

Confirming and filling fields.

[Bug 46224] ddraw-Create-rendering-targets-in-video-memory patch got borked between 3.19 and 3.20

https://bugs.winehq.org/show_bug.cgi?id=46224

Zebediah Figura  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
    Regression SHA1|                            |e4a3b5fc9d5ed7c102b1618270e
                   |                            |26a1fcac2d53e

--- Comment #2 from Zebediah Figura  ---
(In reply to Olivier F. R. Dierick from comment #1)
> The issue is that the patchset has been completely removed from wine-staging
> starting from 3.20.

Well, "completely removed" implies something a little stronger than "disabled",
but yes. It was probably unclear how to correctly rebase it. We'll try to get
it back in commission; apologies for the inconvenience.

[Bug 46224] ddraw-Create-rendering-targets-in-video-memory patch got borked between 3.19 and 3.20

https://bugs.winehq.org/show_bug.cgi?id=46224

--- Comment #3 from Olivier F. R. Dierick  ---
Created attachment 62937
  --> https://bugs.winehq.org/attachment.cgi?id=62937
Rebased patch wine-staging 3.21

(In reply to Zebediah Figura from comment #2)
> Well, "completely removed" implies something a little stronger than
> "disabled", but yes.

True. I forgot that I use a script to extract the active patchsets from the
staging tree. The disabled ones are still there. Sorry for the confusion.

Attached is my rebased copy of the patch (for staging 3.21).

Based on Michael Müller's previous patch based on Henri Verbeet's.

[Bug 46224] ddraw-Create-rendering-targets-in-video-memory patch got borked between 3.19 and 3.20

https://bugs.winehq.org/show_bug.cgi?id=46224

Olivier F. R. Dierick  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
  Attachment #62937|0                           |1
        is obsolete|                            |

--- Comment #4 from Olivier F. R. Dierick  ---
Created attachment 62938
  --> https://bugs.winehq.org/attachment.cgi?id=62938
Rebased patch wine-staging 3.21 (with credits)

[Bug 46224] ddraw-Create-rendering-targets-in-video-memory patch got borked between 3.19 and 3.20

https://bugs.winehq.org/show_bug.cgi?id=46224

--- Comment #5 from Gijs Vermeulen  ---
Was this fixed by
https://github.com/wine-staging/wine-staging/commit/735aa272dcdf5728ca56d05a...
?

[Bug 46224] ddraw-Create-rendering-targets-in-video-memory patch got borked between 3.19 and 3.20

https://bugs.winehq.org/show_bug.cgi?id=46224

Alistair Leslie-Hughes  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
         Resolution|---                         |FIXED
             Status|NEW                         |RESOLVED

--- Comment #6 from Alistair Leslie-Hughes  ---
Should now be fixed

[Bug 46224] ddraw-Create-rendering-targets-in-video-memory patch got borked between 3.19 and 3.20

https://bugs.winehq.org/show_bug.cgi?id=46224

--- Comment #7 from Matteo Bruni  ---
(In reply to Alistair Leslie-Hughes from comment #6)
> Should now be fixed

The patch currently in staging doesn't look right though:

+            wined3d_desc.usage = wined3d_desc.bind_flags;

[Bug 46224] ddraw-Create-rendering-targets-in-video-memory patch got borked between 3.19 and 3.20

https://bugs.winehq.org/show_bug.cgi?id=46224

Olivier F. R. Dierick  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|RESOLVED                    |REOPENED
         Resolution|FIXED                       |---

--- Comment #8 from Olivier F. R. Dierick  ---
Reopening because the rebased patch is not working.

(In reply to Matteo Bruni from comment #7)
> The patch currently in staging doesn't look right though:
> -
>        wined3d_desc.usage = wined3d_desc.bind_flags;

If I understand the new code correctly, that line should be changed to:
+            wined3d_desc.bind_flags = bind_flags;

[Bug 46224] ddraw-Create-rendering-targets-in-video-memory patch got borked between 3.19 and 3.20

https://bugs.winehq.org/show_bug.cgi?id=46224

--- Comment #9 from Gijs Vermeulen  ---
(In reply to Olivier F. R. Dierick from comment #8)
> Reopening because the rebased patch is not working.
>
> (In reply to Matteo Bruni from comment #7)
> > The patch currently in staging doesn't look right though:
> > -
> >        wined3d_desc.usage = wined3d_desc.bind_flags;
>
> If I understand the new code correctly, that line should be changed to:
> -
>        wined3d_desc.bind_flags = bind_flags;

This was changed in
https://github.com/wine-staging/wine-staging/commit/9256515a1299183711d7c605...

Did that fix it?

[Bug 46224] ddraw-Create-rendering-targets-in-video-memory patch got borked between 3.19 and 3.20

https://bugs.winehq.org/show_bug.cgi?id=46224

Olivier F. R. Dierick  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
         Resolution|---                         |FIXED
             Status|REOPENED                    |RESOLVED

--- Comment #10 from Olivier F. R. Dierick  ---
(In reply to Gijs Vermeulen from comment #9)
> This was changed in
> https://github.com/wine-staging/wine-staging/commit/
> 9256515a1299183711d7c6052d6964454d0a752b
>
> Did that fix it?

Yes, fixed.

[Bug 46224] ddraw-Create-rendering-targets-in-video-memory patch got borked between 3.19 and 3.20

https://bugs.winehq.org/show_bug.cgi?id=46224

Gijs Vermeulen  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
      Fixed by SHA1|                            |9256515a1299183711d7c6052d6
                   |                            |964454d0a752b

[Bug 46224] ddraw-Create-rendering-targets-in-video-memory patch got borked between 3.19 and 3.20

https://bugs.winehq.org/show_bug.cgi?id=46224

Alistair Leslie-Hughes  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|RESOLVED                    |CLOSED

--- Comment #11 from Alistair Leslie-Hughes  ---
Closing Fixed Staging bugs.