Commit 5c36f72f authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

wined3d: Pass a wined3d_device_context to wined3d_device_clear_unordered_access_view_uint().

parent b2a969ce
...@@ -1313,7 +1313,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearRenderTargetView(ID3D ...@@ -1313,7 +1313,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearRenderTargetView(ID3D
static void STDMETHODCALLTYPE d3d11_immediate_context_ClearUnorderedAccessViewUint(ID3D11DeviceContext1 *iface, static void STDMETHODCALLTYPE d3d11_immediate_context_ClearUnorderedAccessViewUint(ID3D11DeviceContext1 *iface,
ID3D11UnorderedAccessView *unordered_access_view, const UINT values[4]) ID3D11UnorderedAccessView *unordered_access_view, const UINT values[4])
{ {
struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface);
struct d3d11_unordered_access_view *view; struct d3d11_unordered_access_view *view;
TRACE("iface %p, unordered_access_view %p, values {%u, %u, %u, %u}.\n", TRACE("iface %p, unordered_access_view %p, values {%u, %u, %u, %u}.\n",
...@@ -1321,7 +1321,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearUnorderedAccessViewUi ...@@ -1321,7 +1321,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearUnorderedAccessViewUi
view = unsafe_impl_from_ID3D11UnorderedAccessView(unordered_access_view); view = unsafe_impl_from_ID3D11UnorderedAccessView(unordered_access_view);
wined3d_mutex_lock(); wined3d_mutex_lock();
wined3d_device_clear_unordered_access_view_uint(device->wined3d_device, wined3d_device_context_clear_uav_uint(context->wined3d_context,
view->wined3d_view, (const struct wined3d_uvec4 *)values); view->wined3d_view, (const struct wined3d_uvec4 *)values);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
} }
......
...@@ -5242,12 +5242,12 @@ HRESULT CDECL wined3d_device_context_clear_rendertarget_view(struct wined3d_devi ...@@ -5242,12 +5242,12 @@ HRESULT CDECL wined3d_device_context_clear_rendertarget_view(struct wined3d_devi
return WINED3D_OK; return WINED3D_OK;
} }
void CDECL wined3d_device_clear_unordered_access_view_uint(struct wined3d_device *device, void CDECL wined3d_device_context_clear_uav_uint(struct wined3d_device_context *context,
struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value)
{ {
TRACE("device %p, view %p, clear_value %s.\n", device, view, debug_uvec4(clear_value)); TRACE("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value));
wined3d_device_context_emit_clear_uav_uint(&device->cs->c, view, clear_value); wined3d_device_context_emit_clear_uav_uint(context, view, clear_value);
} }
struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(const struct wined3d_device *device, struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(const struct wined3d_device *device,
......
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
@ cdecl wined3d_device_apply_stateblock(ptr ptr) @ cdecl wined3d_device_apply_stateblock(ptr ptr)
@ cdecl wined3d_device_begin_scene(ptr) @ cdecl wined3d_device_begin_scene(ptr)
@ cdecl wined3d_device_clear(ptr long ptr long ptr float long) @ cdecl wined3d_device_clear(ptr long ptr long ptr float long)
@ cdecl wined3d_device_clear_unordered_access_view_uint(ptr ptr ptr)
@ cdecl wined3d_device_create(ptr ptr long ptr long long ptr long ptr ptr) @ cdecl wined3d_device_create(ptr ptr long ptr long long ptr long ptr ptr)
@ cdecl wined3d_device_decref(ptr) @ cdecl wined3d_device_decref(ptr)
@ cdecl wined3d_device_dispatch_compute(ptr long long long) @ cdecl wined3d_device_dispatch_compute(ptr long long long)
...@@ -163,6 +162,7 @@ ...@@ -163,6 +162,7 @@
@ cdecl wined3d_device_context_blt(ptr ptr long ptr ptr long ptr long ptr long) @ cdecl wined3d_device_context_blt(ptr ptr long ptr ptr long ptr long ptr long)
@ cdecl wined3d_device_context_clear_rendertarget_view(ptr ptr ptr long ptr float long) @ cdecl wined3d_device_context_clear_rendertarget_view(ptr ptr ptr long ptr float long)
@ cdecl wined3d_device_context_clear_uav_uint(ptr ptr ptr)
@ cdecl wined3d_device_context_copy_resource(ptr ptr ptr) @ cdecl wined3d_device_context_copy_resource(ptr ptr ptr)
@ cdecl wined3d_device_context_copy_sub_resource_region(ptr ptr long long long long ptr long ptr long) @ cdecl wined3d_device_context_copy_sub_resource_region(ptr ptr long long long long ptr long ptr long)
@ cdecl wined3d_device_context_copy_uav_counter(ptr ptr long ptr) @ cdecl wined3d_device_context_copy_uav_counter(ptr ptr long ptr)
......
...@@ -2352,8 +2352,6 @@ void __cdecl wined3d_device_apply_stateblock(struct wined3d_device *device, stru ...@@ -2352,8 +2352,6 @@ void __cdecl wined3d_device_apply_stateblock(struct wined3d_device *device, stru
HRESULT __cdecl wined3d_device_begin_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_begin_scene(struct wined3d_device *device);
HRESULT __cdecl wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, HRESULT __cdecl wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags,
const struct wined3d_color *color, float z, DWORD stencil); const struct wined3d_color *color, float z, DWORD stencil);
void __cdecl wined3d_device_clear_unordered_access_view_uint(struct wined3d_device *device,
struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value);
HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, struct wined3d_adapter *adapter, HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, struct wined3d_adapter *adapter,
enum wined3d_device_type device_type, HWND focus_window, DWORD behaviour_flags, BYTE surface_alignment, enum wined3d_device_type device_type, HWND focus_window, DWORD behaviour_flags, BYTE surface_alignment,
const enum wined3d_feature_level *feature_levels, unsigned int feature_level_count, const enum wined3d_feature_level *feature_levels, unsigned int feature_level_count,
...@@ -2549,6 +2547,8 @@ HRESULT __cdecl wined3d_device_context_blt(struct wined3d_device_context *contex ...@@ -2549,6 +2547,8 @@ HRESULT __cdecl wined3d_device_context_blt(struct wined3d_device_context *contex
HRESULT __cdecl wined3d_device_context_clear_rendertarget_view(struct wined3d_device_context *context, HRESULT __cdecl wined3d_device_context_clear_rendertarget_view(struct wined3d_device_context *context,
struct wined3d_rendertarget_view *view, const RECT *rect, unsigned int flags, struct wined3d_rendertarget_view *view, const RECT *rect, unsigned int flags,
const struct wined3d_color *color, float depth, unsigned int stencil); const struct wined3d_color *color, float depth, unsigned int stencil);
void __cdecl wined3d_device_context_clear_uav_uint(struct wined3d_device_context *context,
struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value);
void __cdecl wined3d_device_context_copy_resource(struct wined3d_device_context *context, void __cdecl wined3d_device_context_copy_resource(struct wined3d_device_context *context,
struct wined3d_resource *dst_resource, struct wined3d_resource *src_resource); struct wined3d_resource *dst_resource, struct wined3d_resource *src_resource);
HRESULT __cdecl wined3d_device_context_copy_sub_resource_region(struct wined3d_device_context *context, HRESULT __cdecl wined3d_device_context_copy_sub_resource_region(struct wined3d_device_context *context,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment