diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-27 10:48:05 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-27 10:48:05 +0100 |
| commit | 9bed5520560f553ac8ad4985ed41b31499d903fc (patch) | |
| tree | e7e6587df3f87e4d5398da78a6b0761171da7d68 /mesalib/src/gallium/auxiliary/util/u_dump_defines.c | |
| parent | b14c3b05e45201bbbbb3a4beba260c3d6ff31003 (diff) | |
| parent | c74ef795c7282681616decc36a9a81cd1b1b6ec7 (diff) | |
| download | vcxsrv-9bed5520560f553ac8ad4985ed41b31499d903fc.tar.gz vcxsrv-9bed5520560f553ac8ad4985ed41b31499d903fc.tar.bz2 vcxsrv-9bed5520560f553ac8ad4985ed41b31499d903fc.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 mesa pixman xkeyboard-config
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util/u_dump_defines.c')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_dump_defines.c | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_dump_defines.c b/mesalib/src/gallium/auxiliary/util/u_dump_defines.c index 692d4447c..cc6268773 100644 --- a/mesalib/src/gallium/auxiliary/util/u_dump_defines.c +++ b/mesalib/src/gallium/auxiliary/util/u_dump_defines.c @@ -73,6 +73,23 @@ util_dump_enum_continuous(unsigned value, } +/** + * Same as DEFINE_UTIL_DUMP_CONTINUOUS but with static assertions to detect + * failures to update lists. + */ +#define DEFINE_UTIL_DUMP_CONTINUOUS_COUNT(_name, _count) \ + const char * \ + util_dump_##_name(unsigned value, boolean shortened) \ + { \ + STATIC_ASSERT(Elements(util_dump_##_name##_names) == _count); \ + STATIC_ASSERT(Elements(util_dump_##_name##_short_names) == _count); \ + if(shortened) \ + return util_dump_enum_continuous(value, Elements(util_dump_##_name##_short_names), util_dump_##_name##_short_names); \ + else \ + return util_dump_enum_continuous(value, Elements(util_dump_##_name##_names), util_dump_##_name##_names); \ + } + + static const char * util_dump_blend_factor_names[] = { UTIL_DUMP_INVALID_NAME, /* 0x0 */ @@ -262,7 +279,11 @@ util_dump_tex_target_names[] = { "PIPE_TEXTURE_1D", "PIPE_TEXTURE_2D", "PIPE_TEXTURE_3D", - "PIPE_TEXTURE_CUBE" + "PIPE_TEXTURE_CUBE", + "PIPE_TEXTURE_RECT", + "PIPE_TEXTURE_1D_ARRAY", + "PIPE_TEXTURE_2D_ARRAY", + "PIPE_TEXTURE_CUBE_ARRAY", }; static const char * @@ -271,10 +292,14 @@ util_dump_tex_target_short_names[] = { "1d", "2d", "3d", - "cube" + "cube", + "rect", + "1d_array", + "2d_array", + "cube_array", }; -DEFINE_UTIL_DUMP_CONTINUOUS(tex_target) +DEFINE_UTIL_DUMP_CONTINUOUS_COUNT(tex_target, PIPE_MAX_TEXTURE_TYPES) static const char * |