Module: wine Branch: master Commit: 764537c0c10c03e29089d21f6c36c29f0d821676 URL: https://gitlab.winehq.org/wine/wine/-/commit/764537c0c10c03e29089d21f6c36c29...
Author: Zebediah Figura zfigura@codeweavers.com Date: Mon Jul 18 14:51:47 2022 -0500
d3d8: Correctly check for sysmem index buffers in d3d8_device_ApplyStateBlock().
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;