Zebediah Figura : wined3d: Introduce wined3d_get_renderer().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 22b25dfc9c8ef4d15b8029885ad616f2a05e3cf0
URL:    https://gitlab.winehq.org/wine/wine/-/commit/22b25dfc9c8ef4d15b8029885ad616f...

Author: Zebediah Figura 
Date:   Wed Jun 21 15:41:52 2023 -0500

wined3d: Introduce wined3d_get_renderer().

---

dlls/wined3d/wined3d.spec      | 1 +
 dlls/wined3d/wined3d_main.c    | 8 ++++++++
 dlls/wined3d/wined3d_private.h | 8 --------
 include/wine/wined3d.h         | 9 +++++++++
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 91d3355830e..8f75dffc142 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -12,6 +12,7 @@
 @ cdecl wined3d_get_adapter(ptr long)
 @ cdecl wined3d_get_adapter_count(ptr)
 @ cdecl wined3d_get_device_caps(ptr long ptr)
+@ cdecl wined3d_get_renderer()
 @ cdecl wined3d_incref(ptr)
 @ cdecl wined3d_register_software_device(ptr ptr)
 @ cdecl wined3d_register_window(ptr ptr ptr long)
diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
index bcaf1651db8..15c8e237af3 100644
--- a/dlls/wined3d/wined3d_main.c
+++ b/dlls/wined3d/wined3d_main.c
@@ -129,6 +129,11 @@ struct wined3d_settings wined3d_settings =
     .shader_backend = WINED3D_SHADER_BACKEND_AUTO,
 };

+enum wined3d_renderer CDECL wined3d_get_renderer(void)
+{
+    return wined3d_settings.renderer;
+}
+
 struct wined3d * CDECL wined3d_create(uint32_t flags)
 {
     struct wined3d *object;
@@ -491,6 +496,9 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL)

vkd3d_set_log_callback(vkd3d_log_callback);

+    if (wined3d_settings.renderer == WINED3D_RENDERER_AUTO)
+        wined3d_settings.renderer = WINED3D_RENDERER_OPENGL;
+
     return TRUE;
 }

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index e67c2e17791..22182c0507e 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -514,14 +514,6 @@ static inline int wined3d_uint64_compare(uint64_t x, uint64_t y)
 #define PCI_VENDOR_NONE 0xffff /* e.g. 0x8086 for Intel and 0x10de for Nvidia */
 #define PCI_DEVICE_NONE 0xffff /* e.g. 0x14f for a Geforce6200 */

-enum wined3d_renderer
-{
-    WINED3D_RENDERER_AUTO,
-    WINED3D_RENDERER_VULKAN,
-    WINED3D_RENDERER_OPENGL,
-    WINED3D_RENDERER_NO3D,
-};
-
 enum wined3d_shader_backend
 {
     WINED3D_SHADER_BACKEND_AUTO,
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 04e69e67904..c9790efccbb 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -53,6 +53,14 @@
 #define WINED3D_RESOURCE_ACCESS_MAP_R                           0x4u
 #define WINED3D_RESOURCE_ACCESS_MAP_W                           0x8u

+enum wined3d_renderer
+{
+    WINED3D_RENDERER_AUTO,
+    WINED3D_RENDERER_VULKAN,
+    WINED3D_RENDERER_OPENGL,
+    WINED3D_RENDERER_NO3D,
+};
+
 enum wined3d_light_type
 {
     WINED3D_LIGHT_POINT                     = 1,
@@ -2311,6 +2319,7 @@ struct wined3d_adapter * __cdecl wined3d_get_adapter(const struct wined3d *wined
 UINT __cdecl wined3d_get_adapter_count(const struct wined3d *wined3d);
 HRESULT __cdecl wined3d_get_device_caps(const struct wined3d_adapter *adapter,
         enum wined3d_device_type device_type, struct wined3d_caps *caps);
+enum wined3d_renderer __cdecl wined3d_get_renderer(void);
 ULONG __cdecl wined3d_incref(struct wined3d *wined3d);
 HRESULT __cdecl wined3d_register_software_device(struct wined3d *wined3d, void *init_function);
 BOOL __cdecl wined3d_register_window(struct wined3d *wined3d, HWND window,