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

wined3d: Pass a wined3d_device_context to wined3d_device_flush(). 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-04-13 21:05:27 -05:00 committed by Alexandre Julliard
parent cd704aeee4
commit 7699ff8aa4
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/d3d11/device.c
View File

@ -2641,12 +2641,12 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceCon
static void STDMETHODCALLTYPE d3d11_immediate_context_Flush(ID3D11DeviceContext1 *iface) static void STDMETHODCALLTYPE d3d11_immediate_context_Flush(ID3D11DeviceContext1 *iface)
{ {
struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface);
TRACE("iface %p.\n", iface); TRACE("iface %p.\n", iface);
wined3d_mutex_lock(); wined3d_mutex_lock();
wined3d_device_flush(device->wined3d_device); wined3d_device_context_flush(context->wined3d_context);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
} }
@ -5643,7 +5643,7 @@ static void STDMETHODCALLTYPE d3d10_device_Flush(ID3D10Device1 *iface)
TRACE("iface %p.\n", iface); TRACE("iface %p.\n", iface);
wined3d_mutex_lock(); wined3d_mutex_lock();
wined3d_device_flush(device->wined3d_device); wined3d_device_context_flush(device->immediate_context.wined3d_context);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
} }

6
dlls/wined3d/device.c
View File

@ -5621,11 +5621,11 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device)
} }
} }
void CDECL wined3d_device_flush(struct wined3d_device *device) void CDECL wined3d_device_context_flush(struct wined3d_device_context *context)
{ {
TRACE("device %p.\n", device); TRACE("context %p.\n", context);
device->cs->c.ops->flush(&device->cs->c); context->ops->flush(context);
} }
static void update_swapchain_flags(struct wined3d_texture *texture) static void update_swapchain_flags(struct wined3d_texture *texture)

2
dlls/wined3d/wined3d.spec
View File

@ -54,7 +54,6 @@
@ cdecl wined3d_device_draw_primitive_instanced_indirect(ptr ptr long) @ cdecl wined3d_device_draw_primitive_instanced_indirect(ptr ptr long)
@ cdecl wined3d_device_end_scene(ptr) @ cdecl wined3d_device_end_scene(ptr)
@ cdecl wined3d_device_evict_managed_resources(ptr) @ cdecl wined3d_device_evict_managed_resources(ptr)
@ cdecl wined3d_device_flush(ptr)
@ cdecl wined3d_device_get_available_texture_mem(ptr) @ cdecl wined3d_device_get_available_texture_mem(ptr)
@ cdecl wined3d_device_get_blend_state(ptr ptr) @ cdecl wined3d_device_get_blend_state(ptr ptr)
@ cdecl wined3d_device_get_clip_status(ptr ptr) @ cdecl wined3d_device_get_clip_status(ptr ptr)
@ -170,6 +169,7 @@
@ cdecl wined3d_device_context_draw_indirect(ptr ptr long long) @ cdecl wined3d_device_context_draw_indirect(ptr ptr long long)
@ cdecl wined3d_device_context_dispatch(ptr long long long) @ cdecl wined3d_device_context_dispatch(ptr long long long)
@ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long)
@ cdecl wined3d_device_context_flush(ptr)
@ cdecl wined3d_device_context_generate_mipmaps(ptr ptr) @ cdecl wined3d_device_context_generate_mipmaps(ptr ptr)
@ cdecl wined3d_device_context_issue_query(ptr ptr long) @ cdecl wined3d_device_context_issue_query(ptr ptr long)
@ cdecl wined3d_device_context_map(ptr ptr long ptr ptr long) @ cdecl wined3d_device_context_map(ptr ptr long ptr ptr long)

1
include/wine/wined3d.h
View File

@ -2564,6 +2564,7 @@ void __cdecl wined3d_device_context_draw_indexed(struct wined3d_device_context *
unsigned int start_index, unsigned int index_count, unsigned int start_instance, unsigned int instance_count); unsigned int start_index, unsigned int index_count, unsigned int start_instance, unsigned int instance_count);
void __cdecl wined3d_device_context_draw_indirect(struct wined3d_device_context *context, void __cdecl wined3d_device_context_draw_indirect(struct wined3d_device_context *context,
struct wined3d_buffer *buffer, unsigned int offset, bool indexed); struct wined3d_buffer *buffer, unsigned int offset, bool indexed);
void __cdecl wined3d_device_context_flush(struct wined3d_device_context *context);
void __cdecl wined3d_device_context_generate_mipmaps(struct wined3d_device_context *context, void __cdecl wined3d_device_context_generate_mipmaps(struct wined3d_device_context *context,
struct wined3d_shader_resource_view *view); struct wined3d_shader_resource_view *view);
void __cdecl wined3d_device_context_issue_query(struct wined3d_device_context *context, void __cdecl wined3d_device_context_issue_query(struct wined3d_device_context *context,