fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-30 18:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glx/dri3: Implement LIBGL_SHOW_FPS=1 for DRI3/Present.

Browse source 
v2: Use the UST value provided in the PRESENT_COMPLETE_NOTIFY event
    rather than gettimeofday(), which gives us the presentation time
    instead of the time when SwapBuffers was called.  Suggested by
    Keith Packard.  This relies on the fact that the X DRI3/Present
    implementations use microseconds for UST.

v3: Properly ignore PresentCompleteKindMSCNotify; multiply in 64 bits
    (caught by Keith Packard).

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Keith Packard <keithp@keithp.com> [v3]
Reviewed-by: Marek Olšák <marek.olsak@amd.com> [v1]
This commit is contained in:
Kenneth Graunke 2014-03-14 18:53:42 -07:00
parent 62b07b934e
commit 26122e09a3
2 changed files with 36 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/glx/dri3_glx.c
View file

@ -361,12 +361,34 @@ dri3_create_drawable(struct glx_screen *base, XID xDrawable,
return &pdraw->base;
}
static void
show_fps(struct dri3_drawable *draw, uint64_t current_ust)
{
const uint64_t interval =
((struct dri3_screen *) draw->base.psc)->show_fps_interval;
draw->frames++;
/* DRI3+Present together uses microseconds for UST. */
if (draw->previous_ust + interval * 1000000 <= current_ust) {
if (draw->previous_ust) {
fprintf(stderr, "libGL: FPS = %.1f\n",
((uint64_t) draw->frames * 1000000) /
(double)(current_ust - draw->previous_ust));
}
draw->frames = 0;
draw->previous_ust = current_ust;
}
}
/*
* Process one Present event
*/
static void
dri3_handle_present_event(struct dri3_drawable *priv, xcb_present_generic_event_t *ge)
{
struct dri3_screen *psc = (struct dri3_screen *) priv->base.psc;
switch (ge->evtype) {
case XCB_PRESENT_CONFIGURE_NOTIFY: {
xcb_present_configure_notify_event_t *ce = (void *) ge;
@ -395,6 +417,9 @@ dri3_handle_present_event(struct dri3_drawable *priv, xcb_present_generic_event_
break;
}
dri3_update_num_back(priv);
if (psc->show_fps_interval)
show_fps(priv, ce->ust);
} else {
priv->recv_msc_serial = ce->serial;
}
@ -1830,7 +1855,7 @@ dri3_create_screen(int screen, struct glx_display * priv)
struct dri3_screen *psc;
__GLXDRIscreen *psp;
struct glx_config *configs = NULL, *visuals = NULL;
char *driverName, *deviceName;
char *driverName, *deviceName, *tmp;
int i;
psc = calloc(1, sizeof *psc);
@ -1969,6 +1994,11 @@ dri3_create_screen(int screen, struct glx_display * priv)
free(driverName);
free(deviceName);
tmp = getenv("LIBGL_SHOW_FPS");
psc->show_fps_interval = tmp ? atoi(tmp) : 0;
if (psc->show_fps_interval < 0)
psc->show_fps_interval = 0;
return &psc->base;
handle_error:

6
src/glx/dri3_priv.h
View file

@ -138,7 +138,7 @@ struct dri3_screen {
int fd;
int is_different_gpu;
Bool show_fps;
int show_fps_interval;
};
struct dri3_context
@ -198,6 +198,10 @@ struct dri3_drawable {
xcb_present_event_t eid;
xcb_gcontext_t gc;
xcb_special_event_t *special_event;
/* LIBGL_SHOW_FPS support */
uint64_t previous_ust;
unsigned frames;
};