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

wined3d: Assign "adapter_ops" in wined3d_adapter_init(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2019-04-19 21:04:46 +04:30 committed by Alexandre Julliard
parent 24b0a027ab
commit 0146975b82
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/wined3d/adapter_gl.c
View File

@ -4570,7 +4570,7 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl,
TRACE("adapter_gl %p, ordinal %u, wined3d_creation_flags %#x.\n",
adapter_gl, ordinal, wined3d_creation_flags);
if (!wined3d_adapter_init(&adapter_gl->a, ordinal))
if (!wined3d_adapter_init(&adapter_gl->a, ordinal, &wined3d_adapter_gl_ops))
return FALSE;
/* Dynamically load all GL core functions */
@ -4660,7 +4660,6 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl,
wined3d_caps_gl_ctx_destroy(&caps_gl_ctx);
wined3d_adapter_init_ffp_attrib_ops(&adapter_gl->a);
adapter_gl->a.adapter_ops = &wined3d_adapter_gl_ops;
return TRUE;
}

3
dlls/wined3d/adapter_vk.c
View File

@ -648,7 +648,7 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk,
TRACE("adapter_vk %p, ordinal %u, wined3d_creation_flags %#x.\n",
adapter_vk, ordinal, wined3d_creation_flags);
if (!wined3d_adapter_init(adapter, ordinal))
if (!wined3d_adapter_init(adapter, ordinal, &wined3d_adapter_vk_ops))
return FALSE;
if (!wined3d_init_vulkan(vk_info))
@ -687,7 +687,6 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk,
adapter->vertex_pipe = &none_vertex_pipe;
adapter->fragment_pipe = &none_fragment_pipe;
adapter->shader_backend = &none_shader_backend;
adapter->adapter_ops = &wined3d_adapter_vk_ops;
adapter->d3d_info.wined3d_creation_flags = wined3d_creation_flags;

7
dlls/wined3d/directx.c
View File

@ -2284,7 +2284,7 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal,
adapter->vram_bytes_used = 0;
TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes));
if (!wined3d_adapter_init(adapter, ordinal))
if (!wined3d_adapter_init(adapter, ordinal, &wined3d_adapter_no3d_ops))
{
heap_free(adapter);
return NULL;
@ -2299,7 +2299,6 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal,
adapter->vertex_pipe = &none_vertex_pipe;
adapter->fragment_pipe = &none_fragment_pipe;
adapter->shader_backend = &none_shader_backend;
adapter->adapter_ops = &wined3d_adapter_no3d_ops;
wined3d_adapter_no3d_init_d3d_info(adapter, wined3d_creation_flags);
@ -2308,7 +2307,8 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal,
return adapter;
}
BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal)
BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal,
const struct wined3d_adapter_ops *adapter_ops)
{
DISPLAY_DEVICEW display_device;
@ -2331,6 +2331,7 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal)
memset(&adapter->device_uuid, 0, sizeof(adapter->device_uuid));
adapter->formats = NULL;
adapter->adapter_ops = adapter_ops;
return TRUE;
}

3
dlls/wined3d/wined3d_private.h
View File

@ -2730,7 +2730,8 @@ struct wined3d_adapter
const struct wined3d_adapter_ops *adapter_ops;
};
BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal) DECLSPEC_HIDDEN;
BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal,
const struct wined3d_adapter_ops *adapter_ops) DECLSPEC_HIDDEN;
void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN;
struct wined3d_adapter_gl