Henri Verbeet : wined3d: Get gl_info from the context in wined3d_device_create_primary_opengl_context_cs().

Alexandre Julliard julliard at winehq.org
Fri Jan 24 16:14:11 CST 2020


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Fri Jan 24 19:50:06 2020 +0330

wined3d: Get gl_info from the context in wined3d_device_create_primary_opengl_context_cs().

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

---

 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 8913420724..cdc65a6fa7 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);




More information about the wine-cvs mailing list