Mesa (master): gallium: add new numeric types to pipe_query_result

[Martin Peres]

Module: Mesa
Branch: master
Commit: d5b2832c1151337d37217a30bcb55d7f90dd1b47
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d5b2832c1151337d37217a30bcb55d7f90dd1b47

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Wed Jul  9 13:00:37 2014 +0200

gallium: add new numeric types to pipe_query_result

This will be used by GL_AMD_performance_monitor.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Reviewed-by: Martin Peres <martin.peres at free.fr>

---

 src/gallium/include/pipe/p_defines.h |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
index 23c3830..b1df836 100644
--- a/src/gallium/include/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
@@ -733,8 +733,16 @@ union pipe_query_result
    /* PIPE_QUERY_TIME_ELAPSED */
    /* PIPE_QUERY_PRIMITIVES_GENERATED */
    /* PIPE_QUERY_PRIMITIVES_EMITTED */
+   /* PIPE_DRIVER_QUERY_TYPE_UINT64 */
    uint64_t u64;
 
+   /* PIPE_DRIVER_QUERY_TYPE_UINT */
+   uint32_t u32;
+
+   /* PIPE_DRIVER_QUERY_TYPE_FLOAT */
+   /* PIPE_DRIVER_QUERY_TYPE_PERCENTAGE */
+   float f;
+
    /* PIPE_QUERY_SO_STATISTICS */
    struct pipe_query_data_so_statistics so_statistics;