diff options
author | marha <marha@users.sourceforge.net> | 2013-11-19 07:52:09 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-11-19 07:52:09 +0100 |
commit | 73db05c85f7a8cf2439f7c333ede6ff2dc4877d7 (patch) | |
tree | 99d99330efd4e8270d3c40a58a3b1576d9780f75 /mesalib/src/mesa/main/performance_monitor.c | |
parent | 7c20de6c7fb53ed404d4df0d975328318810ce01 (diff) | |
download | vcxsrv-73db05c85f7a8cf2439f7c333ede6ff2dc4877d7.tar.gz vcxsrv-73db05c85f7a8cf2439f7c333ede6ff2dc4877d7.tar.bz2 vcxsrv-73db05c85f7a8cf2439f7c333ede6ff2dc4877d7.zip |
libxcb xcb-proto xserver mesa git update 19 nov 2013
xserver commit da9997f89f14ab619f244d5b2e80a423b028c789
libxcb commit 5d1dbb468bb0f834eaa8adea6daf6729808ca429
libxcb/xcb-proto commit 281790373e625cc1e9f67b39fe0d687f279edbfb
mesa commit 21ae5135dd30bbd2ec7d2b44e07b6cb1d6425d9e
Diffstat (limited to 'mesalib/src/mesa/main/performance_monitor.c')
-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. */ |