[PATCH 0/4] MR483: d3d8, d3d9: Fix sysmem index buffer upload.

[PATCH 1/4] d3d9: Correctly check for sysmem index buffers in d3d9_stateblock_Apply().

[Zebediah Figura]

From: Zebediah Figura

This fixes a regression introduced by 66f37aae7e25740857aeb8ea9c2f0395781389f5.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53372
---
 dlls/d3d9/stateblock.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c
index c797ce54b49..2a0731437e3 100644
--- a/dlls/d3d9/stateblock.c
+++ b/dlls/d3d9/stateblock.c
@@ -113,9 +113,10 @@ static HRESULT WINAPI d3d9_stateblock_Capture(IDirect3DStateBlock9 *iface)
 static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface)
 {
     struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface);
+    struct d3d9_vertexbuffer *vertex_buffer;
     struct wined3d_texture *wined3d_texture;
+    struct d3d9_indexbuffer *index_buffer;
     struct wined3d_buffer *wined3d_buffer;
-    struct d3d9_vertexbuffer *buffer;
     struct d3d9_texture *texture;
     struct d3d9_device *device;
     unsigned int i;
@@ -136,13 +137,13 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface)
     {
         if (!(wined3d_buffer = device->stateblock_state->streams[i].buffer))
             continue;
-        if (!(buffer = wined3d_buffer_get_parent(wined3d_buffer)))
+        if (!(vertex_buffer = wined3d_buffer_get_parent(wined3d_buffer)))
             continue;
-        if (buffer->draw_buffer)
+        if (vertex_buffer->draw_buffer)
             device->sysmem_vb |= 1u << i;
     }
     device->sysmem_ib = (wined3d_buffer = device->stateblock_state->index_buffer)
-            && (buffer = wined3d_buffer_get_parent(wined3d_buffer)) && buffer->draw_buffer;
+            && (index_buffer = wined3d_buffer_get_parent(wined3d_buffer)) && index_buffer->sysmem;
     device->auto_mipmaps = 0;
     for (i = 0; i < D3D9_MAX_TEXTURE_UNITS; ++i)
     {

[PATCH 2/4] d3d9: Do not release the wined3d mutex in d3d9_device_upload_sysmem_index_buffer().

[Zebediah Figura]

From: Zebediah Figura

Spotted by Henri Verbeet.

This fixes a regression introduced by 66f37aae7e25740857aeb8ea9c2f0395781389f5.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53372
---
 dlls/d3d9/device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 9f071d7a8d2..894659e9ff9 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -2993,7 +2993,7 @@ static HRESULT d3d9_device_upload_sysmem_index_buffer(struct d3d9_device *device
     wined3d_box_set(&box, src_offset, 0, buffer_size, 1, 0, 1);
     if (FAILED(hr = wined3d_resource_map(index_buffer, 0, &map_desc, &box, WINED3D_MAP_READ)))
     {
-        wined3d_mutex_unlock();
+        ERR("Failed to map index buffer, hr %#x.\n", hr);
         return hr;
     }
     wined3d_streaming_buffer_upload(device->wined3d_device, &device->index_buffer,

[PATCH 3/4] d3d8: Correctly check for sysmem index buffers in d3d8_device_ApplyStateBlock().

[Zebediah Figura]

From: Zebediah Figura

This fixes a regression introduced by fc0f0090f6ba24cc68d2b04503977fbcebc1f96d.
---
 dlls/d3d8/device.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 068f53d8fdf..d6a5349367b 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -2032,9 +2032,10 @@ static HRESULT WINAPI d3d8_device_ApplyStateBlock(IDirect3DDevice8 *iface, DWORD
 {
     struct d3d8_device *device = impl_from_IDirect3DDevice8(iface);
     const struct wined3d_stateblock_state *state;
+    struct d3d8_vertexbuffer *vertex_buffer;
     struct wined3d_stateblock *stateblock;
+    struct d3d8_indexbuffer *index_buffer;
     struct wined3d_buffer *wined3d_buffer;
-    struct d3d8_vertexbuffer *buffer;
     unsigned int i;

TRACE("iface %p, token %#x.\n", iface, token);
@@ -2062,13 +2063,13 @@ static HRESULT WINAPI d3d8_device_ApplyStateBlock(IDirect3DDevice8 *iface, DWORD
     for (i = 0; i < D3D8_MAX_STREAMS; ++i)
     {
         wined3d_buffer = state->streams[i].buffer;
-        if (!wined3d_buffer || !(buffer = wined3d_buffer_get_parent(wined3d_buffer)))
+        if (!wined3d_buffer || !(vertex_buffer = wined3d_buffer_get_parent(wined3d_buffer)))
             continue;
-        if (buffer->draw_buffer)
+        if (vertex_buffer->draw_buffer)
             device->sysmem_vb |= 1u << i;
     }
     device->sysmem_ib = (wined3d_buffer = state->index_buffer)
-            && (buffer = wined3d_buffer_get_parent(wined3d_buffer)) && buffer->draw_buffer;
+            && (index_buffer = wined3d_buffer_get_parent(wined3d_buffer)) && index_buffer->sysmem;
     wined3d_mutex_unlock();

return D3D_OK;

[PATCH 4/4] d3d8: Do not release the wined3d mutex in d3d8_device_upload_sysmem_index_buffer().

[Zebediah Figura]

From: Zebediah Figura

Spotted by Henri Verbeet.

This fixes a regression introduced by fc0f0090f6ba24cc68d2b04503977fbcebc1f96d.
---
 dlls/d3d8/device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index d6a5349367b..b8193a83cbc 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -2477,7 +2477,7 @@ static HRESULT d3d8_device_upload_sysmem_index_buffer(struct d3d8_device *device
     wined3d_box_set(&box, src_offset, 0, buffer_size, 1, 0, 1);
     if (FAILED(hr = wined3d_resource_map(index_buffer, 0, &map_desc, &box, WINED3D_MAP_READ)))
     {
-        wined3d_mutex_unlock();
+        ERR("Failed to map index buffer, hr %#x.\n", hr);
         return hr;
     }
     wined3d_streaming_buffer_upload(device->wined3d_device, &device->index_buffer,

[PATCH 0/4] MR483: d3d8, d3d9: Fix sysmem index buffer upload. - approved

[Jan Sikorski (＠jsikorski)]

This merge request was approved by Jan Sikorski.