RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vo_opengl: go back to using GL_TIME_ELAPSED 

Less flexible than GL_TIMESTAMP but supported by more platforms. This
will mean that nested queries have to be detected and silently omitted,
but oh well. Not much use for them anyway.

Fixes #4721.
This commit is contained in:
Niklas Haas 2017-08-08 17:06:45 +02:00
parent 7f9193b353
commit 6087f63003
No known key found for this signature in database
GPG Key ID: 9A09076581B27402
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
video/out/opengl/ra_gl.c
View File

@ -919,10 +919,10 @@ static void gl_renderpass_run(struct ra *ra,
#define GL_QUERY_OBJECT_NUM 8 #define GL_QUERY_OBJECT_NUM 8
struct gl_timer { struct gl_timer {
GLuint start[GL_QUERY_OBJECT_NUM]; GLuint query[GL_QUERY_OBJECT_NUM];
GLuint stop[GL_QUERY_OBJECT_NUM];
int idx; int idx;
uint64_t result; uint64_t result;
bool active;
}; };
static ra_timer *gl_timer_create(struct ra *ra) static ra_timer *gl_timer_create(struct ra *ra)
@ -933,8 +933,7 @@ static ra_timer *gl_timer_create(struct ra *ra)
return NULL; return NULL;
struct gl_timer *timer = talloc_zero(NULL, struct gl_timer); struct gl_timer *timer = talloc_zero(NULL, struct gl_timer);
gl->GenQueries(GL_QUERY_OBJECT_NUM, timer->start); gl->GenQueries(GL_QUERY_OBJECT_NUM, timer->query);
gl->GenQueries(GL_QUERY_OBJECT_NUM, timer->stop);
return (ra_timer *)timer; return (ra_timer *)timer;
} }
@ -947,35 +946,45 @@ static void gl_timer_destroy(struct ra *ra, ra_timer *ratimer)
GL *gl = ra_gl_get(ra); GL *gl = ra_gl_get(ra);
struct gl_timer *timer = ratimer; struct gl_timer *timer = ratimer;
gl->DeleteQueries(GL_QUERY_OBJECT_NUM, timer->start); gl->DeleteQueries(GL_QUERY_OBJECT_NUM, timer->query);
gl->DeleteQueries(GL_QUERY_OBJECT_NUM, timer->stop);
talloc_free(timer); talloc_free(timer);
} }
static void gl_timer_start(struct ra *ra, ra_timer *ratimer) static void gl_timer_start(struct ra *ra, ra_timer *ratimer)
{ {
GL *gl = ra_gl_get(ra); struct ra_gl *p = ra->priv;
GL *gl = p->gl;
struct gl_timer *timer = ratimer; struct gl_timer *timer = ratimer;
// GL_TIME_ELAPSED queries are not re-entrant, so just do nothing instead
// of crashing. Work-around for shitty GL limitations
if (p->timer_active)
return;
// If this query object already contains a result, we need to retrieve it // If this query object already contains a result, we need to retrieve it
timer->result = 0; timer->result = 0;
if (gl->IsQuery(timer->start[timer->idx])) { if (gl->IsQuery(timer->query[timer->idx])) {
uint64_t start = 0, stop = 0; gl->GetQueryObjectui64v(timer->query[timer->idx], GL_QUERY_RESULT,
gl->GetQueryObjectui64v(timer->start[timer->idx], GL_QUERY_RESULT, &start); &timer->result);
gl->GetQueryObjectui64v(timer->stop[timer->idx], GL_QUERY_RESULT, &stop);
timer->result = stop - start;
} }
gl->QueryCounter(timer->start[timer->idx], GL_TIMESTAMP); gl->BeginQuery(GL_TIME_ELAPSED, timer->query[timer->idx++]);
timer->idx %= GL_QUERY_OBJECT_NUM;
p->timer_active = timer->active = true;
} }
static uint64_t gl_timer_stop(struct ra *ra, ra_timer *ratimer) static uint64_t gl_timer_stop(struct ra *ra, ra_timer *ratimer)
{ {
GL *gl = ra_gl_get(ra); struct ra_gl *p = ra->priv;
GL *gl = p->gl;
struct gl_timer *timer = ratimer; struct gl_timer *timer = ratimer;
gl->QueryCounter(timer->stop[timer->idx++], GL_TIMESTAMP); if (!timer->active)
timer->idx %= GL_QUERY_OBJECT_NUM; return 0;
gl->EndQuery(GL_TIME_ELAPSED);
p->timer_active = timer->active = false;
return timer->result; return timer->result;
} }

1
video/out/opengl/ra_gl.h
View File

@ -8,6 +8,7 @@
struct ra_gl { struct ra_gl {
GL *gl; GL *gl;
bool debug_enable; bool debug_enable;
bool timer_active; // hack for GL_TIME_ELAPSED limitations
}; };
// For ra_tex.priv // For ra_tex.priv