diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-19 07:53:39 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-19 07:53:39 +0100 |
| commit | f75616ac3e99a6bb814803c823cb34533b9fc328 (patch) | |
| tree | 83e9fff2bbf6c94df686a938d00858e0a06adcf0 /mesalib/src/mesa/main | |
| parent | cb043e6091c966fa8b772ec86fbc026ddcac9d87 (diff) | |
| parent | 73db05c85f7a8cf2439f7c333ede6ff2dc4877d7 (diff) | |
| download | vcxsrv-f75616ac3e99a6bb814803c823cb34533b9fc328.tar.gz vcxsrv-f75616ac3e99a6bb814803c823cb34533b9fc328.tar.bz2 vcxsrv-f75616ac3e99a6bb814803c823cb34533b9fc328.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxcb xcb-proto xserver mesa git update 19 nov 2013
Diffstat (limited to 'mesalib/src/mesa/main')
| -rw-r--r-- | mesalib/src/mesa/main/performance_monitor.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/performance_monitor.c b/mesalib/src/mesa/main/performance_monitor.c index 6491b4200..4981e6fb2 100644 --- a/mesalib/src/mesa/main/performance_monitor.c +++ b/mesalib/src/mesa/main/performance_monitor.c @@ -547,6 +547,7 @@ _mesa_GetPerfMonitorCounterDataAMD(GLuint monitor, GLenum pname, GET_CURRENT_CONTEXT(ctx); struct gl_perf_monitor_object *m = lookup_monitor(ctx, monitor); + bool result_available; if (m == NULL) { _mesa_error(ctx, GL_INVALID_VALUE, @@ -569,7 +570,7 @@ _mesa_GetPerfMonitorCounterDataAMD(GLuint monitor, GLenum pname, } /* If the monitor has never ended, there is no result. */ - bool result_available = m->Ended && + result_available = m->Ended && ctx->Driver.IsPerfMonitorResultAvailable(ctx, m); /* AMD appears to return 0 for all queries unless a result is available. */ |