Henri Verbeet : wined3d: Rename "wined3d_adapter_opengl" to " wined3d_adapter_gl".

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8f9a2165e9e85b2ef8831db7dda3f951ed737825
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=8f9a2165e9e85b2ef8831db7d...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Thu Sep 20 02:48:46 2018 +0430

wined3d: Rename "wined3d_adapter_opengl" to "wined3d_adapter_gl".

For consistency with the filename.

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/wined3d/adapter_gl.c      | 8 ++++----
 dlls/wined3d/context.c         | 2 +-
 dlls/wined3d/directx.c         | 2 +-
 dlls/wined3d/wined3d_private.h | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c
index e60383c..0948741 100644
--- a/dlls/wined3d/adapter_gl.c
+++ b/dlls/wined3d/adapter_gl.c
@@ -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;
 }
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 34376ef..19f0fcb 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -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;
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 81c3b5d..d1d80b8 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -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) {}
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 89cf44b..f01ad17 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -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
 {