[PATCH 4/5] wined3d: Get gl_info from the context in wined3d_device_create_primary_opengl_context_cs().

Henri Verbeet hverbeet at codeweavers.com
Fri Dec 13 15:31:14 CST 2019


Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
 dlls/wined3d/device.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 89134207243..cdc65a6fa71 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1002,13 +1002,15 @@ void wined3d_device_create_primary_opengl_context_cs(void *object)
         context_release(context);
         return;
     }
-    wined3d_ffp_blitter_create(&device->blitter, &device->adapter->gl_info);
+
+    context_gl = wined3d_context_gl(context);
+
+    wined3d_ffp_blitter_create(&device->blitter, context_gl->gl_info);
     if (!wined3d_glsl_blitter_create(&device->blitter, device))
         wined3d_arbfp_blitter_create(&device->blitter, device);
-    wined3d_fbo_blitter_create(&device->blitter, &device->adapter->gl_info);
-    wined3d_raw_blitter_create(&device->blitter, &device->adapter->gl_info);
+    wined3d_fbo_blitter_create(&device->blitter, context_gl->gl_info);
+    wined3d_raw_blitter_create(&device->blitter, context_gl->gl_info);
 
-    context_gl = wined3d_context_gl(context);
     wined3d_device_gl_create_dummy_textures(wined3d_device_gl(device), context_gl);
     wined3d_device_create_default_samplers(device, context);
     context_release(context);
-- 
2.11.0




More information about the wine-devel mailing list