[PATCH v3 0/1] MR5381: ddraw: Don't demand WINED3D_BIND_SHADER_RESOURCE for making surface in vidmem.

[Paul Gofman (＠gofman)]

--
  v3: ddraw: Don't demand WINED3D_BIND_SHADER_RESOURCE for making surface in vidmem.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5381

[PATCH v3 1/1] ddraw: Don't demand WINED3D_BIND_SHADER_RESOURCE for making surface in vidmem.

[Paul Gofman]

From: Paul Gofman <pgofman(a)codeweavers.com>

---
 dlls/ddraw/surface.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index a096c5d7d8e..be15b38fe92 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -6840,11 +6840,19 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
     {
         if (!(desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)))
         {
-            unsigned int bind_flags = WINED3D_BIND_SHADER_RESOURCE;
+            unsigned int bind_flags = 0;
             DWORD usage = 0;
 
             if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP)
+            {
                 usage |= WINED3DUSAGE_LEGACY_CUBEMAP;
+                bind_flags |= WINED3D_BIND_SHADER_RESOURCE;
+            }
+            else if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE)
+            {
+                bind_flags |= WINED3D_BIND_SHADER_RESOURCE;
+            }
+
             if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER)
                 bind_flags |= WINED3D_BIND_DEPTH_STENCIL;
             else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE)
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/5381

[PATCH v3 1/1] ddraw: Don't demand WINED3D_BIND_SHADER_RESOURCE for making surface in vidmem.

[Marvin]

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=144291

Your paranoid android.


=== debian11b (64 bit WoW report) ===

quartz:
vmr7.c:3753: Test succeeded inside todo block: Compression 0x3231564e, depth 12: Got hr 0.
vmr7.c:3753: Test succeeded inside todo block: Compression 0x32315659, depth 12: Got hr 0.
vmr7.c:3753: Test succeeded inside todo block: Compression 0x59565955, depth 16: Got hr 0.
vmr7.c:3753: Test succeeded inside todo block: Compression 0x32595559, depth 16: Got hr 0.

wshom.ocx:
wshom: Timeout

[Zebediah Figura (＠zfigura)]

Can we get a regression test for this, please?

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5381#note_65742