[PATCH 0/1] MR4171: wined3d: Don't override the default renderer in wined3d_dll_init().

[Sven Baars (＠sbaars)]

This value may not correspond with the renderer that would get created in `wined3d_adapter_create()` when using `WINED3D_RENDERER_AUTO`. This actually means that returning `WINED3D_RENDERER_OPENGL` from `wined3d_get_renderer()` is also wrong, but this function is only used for testing purposes anyway. A more future-proof way of doing this would be to store the actual renderer that is used somewhere after the adapter was created, and return that from `wined3d_get_renderer()`.

[PATCH 1/1] wined3d: Don't override the default renderer in wined3d_dll_init().

[Sven Baars]

From: Sven Baars

---
 dlls/wined3d/wined3d_main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
index 11646d3705d..1368b4fc905 100644
--- a/dlls/wined3d/wined3d_main.c
+++ b/dlls/wined3d/wined3d_main.c
@@ -134,6 +134,9 @@ struct wined3d_settings wined3d_settings =

enum wined3d_renderer CDECL wined3d_get_renderer(void)
 {
+    if (wined3d_settings.renderer == WINED3D_RENDERER_AUTO)
+        return WINED3D_RENDERER_OPENGL;
+
     return wined3d_settings.renderer;
 }

@@ -499,9 +502,6 @@ 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;
 }

[PATCH 0/1] MR4171: wined3d: Don't override the default renderer in wined3d_dll_init(). - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.