wined3d: Pass context to create_default_samplers().

Signed-off-by: Józef Kucia <jkucia@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Pass context to create_default_samplers().
6372cd8e · Józef Kucia · Alexandre Julliard · 7cb16e4d · 6372cd8e
Commit 6372cd8e authored Oct 03, 2016 by Józef Kucia Committed by Alexandre Julliard Oct 03, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

device.c dlls/wined3d/device.c +4 -4

No files found.
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -794,9 +794,9 @@ static void destroy_dummy_textures(struct wined3d_device *device, const struct w
 }

 /* Context activation is done by the caller. */
-static void create_default_samplers(struct wined3d_device *device)
+static void create_default_samplers(struct wined3d_device *device, struct wined3d_context *context)
 {
-    const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
+    const struct wined3d_gl_info *gl_info = context->gl_info;

    if (gl_info->supported[ARB_SAMPLER_OBJECTS])
    {
@@ -1058,7 +1058,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device,
    context = context_acquire(device, NULL);

    create_dummy_textures(device, context);
-    create_default_samplers(device);
+    create_default_samplers(device, context);

    device->contexts[0]->last_was_rhw = 0;

@@ -4620,7 +4620,7 @@ static HRESULT create_primary_opengl_context(struct wined3d_device *device, stru
    swapchain->context[0] = context;
    swapchain->num_contexts = 1;
    create_dummy_textures(device, context);
-    create_default_samplers(device);
+    create_default_samplers(device, context);
    context_release(context);

    return WINED3D_OK;