From 3edc4b27cde9bbaad7a396368855d687fa0a7b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zef=20Kucia?= Date: Wed, 5 Oct 2016 11:17:09 +0200 Subject: [PATCH] wined3d: Pass context to destroy_dummy_textures(). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Józef Kucia Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- dlls/wined3d/device.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 94ea4c56e1f..de6d5a41eac 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -772,8 +772,10 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ } /* Context activation is done by the caller. */ -static void destroy_dummy_textures(struct wined3d_device *device, const struct wined3d_gl_info *gl_info) +static void destroy_dummy_textures(struct wined3d_device *device, struct wined3d_context *context) { + const struct wined3d_gl_info *gl_info = context->gl_info; + if (gl_info->supported[EXT_TEXTURE_ARRAY]) gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->dummy_textures.tex_2d_array); @@ -1182,7 +1184,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) /* Destroy the shader backend. Note that this has to happen after all shaders are destroyed. */ device->blitter->free_private(device); device->shader_backend->shader_free_private(device); - destroy_dummy_textures(device, gl_info); + destroy_dummy_textures(device, context); destroy_default_samplers(device, context); context_release(context); @@ -4559,7 +4561,7 @@ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d device->blitter->free_private(device); device->shader_backend->shader_free_private(device); - destroy_dummy_textures(device, gl_info); + destroy_dummy_textures(device, context); destroy_default_samplers(device, context); context_release(context);