aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mesa/main/formats.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index 5b420bf59de..370859d37ca 100644
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -477,20 +477,18 @@ format_array_format_table_init(void)
if (!info || !info->ArrayFormat)
continue;
+ /* All sRGB formats should have an equivalent UNORM format, and that's
+ * the one we want in the table.
+ */
+ if (_mesa_is_format_srgb(f))
+ continue;
+
#if UTIL_ARCH_LITTLE_ENDIAN
array_format = info->ArrayFormat;
#else
array_format = _mesa_array_format_flip_channels(info->ArrayFormat);
#endif
- /* This can happen and does for some of the BGR formats. Let's take
- * the first one in the list.
- */
- if (_mesa_hash_table_search_pre_hashed(format_array_format_table,
- array_format,
- (void *)(intptr_t)array_format))
- continue;
-
_mesa_hash_table_insert_pre_hashed(format_array_format_table,
array_format,
(void *)(intptr_t)array_format,