Re: Support for D3DQUERY_TIMESTAMP* queries...

2011-05-27 Thread Adam Martinson
(hr = IDirect3DQuery9_GetData(q_disjoint, &ts_dj, sizeof(ts_dj), D3DGETDATA_FLUSH)) == S_FALSE && j < 500; ++j) +{ +Sleep(10); +} +ok(hr == S_OK, "Timestampdisjoint query failed: %08x\n", hr); + ok((ts2 < ts1 || freq1 != freq2) == ts_dj, "Timestamps d

Re: Support for D3DQUERY_TIMESTAMP* queries...

2011-05-17 Thread Adam Martinson
p1); +if (qTimestamp2) IDirect3DQuery9_Release(qTimestamp2); +if (qTimestampfreq) IDirect3DQuery9_Release(qTimestampfreq); +if (qTimestampdisjoint) IDirect3DQuery9_Release(qTimestampdisjoint); +if (pDevice) +{ +UINT refcount = IDirect3DDevice9_Release(pDevice); + ok(!refcount, "Devi

Re: Support for D3DQUERY_TIMESTAMP* queries...

2011-05-09 Thread Henri Verbeet
On 4 May 2011 20:38, Adam Martinson wrote: > OK, I think I addressed those issues, let me know how these look. > > +#define GL_TIME_ELAPSED_ARB 0x88BF > +#define GL_TIMESTAMP_ARB0x8E28 Most of wined3d uses lowercase hex literals.

Re: Support for D3DQUERY_TIMESTAMP* queries...

2011-05-04 Thread Adam Martinson
device, UINT rt_count, struct wined3d_surface **rts, struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; @@ -1220,6 +1236,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, stru void context_destroy(IWineD3DDeviceImpl *This, struct wined3d_context *context)

Re: Support for D3DQUERY_TIMESTAMP* queries...

2011-05-03 Thread Henri Verbeet
On 3 May 2011 16:51, Adam Martinson wrote: > Feedback please. This is in addition to what Stefan already said: > +/* GL_ARB_timer_query */ > +#ifndef GL_ARB_timer_query > +#define GL_ARB_timer_query 1 > +#define GL_TIME_ELAPSED_ARB 0x88BF > +#define GL_TIMESTAMP_A

Re: Support for D3DQUERY_TIMESTAMP* queries...

2011-05-03 Thread Stefan Dösinger
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Am 03.05.2011 um 16:51 schrieb Adam Martinson: > +#ifndef WINE_NO_TRACE_MSGS > +for (; i < query->n_ids; ++i) > +TRACE("Allocated timestamp query %u in context %p.\n", > query->ids[i], context); > +#endif use if(TRACE_ON(d3d)) ins

Support for D3DQUERY_TIMESTAMP* queries...

2011-05-03 Thread Adam Martinson
irect3DQuery9_Release(qTimestampfreq); +if (qTimestampdisjoint) IDirect3DQuery9_Release(qTimestampdisjoint); +if (pDevice) +{ +UINT refcount = IDirect3DDevice9_Release(pDevice); +ok(!refcount, "Device has %u references left.\n", refcount); +} +} + START_TEST