July 2016 - Wine-Commits - list.winehq.org

Andrey Gusev : hlink: Use debugstr_guid() in FIXME() message.
by Alexandre Julliard July 22, 2016

July 22, 2016

Module: wine Branch: master Commit: cb901b5fe50c4478d55fb6eb0ca48cb6b47cd85a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb901b5fe50c4478d55fb6eb0… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jul 22 12:56:48 2016 +0300 hlink: Use debugstr_guid() in FIXME() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/hlink_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 1cfa6a6..dc965c2 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -226,8 +226,8 @@ HRESULT WINAPI HlinkCreateFromData(IDataObject *piDataObj, IHlinkSite *pihlsite, DWORD dwSiteData, IUnknown *piunkOuter, REFIID riid, void **ppvObj) { - FIXME("%p %p %d %p %p %p\n", - piDataObj, pihlsite, dwSiteData, piunkOuter, riid, ppvObj); + FIXME("%p, %p, %d, %p, %s, %p\n", piDataObj, pihlsite, dwSiteData, + piunkOuter, debugstr_guid(riid), ppvObj); *ppvObj = NULL; return E_NOTIMPL; }

1 0

Henri Verbeet : wined3d: Introduce a separate function for creating timestamp disjoint queries.
by Alexandre Julliard July 22, 2016

July 22, 2016

Module: wine Branch: master Commit: b1861cb86c38114ab15330b75555ae4c1b78c66d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1861cb86c38114ab15330b75… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 22 00:43:51 2016 +0200 wined3d: Introduce a separate function for creating timestamp disjoint queries. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 91 +++++++++++++++++++--------------------------------- 1 file changed, 33 insertions(+), 58 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 976cdd9..591d6c5 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -271,7 +271,6 @@ static void wined3d_query_destroy_object(void *object) if (query->type == WINED3D_QUERY_TYPE_EVENT) { wined3d_event_query_destroy(wined3d_event_query_from_query(query)); - return; } else if (query->type == WINED3D_QUERY_TYPE_OCCLUSION) { @@ -280,7 +279,6 @@ static void wined3d_query_destroy_object(void *object) if (oq->context) context_free_occlusion_query(oq); HeapFree(GetProcessHeap(), 0, oq); - return; } else if (query->type == WINED3D_QUERY_TYPE_TIMESTAMP) { @@ -289,10 +287,16 @@ static void wined3d_query_destroy_object(void *object) if (tq->context) context_free_timestamp_query(tq); HeapFree(GetProcessHeap(), 0, tq); - return; } - - HeapFree(GetProcessHeap(), 0, query); + else if (query->type == WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT + || query->type == WINED3D_QUERY_TYPE_TIMESTAMP_FREQ) + { + HeapFree(GetProcessHeap(), 0, query); + } + else + { + ERR("Query %p has invalid type %#x.\n", query, query->type); + } } ULONG CDECL wined3d_query_decref(struct wined3d_query *query) @@ -781,46 +785,31 @@ static const struct wined3d_query_ops timestamp_disjoint_query_ops = wined3d_timestamp_disjoint_query_ops_issue, }; -static HRESULT query_init(struct wined3d_query *query, struct wined3d_device *device, - enum wined3d_query_type type, void *parent) +static HRESULT wined3d_timestamp_disjoint_query_create(struct wined3d_device *device, + enum wined3d_query_type type, void *parent, struct wined3d_query **query) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + struct wined3d_query *object; - query->parent = parent; + TRACE("device %p, type %#x, parent %p, query %p.\n", device, type, parent, query); - switch (type) + if (!gl_info->supported[ARB_TIMER_QUERY]) { - case WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT: - case WINED3D_QUERY_TYPE_TIMESTAMP_FREQ: - TRACE("TIMESTAMP_DISJOINT query.\n"); - if (!gl_info->supported[ARB_TIMER_QUERY]) - { - WARN("Unsupported in local OpenGL implementation: ARB_TIMER_QUERY.\n"); - return WINED3DERR_NOTAVAILABLE; - } - query->query_ops = &timestamp_disjoint_query_ops; - query->data_size = type == WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT - ? sizeof(struct wined3d_query_data_timestamp_disjoint) : sizeof(UINT64); - break; - - case WINED3D_QUERY_TYPE_VCACHE: - case WINED3D_QUERY_TYPE_RESOURCE_MANAGER: - case WINED3D_QUERY_TYPE_VERTEX_STATS: - case WINED3D_QUERY_TYPE_PIPELINE_TIMINGS: - case WINED3D_QUERY_TYPE_INTERFACE_TIMINGS: - case WINED3D_QUERY_TYPE_VERTEX_TIMINGS: - case WINED3D_QUERY_TYPE_PIXEL_TIMINGS: - case WINED3D_QUERY_TYPE_BANDWIDTH_TIMINGS: - case WINED3D_QUERY_TYPE_CACHE_UTILIZATION: - default: - FIXME("Unhandled query type %#x.\n", type); - return WINED3DERR_NOTAVAILABLE; + WARN("Unsupported in local OpenGL implementation: ARB_TIMER_QUERY.\n"); + return WINED3DERR_NOTAVAILABLE; } - query->type = type; - query->state = QUERY_CREATED; - query->device = device; - query->ref = 1; + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (type == WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT) + wined3d_query_init(object, device, type, + sizeof(struct wined3d_query_data_timestamp_disjoint), &timestamp_disjoint_query_ops, parent); + else + wined3d_query_init(object, device, type, sizeof(UINT64), &timestamp_disjoint_query_ops, parent); + + TRACE("Created query %p.\n", object); + *query = object; return WINED3D_OK; } @@ -828,9 +817,6 @@ static HRESULT query_init(struct wined3d_query *query, struct wined3d_device *de HRESULT CDECL wined3d_query_create(struct wined3d_device *device, enum wined3d_query_type type, void *parent, struct wined3d_query **query) { - struct wined3d_query *object; - HRESULT hr; - TRACE("device %p, type %#x, parent %p, query %p.\n", device, type, parent, query); switch (type) @@ -844,23 +830,12 @@ HRESULT CDECL wined3d_query_create(struct wined3d_device *device, case WINED3D_QUERY_TYPE_TIMESTAMP: return wined3d_timestamp_query_create(device, type, parent, query); - default: - break; - } - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; + case WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT: + case WINED3D_QUERY_TYPE_TIMESTAMP_FREQ: + return wined3d_timestamp_disjoint_query_create(device, type, parent, query); - if (FAILED(hr = query_init(object, device, type, parent))) - { - WARN("Failed to initialize query, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); - return hr; + default: + FIXME("Unhandled query type %#x.\n", type); + return WINED3DERR_NOTAVAILABLE; } - - TRACE("Created query %p.\n", object); - *query = object; - - return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Use a single allocation for timestamp queries.
by Alexandre Julliard July 22, 2016

July 22, 2016

Module: wine Branch: master Commit: 654e960e340cc37a9282c52ba8aca5f779a13dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=654e960e340cc37a9282c52ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 22 00:43:50 2016 +0200 wined3d: Use a single allocation for timestamp queries. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 61 ++++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 4 +-- 2 files changed, 40 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 3168c30..976cdd9 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -47,6 +47,11 @@ static struct wined3d_occlusion_query *wined3d_occlusion_query_from_query(struct return CONTAINING_RECORD(query, struct wined3d_occlusion_query, query); } +static struct wined3d_timestamp_query *wined3d_timestamp_query_from_query(struct wined3d_query *query) +{ + return CONTAINING_RECORD(query, struct wined3d_timestamp_query, query); +} + BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) { return gl_info->supported[ARB_SYNC] || gl_info->supported[NV_FENCE] || gl_info->supported[APPLE_FENCE]; @@ -279,11 +284,12 @@ static void wined3d_query_destroy_object(void *object) } else if (query->type == WINED3D_QUERY_TYPE_TIMESTAMP) { - struct wined3d_timestamp_query *tq = query->extendedData; + struct wined3d_timestamp_query *tq = wined3d_timestamp_query_from_query(query); if (tq->context) context_free_timestamp_query(tq); - HeapFree(GetProcessHeap(), 0, query->extendedData); + HeapFree(GetProcessHeap(), 0, tq); + return; } HeapFree(GetProcessHeap(), 0, query); @@ -552,7 +558,7 @@ static HRESULT wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DW static HRESULT wined3d_timestamp_query_ops_get_data(struct wined3d_query *query, void *data, DWORD size, DWORD flags) { - struct wined3d_timestamp_query *tq = query->extendedData; + struct wined3d_timestamp_query *tq = wined3d_timestamp_query_from_query(query); struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_context *context; @@ -611,7 +617,7 @@ static HRESULT wined3d_timestamp_query_ops_get_data(struct wined3d_query *query, static HRESULT wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DWORD flags) { - struct wined3d_timestamp_query *tq = query->extendedData; + struct wined3d_timestamp_query *tq = wined3d_timestamp_query_from_query(query); struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_context *context; @@ -744,6 +750,31 @@ static const struct wined3d_query_ops timestamp_query_ops = wined3d_timestamp_query_ops_issue, }; +static HRESULT wined3d_timestamp_query_create(struct wined3d_device *device, + enum wined3d_query_type type, void *parent, struct wined3d_query **query) +{ + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + struct wined3d_timestamp_query *object; + + TRACE("device %p, type %#x, parent %p, query %p.\n", device, type, parent, query); + + if (!gl_info->supported[ARB_TIMER_QUERY]) + { + WARN("Unsupported in local OpenGL implementation: ARB_TIMER_QUERY.\n"); + return WINED3DERR_NOTAVAILABLE; + } + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + wined3d_query_init(&object->query, device, type, sizeof(UINT64), &timestamp_query_ops, parent); + + TRACE("Created query %p.\n", object); + *query = &object->query; + + return WINED3D_OK; +} + static const struct wined3d_query_ops timestamp_disjoint_query_ops = { wined3d_timestamp_disjoint_query_ops_get_data, @@ -759,24 +790,6 @@ static HRESULT query_init(struct wined3d_query *query, struct wined3d_device *de switch (type) { - case WINED3D_QUERY_TYPE_TIMESTAMP: - TRACE("Timestamp query.\n"); - if (!gl_info->supported[ARB_TIMER_QUERY]) - { - WARN("Unsupported in local OpenGL implementation: ARB_TIMER_QUERY.\n"); - return WINED3DERR_NOTAVAILABLE; - } - query->query_ops = &timestamp_query_ops; - query->data_size = sizeof(UINT64); - query->extendedData = HeapAlloc(GetProcessHeap(), 0, sizeof(struct wined3d_timestamp_query)); - if (!query->extendedData) - { - ERR("Failed to allocate timestamp query extended data.\n"); - return E_OUTOFMEMORY; - } - ((struct wined3d_timestamp_query *)query->extendedData)->context = NULL; - break; - case WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT: case WINED3D_QUERY_TYPE_TIMESTAMP_FREQ: TRACE("TIMESTAMP_DISJOINT query.\n"); @@ -788,7 +801,6 @@ static HRESULT query_init(struct wined3d_query *query, struct wined3d_device *de query->query_ops = &timestamp_disjoint_query_ops; query->data_size = type == WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT ? sizeof(struct wined3d_query_data_timestamp_disjoint) : sizeof(UINT64); - query->extendedData = NULL; break; case WINED3D_QUERY_TYPE_VCACHE: @@ -829,6 +841,9 @@ HRESULT CDECL wined3d_query_create(struct wined3d_device *device, case WINED3D_QUERY_TYPE_OCCLUSION: return wined3d_occlusion_query_create(device, type, parent, query); + case WINED3D_QUERY_TYPE_TIMESTAMP: + return wined3d_timestamp_query_create(device, type, parent, query); + default: break; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f7d1948..71a8e2b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1393,8 +1393,6 @@ struct wined3d_query enum wined3d_query_type type; DWORD data_size; const struct wined3d_query_ops *query_ops; - - void *extendedData; }; union wined3d_gl_query_object @@ -1438,6 +1436,8 @@ struct wined3d_occlusion_query struct wined3d_timestamp_query { + struct wined3d_query query; + struct list entry; GLuint id; struct wined3d_context *context;

1 0

Henri Verbeet : wined3d: Use a single allocation for occlusion queries.
by Alexandre Julliard July 22, 2016

July 22, 2016

Module: wine Branch: master Commit: 51c7df4f376fa7924752dc32a9715a4475e038df URL: http://source.winehq.org/git/wine.git/?a=commit;h=51c7df4f376fa7924752dc32a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 22 00:43:49 2016 +0200 wined3d: Use a single allocation for occlusion queries. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 63 +++++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 16 ++++++----- 2 files changed, 49 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 54e8bb1..3168c30 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -42,6 +42,11 @@ static struct wined3d_event_query *wined3d_event_query_from_query(struct wined3d return CONTAINING_RECORD(query, struct wined3d_event_query, query); } +static struct wined3d_occlusion_query *wined3d_occlusion_query_from_query(struct wined3d_query *query) +{ + return CONTAINING_RECORD(query, struct wined3d_occlusion_query, query); +} + BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) { return gl_info->supported[ARB_SYNC] || gl_info->supported[NV_FENCE] || gl_info->supported[APPLE_FENCE]; @@ -265,10 +270,12 @@ static void wined3d_query_destroy_object(void *object) } else if (query->type == WINED3D_QUERY_TYPE_OCCLUSION) { - struct wined3d_occlusion_query *oq = query->extendedData; + struct wined3d_occlusion_query *oq = wined3d_occlusion_query_from_query(query); - if (oq->context) context_free_occlusion_query(oq); - HeapFree(GetProcessHeap(), 0, query->extendedData); + if (oq->context) + context_free_occlusion_query(oq); + HeapFree(GetProcessHeap(), 0, oq); + return; } else if (query->type == WINED3D_QUERY_TYPE_TIMESTAMP) { @@ -325,7 +332,7 @@ static void fill_query_data(void *out, unsigned int out_size, const void *result static HRESULT wined3d_occlusion_query_ops_get_data(struct wined3d_query *query, void *data, DWORD size, DWORD flags) { - struct wined3d_occlusion_query *oq = query->extendedData; + struct wined3d_occlusion_query *oq = wined3d_occlusion_query_from_query(query); struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_context *context; @@ -469,7 +476,7 @@ static HRESULT wined3d_event_query_ops_issue(struct wined3d_query *query, DWORD static HRESULT wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD flags) { - struct wined3d_occlusion_query *oq = query->extendedData; + struct wined3d_occlusion_query *oq = wined3d_occlusion_query_from_query(query); struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_context *context; @@ -706,6 +713,31 @@ static const struct wined3d_query_ops occlusion_query_ops = wined3d_occlusion_query_ops_issue, }; +static HRESULT wined3d_occlusion_query_create(struct wined3d_device *device, + enum wined3d_query_type type, void *parent, struct wined3d_query **query) +{ + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + struct wined3d_occlusion_query *object; + + TRACE("device %p, type %#x, parent %p, query %p.\n", device, type, parent, query); + + if (!gl_info->supported[ARB_OCCLUSION_QUERY]) + { + WARN("Unsupported in local OpenGL implementation: ARB_OCCLUSION_QUERY.\n"); + return WINED3DERR_NOTAVAILABLE; + } + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + wined3d_query_init(&object->query, device, type, sizeof(DWORD), &occlusion_query_ops, parent); + + TRACE("Created query %p.\n", object); + *query = &object->query; + + return WINED3D_OK; +} + static const struct wined3d_query_ops timestamp_query_ops = { wined3d_timestamp_query_ops_get_data, @@ -727,24 +759,6 @@ static HRESULT query_init(struct wined3d_query *query, struct wined3d_device *de switch (type) { - case WINED3D_QUERY_TYPE_OCCLUSION: - TRACE("Occlusion query.\n"); - if (!gl_info->supported[ARB_OCCLUSION_QUERY]) - { - WARN("Unsupported in local OpenGL implementation: ARB_OCCLUSION_QUERY.\n"); - return WINED3DERR_NOTAVAILABLE; - } - query->query_ops = &occlusion_query_ops; - query->data_size = sizeof(DWORD); - query->extendedData = HeapAlloc(GetProcessHeap(), 0, sizeof(struct wined3d_occlusion_query)); - if (!query->extendedData) - { - ERR("Failed to allocate occlusion query extended data.\n"); - return E_OUTOFMEMORY; - } - ((struct wined3d_occlusion_query *)query->extendedData)->context = NULL; - break; - case WINED3D_QUERY_TYPE_TIMESTAMP: TRACE("Timestamp query.\n"); if (!gl_info->supported[ARB_TIMER_QUERY]) @@ -812,6 +826,9 @@ HRESULT CDECL wined3d_query_create(struct wined3d_device *device, case WINED3D_QUERY_TYPE_EVENT: return wined3d_event_query_create(device, type, parent, query); + case WINED3D_QUERY_TYPE_OCCLUSION: + return wined3d_occlusion_query_create(device, type, parent, query); + default: break; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6f49b1f..f7d1948 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1397,13 +1397,6 @@ struct wined3d_query void *extendedData; }; -struct wined3d_occlusion_query -{ - struct list entry; - GLuint id; - struct wined3d_context *context; -}; - union wined3d_gl_query_object { GLuint id; @@ -1434,6 +1427,15 @@ enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_ void wined3d_event_query_issue(struct wined3d_event_query *query, const struct wined3d_device *device) DECLSPEC_HIDDEN; BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; +struct wined3d_occlusion_query +{ + struct wined3d_query query; + + struct list entry; + GLuint id; + struct wined3d_context *context; +}; + struct wined3d_timestamp_query { struct list entry;

1 0

Henri Verbeet : wined3d: Use a single allocation for event queries.
by Alexandre Julliard July 22, 2016

July 22, 2016

Module: wine Branch: master Commit: fac012f2e114870c9628e5ea5b5c8312284c0f3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fac012f2e114870c9628e5ea5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 22 00:43:48 2016 +0200 wined3d: Use a single allocation for event queries. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 81 +++++++++++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 61 ++++++++++++++++--------------- 2 files changed, 89 insertions(+), 53 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 6b3a990..54e8bb1 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -25,6 +25,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); +static void wined3d_query_init(struct wined3d_query *query, struct wined3d_device *device, + enum wined3d_query_type type, DWORD data_size, const struct wined3d_query_ops *query_ops, void *parent) +{ + query->ref = 1; + query->parent = parent; + query->device = device; + query->state = QUERY_CREATED; + query->type = type; + query->data_size = data_size; + query->query_ops = query_ops; +} + +static struct wined3d_event_query *wined3d_event_query_from_query(struct wined3d_query *query) +{ + return CONTAINING_RECORD(query, struct wined3d_event_query, query); +} + BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) { return gl_info->supported[ARB_SYNC] || gl_info->supported[NV_FENCE] || gl_info->supported[APPLE_FENCE]; @@ -243,8 +260,8 @@ static void wined3d_query_destroy_object(void *object) * context, and (still) leaking the actual query. */ if (query->type == WINED3D_QUERY_TYPE_EVENT) { - struct wined3d_event_query *event_query = query->extendedData; - wined3d_event_query_destroy(event_query); + wined3d_event_query_destroy(wined3d_event_query_from_query(query)); + return; } else if (query->type == WINED3D_QUERY_TYPE_OCCLUSION) { @@ -375,9 +392,9 @@ static HRESULT wined3d_occlusion_query_ops_get_data(struct wined3d_query *query, static HRESULT wined3d_event_query_ops_get_data(struct wined3d_query *query, void *data, DWORD size, DWORD flags) { - struct wined3d_event_query *event_query = query->extendedData; - BOOL signaled; + struct wined3d_event_query *event_query = wined3d_event_query_from_query(query); enum wined3d_event_query_result ret; + BOOL signaled; TRACE("query %p, data %p, size %#x, flags %#x.\n", query, data, size, flags); @@ -430,16 +447,15 @@ static HRESULT wined3d_event_query_ops_issue(struct wined3d_query *query, DWORD { TRACE("query %p, flags %#x.\n", query, flags); - TRACE("(%p) : flags %#x, type D3DQUERY_EVENT\n", query, flags); if (flags & WINED3DISSUE_END) { - struct wined3d_event_query *event_query = query->extendedData; + struct wined3d_event_query *event_query = wined3d_event_query_from_query(query); wined3d_event_query_issue(event_query, query->device); } else if (flags & WINED3DISSUE_BEGIN) { - /* Started implicitly at device creation */ + /* Started implicitly at query creation. */ ERR("Event query issued with START flag - what to do?\n"); } @@ -659,6 +675,31 @@ static const struct wined3d_query_ops event_query_ops = wined3d_event_query_ops_issue, }; +static HRESULT wined3d_event_query_create(struct wined3d_device *device, + enum wined3d_query_type type, void *parent, struct wined3d_query **query) +{ + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + struct wined3d_event_query *object; + + TRACE("device %p, type %#x, parent %p, query %p.\n", device, type, parent, query); + + if (!wined3d_event_query_supported(gl_info)) + { + WARN("Event queries not supported.\n"); + return WINED3DERR_NOTAVAILABLE; + } + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + wined3d_query_init(&object->query, device, type, sizeof(BOOL), &event_query_ops, parent); + + TRACE("Created query %p.\n", object); + *query = &object->query; + + return WINED3D_OK; +} + static const struct wined3d_query_ops occlusion_query_ops = { wined3d_occlusion_query_ops_get_data, @@ -704,23 +745,6 @@ static HRESULT query_init(struct wined3d_query *query, struct wined3d_device *de ((struct wined3d_occlusion_query *)query->extendedData)->context = NULL; break; - case WINED3D_QUERY_TYPE_EVENT: - TRACE("Event query.\n"); - if (!wined3d_event_query_supported(gl_info)) - { - WARN("Event queries not supported.\n"); - return WINED3DERR_NOTAVAILABLE; - } - query->query_ops = &event_query_ops; - query->data_size = sizeof(BOOL); - query->extendedData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct wined3d_event_query)); - if (!query->extendedData) - { - ERR("Failed to allocate event query memory.\n"); - return E_OUTOFMEMORY; - } - break; - case WINED3D_QUERY_TYPE_TIMESTAMP: TRACE("Timestamp query.\n"); if (!gl_info->supported[ARB_TIMER_QUERY]) @@ -783,6 +807,15 @@ HRESULT CDECL wined3d_query_create(struct wined3d_device *device, TRACE("device %p, type %#x, parent %p, query %p.\n", device, type, parent, query); + switch (type) + { + case WINED3D_QUERY_TYPE_EVENT: + return wined3d_event_query_create(device, type, parent, query); + + default: + break; + } + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return E_OUTOFMEMORY; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3c6c869..6f49b1f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1367,6 +1367,36 @@ enum fogsource { FOGSOURCE_COORD, }; +/* Direct3D terminology with little modifications. We do not have an issued + * state because only the driver knows about it, but we have a created state + * because D3D allows GetData() on a created query, but OpenGL doesn't. */ +enum wined3d_query_state +{ + QUERY_CREATED, + QUERY_SIGNALLED, + QUERY_BUILDING +}; + +struct wined3d_query_ops +{ + HRESULT (*query_get_data)(struct wined3d_query *query, void *data, DWORD data_size, DWORD flags); + HRESULT (*query_issue)(struct wined3d_query *query, DWORD flags); +}; + +struct wined3d_query +{ + LONG ref; + + void *parent; + struct wined3d_device *device; + enum wined3d_query_state state; + enum wined3d_query_type type; + DWORD data_size; + const struct wined3d_query_ops *query_ops; + + void *extendedData; +}; + struct wined3d_occlusion_query { struct list entry; @@ -1382,6 +1412,8 @@ union wined3d_gl_query_object struct wined3d_event_query { + struct wined3d_query query; + struct list entry; union wined3d_gl_query_object object; struct wined3d_context *context; @@ -3051,35 +3083,6 @@ static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d cs->ops->push_constants(cs, p, start_idx, count, constants); } -/* Direct3D terminology with little modifications. We do not have an issued state - * because only the driver knows about it, but we have a created state because d3d - * allows GetData on a created issue, but opengl doesn't - */ -enum query_state { - QUERY_CREATED, - QUERY_SIGNALLED, - QUERY_BUILDING -}; - -struct wined3d_query_ops -{ - HRESULT (*query_get_data)(struct wined3d_query *query, void *data, DWORD data_size, DWORD flags); - HRESULT (*query_issue)(struct wined3d_query *query, DWORD flags); -}; - -struct wined3d_query -{ - LONG ref; - - void *parent; - const struct wined3d_query_ops *query_ops; - struct wined3d_device *device; - enum query_state state; - enum wined3d_query_type type; - DWORD data_size; - void *extendedData; -}; - /* TODO: Add tests and support for FLOAT16_4 POSITIONT, D3DCOLOR position, other * fixed function semantics as D3DCOLOR or FLOAT16 */ enum wined3d_buffer_conversion_type

1 0

Henri Verbeet : wined3d: Get rid of redundant ARB_timer_query checks.
by Alexandre Julliard July 22, 2016

July 22, 2016

Module: wine Branch: master Commit: be2908ed071dd11de5dc2fae270aad15e5df7d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be2908ed071dd11de5dc2fae2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 22 00:43:47 2016 +0200 wined3d: Get rid of redundant ARB_timer_query checks. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 369951d..6b3a990 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -588,38 +588,29 @@ static HRESULT wined3d_timestamp_query_ops_get_data(struct wined3d_query *query, static HRESULT wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DWORD flags) { + struct wined3d_timestamp_query *tq = query->extendedData; struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + struct wined3d_context *context; TRACE("query %p, flags %#x.\n", query, flags); - if (gl_info->supported[ARB_TIMER_QUERY]) + if (flags & WINED3DISSUE_BEGIN) { - struct wined3d_timestamp_query *tq = query->extendedData; - struct wined3d_context *context; - - if (flags & WINED3DISSUE_BEGIN) - { - WARN("Ignoring WINED3DISSUE_BEGIN with a TIMESTAMP query.\n"); - } - if (flags & WINED3DISSUE_END) - { - if (tq->context) - context_free_timestamp_query(tq); - context = context_acquire(query->device, NULL); - context_alloc_timestamp_query(context, tq); - GL_EXTCALL(glQueryCounter(tq->id, GL_TIMESTAMP)); - checkGLcall("glQueryCounter()"); - context_release(context); - } + WARN("Ignoring WINED3DISSUE_BEGIN with a TIMESTAMP query.\n"); } - else + if (flags & WINED3DISSUE_END) { - ERR("Timestamp queries not supported.\n"); - } + if (tq->context) + context_free_timestamp_query(tq); + context = context_acquire(query->device, NULL); + context_alloc_timestamp_query(context, tq); + GL_EXTCALL(glQueryCounter(tq->id, GL_TIMESTAMP)); + checkGLcall("glQueryCounter()"); + context_release(context); - if (flags & WINED3DISSUE_END) query->state = QUERY_SIGNALLED; + } return WINED3D_OK; }

1 0

Alexandre Julliard : server: Avoid unaligned access when printing x86 floating point registers.
by Alexandre Julliard July 22, 2016

July 22, 2016

Module: wine Branch: master Commit: 0b933f1f4839e5e1a2dd2125547b5ecdf2b91e0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b933f1f4839e5e1a2dd21255… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 22 11:49:37 2016 +0900 server: Avoid unaligned access when printing x86 floating point registers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/trace.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/trace.c b/server/trace.c index d48c205..9286ebd 100644 --- a/server/trace.c +++ b/server/trace.c @@ -567,7 +567,11 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) fprintf( stderr, ",fp.data_off=%08x,fp.data_sel=%08x,fp.cr0npx=%08x", ctx.fp.i386_regs.data_off, ctx.fp.i386_regs.data_sel, ctx.fp.i386_regs.cr0npx ); for (i = 0; i < 8; i++) - fprintf( stderr, ",fp.reg%u=%Lg", i, *(long double *)&ctx.fp.i386_regs.regs[10*i] ); + { + long double reg = 0; + memcpy( &reg, &ctx.fp.i386_regs.regs[10 * i], 10 ); + fprintf( stderr, ",fp.reg%u=%Lg", i, reg ); + } } if (ctx.flags & SERVER_CTX_EXTENDED_REGISTERS) {

1 0

Henri Verbeet : wined3d: Fail event query creation when event queries are not supported.
by Alexandre Julliard July 21, 2016

July 21, 2016

Module: wine Branch: master Commit: d18ff87af9ef38b1fe10f0be6d04899da22ddfc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d18ff87af9ef38b1fe10f0be6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 21 15:57:59 2016 +0200 wined3d: Fail event query creation when event queries are not supported. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index c09fe86..0683731 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -732,11 +732,8 @@ static HRESULT query_init(struct wined3d_query *query, struct wined3d_device *de TRACE("Event query.\n"); if (!wined3d_event_query_supported(gl_info)) { - /* Half-Life 2 needs this query. It does not render the main - * menu correctly otherwise. Pretend to support it, faking - * this query does not do much harm except potentially - * lowering performance. */ - FIXME("Event query: Unimplemented, but pretending to be supported.\n"); + WARN("Event queries not supported.\n"); + return WINED3DERR_NOTAVAILABLE; } query->query_ops = &event_query_ops; query->data_size = sizeof(BOOL);

1 0

Henri Verbeet : wined3d: Get rid of redundant ARB_occlusion_query checks.
by Alexandre Julliard July 21, 2016

July 21, 2016

Module: wine Branch: master Commit: a02c7ce7518b19d401ae854f18d2401a489f60db URL: http://source.winehq.org/git/wine.git/?a=commit;h=a02c7ce7518b19d401ae854f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 21 15:58:00 2016 +0200 wined3d: Get rid of redundant ARB_occlusion_query checks. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 105 ++++++++++++++++++++++----------------------------- 1 file changed, 45 insertions(+), 60 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 0683731..369951d 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -337,14 +337,6 @@ static HRESULT wined3d_occlusion_query_ops_get_data(struct wined3d_query *query, return S_FALSE; } - if (!gl_info->supported[ARB_OCCLUSION_QUERY]) - { - WARN("%p Occlusion queries not supported. Returning 1.\n", query); - samples = 1; - fill_query_data(data, size, &samples, sizeof(samples)); - return S_OK; - } - if (oq->context->tid != GetCurrentThreadId()) { FIXME("%p Wrong thread, returning 1.\n", query); @@ -461,77 +453,70 @@ static HRESULT wined3d_event_query_ops_issue(struct wined3d_query *query, DWORD static HRESULT wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD flags) { + struct wined3d_occlusion_query *oq = query->extendedData; struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + struct wined3d_context *context; TRACE("query %p, flags %#x.\n", query, flags); - if (gl_info->supported[ARB_OCCLUSION_QUERY]) + /* This is allowed according to MSDN and our tests. Reset the query and + * restart. */ + if (flags & WINED3DISSUE_BEGIN) { - struct wined3d_occlusion_query *oq = query->extendedData; - struct wined3d_context *context; - - /* This is allowed according to msdn and our tests. Reset the query and restart */ - if (flags & WINED3DISSUE_BEGIN) + if (query->state == QUERY_BUILDING) { - if (query->state == QUERY_BUILDING) + if (oq->context->tid != GetCurrentThreadId()) { - if (oq->context->tid != GetCurrentThreadId()) - { - FIXME("Wrong thread, can't restart query.\n"); - - context_free_occlusion_query(oq); - context = context_acquire(query->device, NULL); - context_alloc_occlusion_query(context, oq); - } - else - { - context = context_acquire(device, context_get_rt_surface(oq->context)); - - GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); - checkGLcall("glEndQuery()"); - } + FIXME("Wrong thread, can't restart query.\n"); + + context_free_occlusion_query(oq); + context = context_acquire(query->device, NULL); + context_alloc_occlusion_query(context, oq); } else { - if (oq->context) context_free_occlusion_query(oq); - context = context_acquire(query->device, NULL); - context_alloc_occlusion_query(context, oq); + context = context_acquire(device, context_get_rt_surface(oq->context)); + + GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); + checkGLcall("glEndQuery()"); } + } + else + { + if (oq->context) + context_free_occlusion_query(oq); + context = context_acquire(query->device, NULL); + context_alloc_occlusion_query(context, oq); + } - GL_EXTCALL(glBeginQuery(GL_SAMPLES_PASSED, oq->id)); - checkGLcall("glBeginQuery()"); + GL_EXTCALL(glBeginQuery(GL_SAMPLES_PASSED, oq->id)); + checkGLcall("glBeginQuery()"); - context_release(context); - } - if (flags & WINED3DISSUE_END) + context_release(context); + } + if (flags & WINED3DISSUE_END) + { + /* MSDN says END on a non-building occlusion query returns an error, + * but our tests show that it returns OK. But OpenGL doesn't like it, + * so avoid generating an error. */ + if (query->state == QUERY_BUILDING) { - /* Msdn says _END on a non-building occlusion query returns an error, but - * our tests show that it returns OK. But OpenGL doesn't like it, so avoid - * generating an error - */ - if (query->state == QUERY_BUILDING) + if (oq->context->tid != GetCurrentThreadId()) + { + FIXME("Wrong thread, can't end query.\n"); + } + else { - if (oq->context->tid != GetCurrentThreadId()) - { - FIXME("Wrong thread, can't end query.\n"); - } - else - { - context = context_acquire(device, context_get_rt_surface(oq->context)); - - GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); - checkGLcall("glEndQuery()"); - - context_release(context); - } + context = context_acquire(device, context_get_rt_surface(oq->context)); + + GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); + checkGLcall("glEndQuery()"); + + context_release(context); } } } - else - { - FIXME("%p Occlusion queries not supported.\n", query); - } if (flags & WINED3DISSUE_BEGIN) query->state = QUERY_BUILDING;

1 0

Henri Verbeet : wined3d: Get rid of redundant NULL checks for event query "extendedData".
by Alexandre Julliard July 21, 2016

July 21, 2016

Module: wine Branch: master Commit: 0a5e205c06e0f0ccf632e02a48e86a386a4884e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a5e205c06e0f0ccf632e02a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 21 15:57:58 2016 +0200 wined3d: Get rid of redundant NULL checks for event query "extendedData". If creation succeeded this is non-NULL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index c8d6b47..c09fe86 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -244,7 +244,7 @@ static void wined3d_query_destroy_object(void *object) if (query->type == WINED3D_QUERY_TYPE_EVENT) { struct wined3d_event_query *event_query = query->extendedData; - if (event_query) wined3d_event_query_destroy(event_query); + wined3d_event_query_destroy(event_query); } else if (query->type == WINED3D_QUERY_TYPE_OCCLUSION) { @@ -389,14 +389,8 @@ static HRESULT wined3d_event_query_ops_get_data(struct wined3d_query *query, TRACE("query %p, data %p, size %#x, flags %#x.\n", query, data, size, flags); - if (!data || !size) return S_OK; - if (!event_query) - { - WARN("Event query not supported by GL, reporting GPU idle.\n"); - signaled = TRUE; - fill_query_data(data, size, &signaled, sizeof(signaled)); + if (!data || !size) return S_OK; - } ret = wined3d_event_query_test(event_query, query->device); switch(ret) @@ -449,9 +443,6 @@ static HRESULT wined3d_event_query_ops_issue(struct wined3d_query *query, DWORD { struct wined3d_event_query *event_query = query->extendedData; - /* Faked event query support */ - if (!event_query) return WINED3D_OK; - wined3d_event_query_issue(event_query, query->device); } else if (flags & WINED3DISSUE_BEGIN)

1 0