Henri Verbeet : wined3d: Store the wined3d creation flags for NO3D adapters as well.
Alexandre Julliard
julliard at winehq.org
Tue Sep 25 14:56:34 CDT 2018
Module: wine
Branch: master
Commit: b1d6d47c0c01d7d14ab74f10720758708e4f070b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1d6d47c0c01d7d14ab74f10720758708e4f070b
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Sep 25 02:13:21 2018 +0330
wined3d: Store the wined3d creation flags for NO3D adapters as well.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/directx.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index abe81de..f7ef5c0 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2463,7 +2463,14 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops =
wined3d_adapter_no3d_create_context,
};
-static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter)
+static void wined3d_adapter_no3d_init_d3d_info(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags)
+{
+ struct wined3d_d3d_info *d3d_info = &adapter->d3d_info;
+
+ d3d_info->wined3d_creation_flags = wined3d_creation_flags;
+}
+
+static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags)
{
static const struct wined3d_gpu_description gpu_description =
{
@@ -2485,6 +2492,8 @@ static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter)
adapter->shader_backend = &none_shader_backend;
adapter->adapter_ops = &wined3d_adapter_no3d_ops;
+ wined3d_adapter_no3d_init_d3d_info(adapter, wined3d_creation_flags);
+
return TRUE;
}
@@ -2510,7 +2519,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int o
adapter->formats = NULL;
if (wined3d_creation_flags & WINED3D_NO3D)
- return wined3d_adapter_no3d_init(adapter);
+ return wined3d_adapter_no3d_init(adapter, wined3d_creation_flags);
return wined3d_adapter_gl_init(adapter, wined3d_creation_flags);
}
More information about the wine-cvs
mailing list