Commit 08b8801c authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Rename context_destroy_gl_resources() to wined3d_context_cleanup().

parent 817f915b
...@@ -1312,7 +1312,7 @@ static void context_update_window(struct wined3d_context *context) ...@@ -1312,7 +1312,7 @@ static void context_update_window(struct wined3d_context *context)
} }
} }
static void context_destroy_gl_resources(struct wined3d_context *context) static void wined3d_context_cleanup(struct wined3d_context *context)
{ {
struct wined3d_pipeline_statistics_query *pipeline_statistics_query; struct wined3d_pipeline_statistics_query *pipeline_statistics_query;
const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_gl_info *gl_info = context->gl_info;
...@@ -1510,7 +1510,7 @@ BOOL context_set_current(struct wined3d_context *ctx) ...@@ -1510,7 +1510,7 @@ BOOL context_set_current(struct wined3d_context *ctx)
if (old->destroyed) if (old->destroyed)
{ {
TRACE("Switching away from destroyed context %p.\n", old); TRACE("Switching away from destroyed context %p.\n", old);
context_destroy_gl_resources(old); wined3d_context_cleanup(old);
heap_free((void *)old->gl_info); heap_free((void *)old->gl_info);
heap_free(old); heap_free(old);
} }
...@@ -2328,7 +2328,7 @@ void wined3d_context_destroy(struct wined3d_context *context) ...@@ -2328,7 +2328,7 @@ void wined3d_context_destroy(struct wined3d_context *context)
{ {
struct wined3d_gl_info *gl_info; struct wined3d_gl_info *gl_info;
/* Make a copy of gl_info for context_destroy_gl_resources() use, the /* Make a copy of gl_info for wined3d_context_cleanup() use, the
* one in wined3d_adapter may go away in the meantime. */ * one in wined3d_adapter may go away in the meantime. */
gl_info = heap_alloc(sizeof(*gl_info)); gl_info = heap_alloc(sizeof(*gl_info));
*gl_info = *context->gl_info; *gl_info = *context->gl_info;
...@@ -2338,7 +2338,7 @@ void wined3d_context_destroy(struct wined3d_context *context) ...@@ -2338,7 +2338,7 @@ void wined3d_context_destroy(struct wined3d_context *context)
return; return;
} }
context_destroy_gl_resources(context); wined3d_context_cleanup(context);
TlsSetValue(wined3d_context_tls_idx, NULL); TlsSetValue(wined3d_context_tls_idx, NULL);
heap_free(context); heap_free(context);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment