fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

turnip: Fix GCC compiles.

Browse source 
Apparently GCC does not consider static const variables to be
integer constants, and hence the array size and the static assert
result in compile failures.

Fixes: 4b9f967cd1 "turnip: add a more complete format table"
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Kristian H. Kristensen <hoegsberg@chromium.org>
This commit is contained in:
Bas Nieuwenhuizen 2019-03-13 00:07:02 +01:00
parent d3386e73c5
commit e1161d2ea7
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/freedreno/vulkan/tu_formats.c
View file

@ -45,9 +45,7 @@
#define TU_FORMAT_TABLE(var) \
static const VkFormat var##_first = TU_FORMAT_TABLE_FIRST; \
static const VkFormat var##_last = TU_FORMAT_TABLE_LAST; \
static const size_t var##_count = \
TU_FORMAT_TABLE_LAST - TU_FORMAT_TABLE_FIRST + 1; \
static const struct tu_native_format var[var##_count]
static const struct tu_native_format var[TU_FORMAT_TABLE_LAST - TU_FORMAT_TABLE_FIRST + 1]
#undef TU_FORMAT_TABLE_FIRST
#undef TU_FORMAT_TABLE_LAST
@ -321,9 +319,8 @@ tu6_get_native_format(VkFormat format)
{
const struct tu_native_format *fmt = NULL;
static_assert(tu6_format_table0_first == 0, "");
if (format <= tu6_format_table0_last)
fmt = &tu6_format_table0[format];
if (format >= tu6_format_table0_first && format <= tu6_format_table0_last)
fmt = &tu6_format_table0[format - tu6_format_table0_first];
return (fmt && fmt->present) ? fmt : NULL;
}