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

wined3d: Replace wined3d_buffer_load_sysmem() calls with wined3d_buffer_load_location(). 

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2016-10-24 11:57:24 +02:00 committed by Alexandre Julliard
parent eba417a477
commit 4a23e91462
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/wined3d/buffer.c
View File

@ -631,6 +631,7 @@ void wined3d_buffer_get_memory(struct wined3d_buffer *buffer,
static void buffer_unload(struct wined3d_resource *resource) static void buffer_unload(struct wined3d_resource *resource)
{ {
struct wined3d_buffer *buffer = buffer_from_resource(resource); struct wined3d_buffer *buffer = buffer_from_resource(resource);
DWORD flags = buffer->flags;
TRACE("buffer %p.\n", buffer); TRACE("buffer %p.\n", buffer);
@ -641,12 +642,10 @@ static void buffer_unload(struct wined3d_resource *resource)
context = context_acquire(device, NULL); context = context_acquire(device, NULL);
/* Download the buffer, but don't permanently enable double buffering */ /* Download the buffer, but don't permanently enable double buffering. */
if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM);
{ if (!(flags & WINED3D_BUFFER_DOUBLEBUFFER))
wined3d_buffer_load_sysmem(buffer, context);
buffer->flags &= ~WINED3D_BUFFER_DOUBLEBUFFER; buffer->flags &= ~WINED3D_BUFFER_DOUBLEBUFFER;
}
wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_BUFFER); wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_BUFFER);
delete_gl_buffer(buffer, context->gl_info); delete_gl_buffer(buffer, context->gl_info);
@ -988,8 +987,7 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *
if (buffer->buffer_type_hint != GL_ARRAY_BUFFER) if (buffer->buffer_type_hint != GL_ARRAY_BUFFER)
ERR("Converting data in non-vertex buffer.\n"); ERR("Converting data in non-vertex buffer.\n");
if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM);
wined3d_buffer_load_sysmem(buffer, context);
/* Now for each vertex in the buffer that needs conversion */ /* Now for each vertex in the buffer that needs conversion */
vertex_count = buffer->resource.size / buffer->stride; vertex_count = buffer->resource.size / buffer->stride;
@ -1144,7 +1142,7 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI
else else
{ {
TRACE("Falling back to doublebuffered operation.\n"); TRACE("Falling back to doublebuffered operation.\n");
wined3d_buffer_load_sysmem(buffer, context); wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM);
} }
TRACE("New pointer is %p.\n", buffer->resource.heap_memory); TRACE("New pointer is %p.\n", buffer->resource.heap_memory);
buffer->map_ptr = NULL; buffer->map_ptr = NULL;