Commit 97eb3595 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Send query destruction through the command stream.

parent 9ba058e9
...@@ -233,41 +233,46 @@ ULONG CDECL wined3d_query_incref(struct wined3d_query *query) ...@@ -233,41 +233,46 @@ ULONG CDECL wined3d_query_incref(struct wined3d_query *query)
return refcount; return refcount;
} }
ULONG CDECL wined3d_query_decref(struct wined3d_query *query) static void wined3d_query_destroy_object(void *object)
{ {
ULONG refcount = InterlockedDecrement(&query->ref); struct wined3d_query *query = object;
TRACE("%p decreasing refcount to %u.\n", query, refcount); /* Queries are specific to the GL context that created them. Not
* deleting the query will obviously leak it, but that's still better
* than potentially deleting a different query with the same id in this
* context, and (still) leaking the actual query. */
if (query->type == WINED3D_QUERY_TYPE_EVENT)
{
struct wined3d_event_query *event_query = query->extendedData;
if (event_query) wined3d_event_query_destroy(event_query);
}
else if (query->type == WINED3D_QUERY_TYPE_OCCLUSION)
{
struct wined3d_occlusion_query *oq = query->extendedData;
if (!refcount) if (oq->context) context_free_occlusion_query(oq);
HeapFree(GetProcessHeap(), 0, query->extendedData);
}
else if (query->type == WINED3D_QUERY_TYPE_TIMESTAMP)
{ {
/* Queries are specific to the GL context that created them. Not struct wined3d_timestamp_query *tq = query->extendedData;
* deleting the query will obviously leak it, but that's still better
* than potentially deleting a different query with the same id in this
* context, and (still) leaking the actual query. */
if (query->type == WINED3D_QUERY_TYPE_EVENT)
{
struct wined3d_event_query *event_query = query->extendedData;
if (event_query) wined3d_event_query_destroy(event_query);
}
else if (query->type == WINED3D_QUERY_TYPE_OCCLUSION)
{
struct wined3d_occlusion_query *oq = query->extendedData;
if (oq->context) context_free_occlusion_query(oq); if (tq->context)
HeapFree(GetProcessHeap(), 0, query->extendedData); context_free_timestamp_query(tq);
} HeapFree(GetProcessHeap(), 0, query->extendedData);
else if (query->type == WINED3D_QUERY_TYPE_TIMESTAMP) }
{
struct wined3d_timestamp_query *tq = query->extendedData;
if (tq->context) HeapFree(GetProcessHeap(), 0, query);
context_free_timestamp_query(tq); }
HeapFree(GetProcessHeap(), 0, query->extendedData);
}
HeapFree(GetProcessHeap(), 0, query); ULONG CDECL wined3d_query_decref(struct wined3d_query *query)
} {
ULONG refcount = InterlockedDecrement(&query->ref);
TRACE("%p decreasing refcount to %u.\n", query, refcount);
if (!refcount)
wined3d_cs_emit_destroy_object(query->device->cs, wined3d_query_destroy_object, query);
return refcount; return refcount;
} }
......
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