marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Rename "wined3d_adapter_opengl" to "wined3d_adapter_gl". 

For consistency with the filename.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Henri Verbeet 2018-09-20 02:30:46 +04:30 committed by Alexandre Julliard
parent de2d53c6f2
commit 8f9a2165e9
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/wined3d/adapter_gl.c
View File

@ -4182,12 +4182,12 @@ static DWORD get_max_gl_version(const struct wined3d_gl_info *gl_info, DWORD fla
return wined3d_settings.max_gl_version;
}
static const struct wined3d_adapter_ops wined3d_adapter_opengl_ops =
static const struct wined3d_adapter_ops wined3d_adapter_gl_ops =
{
wined3d_adapter_opengl_create_context,
wined3d_adapter_gl_create_context,
};
BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags)
BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags)
{
static const DWORD supported_gl_versions[] =
{
@ -4290,7 +4290,7 @@ BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD wined3d_
wined3d_caps_gl_ctx_destroy(&caps_gl_ctx);
wined3d_adapter_init_ffp_attrib_ops(adapter);
adapter->adapter_ops = &wined3d_adapter_opengl_ops;
adapter->adapter_ops = &wined3d_adapter_gl_ops;
return TRUE;
}

2
dlls/wined3d/context.c
View File

@ -1997,7 +1997,7 @@ out:
return NULL;
}
BOOL wined3d_adapter_opengl_create_context(struct wined3d_context *context,
BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context,
struct wined3d_texture *target, const struct wined3d_format *ds_format)
{
struct wined3d_device *device = context->device;

2
dlls/wined3d/directx.c
View File

@ -2525,7 +2525,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int o
if (wined3d_creation_flags & WINED3D_NO3D)
return wined3d_adapter_no3d_init(adapter);
return wined3d_adapter_opengl_init(adapter, wined3d_creation_flags);
return wined3d_adapter_gl_init(adapter, wined3d_creation_flags);
}
static void STDMETHODCALLTYPE wined3d_null_wined3d_object_destroyed(void *parent) {}

4
dlls/wined3d/wined3d_private.h
View File

@ -2647,7 +2647,7 @@ struct wined3d_adapter_ops
struct wined3d_texture *target, const struct wined3d_format *ds_format);
};
BOOL wined3d_adapter_opengl_create_context(struct wined3d_context *context,
BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context,
struct wined3d_texture *target, const struct wined3d_format *ds_format) DECLSPEC_HIDDEN;
/* The adapter structure */
@ -2675,7 +2675,7 @@ struct wined3d_adapter
const struct wined3d_adapter_ops *adapter_ops;
};
BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) DECLSPEC_HIDDEN;
BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) DECLSPEC_HIDDEN;
struct wined3d_caps_gl_ctx
{