diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-29 11:28:12 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-29 11:28:12 +0100 |
| commit | 52cd3051ba15ddda117f8d8cae1979cd3c86f5b6 (patch) | |
| tree | fbfed14bbfb67daadbff4b0a77b2f6587ffc71d5 /mesalib/src/gallium/auxiliary | |
| parent | 7a80ea1b5dd2eb54717fdcc427912a9764e7719f (diff) | |
| parent | c043f97a8572e1f509251288d8bcd70d0fb96770 (diff) | |
| download | vcxsrv-52cd3051ba15ddda117f8d8cae1979cd3c86f5b6.tar.gz vcxsrv-52cd3051ba15ddda117f8d8cae1979cd3c86f5b6.tar.bz2 vcxsrv-52cd3051ba15ddda117f8d8cae1979cd3c86f5b6.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver git update 29 Nov 2013
Diffstat (limited to 'mesalib/src/gallium/auxiliary')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_dump.h | 3 | ||||
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_dump_defines.c | 33 |
2 files changed, 36 insertions, 0 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_dump.h b/mesalib/src/gallium/auxiliary/util/u_dump.h index 71750a635..58e7dfd82 100644 --- a/mesalib/src/gallium/auxiliary/util/u_dump.h +++ b/mesalib/src/gallium/auxiliary/util/u_dump.h @@ -85,6 +85,9 @@ util_dump_tex_mipfilter(unsigned value, boolean shortened); const char * util_dump_tex_filter(unsigned value, boolean shortened); +const char * +util_dump_query_type(unsigned value, boolean shortened); + /* * p_state.h, through a FILE diff --git a/mesalib/src/gallium/auxiliary/util/u_dump_defines.c b/mesalib/src/gallium/auxiliary/util/u_dump_defines.c index cc6268773..03fd15d0c 100644 --- a/mesalib/src/gallium/auxiliary/util/u_dump_defines.c +++ b/mesalib/src/gallium/auxiliary/util/u_dump_defines.c @@ -359,3 +359,36 @@ util_dump_tex_filter_short_names[] = { }; DEFINE_UTIL_DUMP_CONTINUOUS(tex_filter) + + +static const char * +util_dump_query_type_names[] = { + "PIPE_QUERY_OCCLUSION_COUNTER", + "PIPE_QUERY_OCCLUSION_PREDICATE", + "PIPE_QUERY_TIMESTAMP", + "PIPE_QUERY_TIMESTAMP_DISJOINT", + "PIPE_QUERY_TIME_ELAPSED", + "PIPE_QUERY_PRIMITIVES_GENERATED", + "PIPE_QUERY_PRIMITIVES_EMITTED", + "PIPE_QUERY_SO_STATISTICS", + "PIPE_QUERY_SO_OVERFLOW_PREDICATE", + "PIPE_QUERY_GPU_FINISHED", + "PIPE_QUERY_PIPELINE_STATISTICS", +}; + +static const char * +util_dump_query_type_short_names[] = { + "occlusion_counter", + "occlusion_predicate", + "timestamp", + "timestamp_disjoint", + "time_elapsed", + "primitives_generated", + "primitives_emitted", + "so_statistics", + "so_overflow_predicate", + "gpu_finished", + "pipeline_statistics", +}; + +DEFINE_UTIL_DUMP_CONTINUOUS(query_type) |