ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Invalidate STATE_STREAMSRC in buffer_unload() if needed. 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2016-08-05 12:39:00 +02:00 committed by Alexandre Julliard
parent 005ed85689
commit 0072830804
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/wined3d/buffer.c
View File

@ -538,6 +538,14 @@ static void buffer_unload(struct wined3d_resource *resource)
buffer->stride = 0; buffer->stride = 0;
buffer->conversion_stride = 0; buffer->conversion_stride = 0;
buffer->flags &= ~WINED3D_BUFFER_HASDESC; buffer->flags &= ~WINED3D_BUFFER_HASDESC;
/* The stream source state handler might have read the memory of the
* vertex buffer already and got the memory in the vbo which is not
* valid any longer. Dirtify the stream source to force a reload. This
* happens only once per changed vertexbuffer and should occur rather
* rarely. */
if (resource->bind_count)
device_invalidate_state(device, STATE_STREAMSRC);
} }
resource_unload(resource); resource_unload(resource);
@ -545,18 +553,8 @@ static void buffer_unload(struct wined3d_resource *resource)
static void wined3d_buffer_drop_bo(struct wined3d_buffer *buffer) static void wined3d_buffer_drop_bo(struct wined3d_buffer *buffer)
{ {
struct wined3d_device *device = buffer->resource.device;
buffer->flags &= ~WINED3D_BUFFER_USE_BO; buffer->flags &= ~WINED3D_BUFFER_USE_BO;
buffer_unload(&buffer->resource); buffer_unload(&buffer->resource);
/* The stream source state handler might have read the memory of
* the vertex buffer already and got the memory in the vbo which
* is not valid any longer. Dirtify the stream source to force a
* reload. This happens only once per changed vertexbuffer and
* should occur rather rarely. */
if (buffer->resource.bind_count)
device_invalidate_state(device, STATE_STREAMSRC);
} }
static void wined3d_buffer_destroy_object(void *object) static void wined3d_buffer_destroy_object(void *object)

3
dlls/wined3d/device.c
View File

@ -4547,9 +4547,6 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device)
resource->resource_ops->resource_unload(resource); resource->resource_ops->resource_unload(resource);
} }
} }
/* Invalidate stream sources, the buffer(s) may have been evicted. */
device_invalidate_state(device, STATE_STREAMSRC);
} }
static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d_swapchain *swapchain) static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d_swapchain *swapchain)