Mesa (master): Plus 6b21d3c92e5878284c008edb68a0155edfcf89b4.
Michel Dänzer
daenzer at kemper.freedesktop.org
Tue Nov 24 09:04:28 UTC 2015
Module: Mesa
Branch: master
Commit: 2c07a5fe70676f6400e5915d3af23a598711dab0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2c07a5fe70676f6400e5915d3af23a598711dab0
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Tue Nov 24 15:40:52 2015 +0900
Plus 6b21d3c92e5878284c008edb68a0155edfcf89b4.
---
src/gallium/auxiliary/Makefile.sources | 2 +
src/gallium/auxiliary/util/u_format.csv | 30 ----
src/gallium/auxiliary/util/u_format.h | 65 +-------
src/gallium/auxiliary/util/u_format_pack.py | 2 +-
src/gallium/auxiliary/util/u_format_table.py | 10 +-
src/gallium/include/pipe/p_format.h | 30 ----
src/mesa/state_tracker/st_extensions.c | 32 +---
src/mesa/state_tracker/st_format.c | 231 --------------------------
8 files changed, 8 insertions(+), 394 deletions(-)
diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
index 6160192..82ef5ec 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -219,6 +219,8 @@ C_SOURCES := \
util/u_format.h \
util/u_format_etc.c \
util/u_format_etc.h \
+ util/u_format_fake.c \
+ util/u_format_fake.h \
util/u_format_latc.c \
util/u_format_latc.h \
util/u_format_other.c \
diff --git a/src/gallium/auxiliary/util/u_format.csv b/src/gallium/auxiliary/util/u_format.csv
index c26d733..d3b77e6 100644
--- a/src/gallium/auxiliary/util/u_format.csv
+++ b/src/gallium/auxiliary/util/u_format.csv
@@ -202,36 +202,6 @@ PIPE_FORMAT_BPTC_SRGBA , bptc, 4, 4, x128, , , , xyzw, sr
PIPE_FORMAT_BPTC_RGB_FLOAT , bptc, 4, 4, x128, , , , xyz1, rgb
PIPE_FORMAT_BPTC_RGB_UFLOAT , bptc, 4, 4, x128, , , , xyz1, rgb
-PIPE_FORMAT_ASTC_4x4 , astc, 4, 4, x128, , , , xyzw, rgb
-PIPE_FORMAT_ASTC_5x4 , astc, 5, 4, x128, , , , xyzw, rgb
-PIPE_FORMAT_ASTC_5x5 , astc, 5, 5, x128, , , , xyzw, rgb
-PIPE_FORMAT_ASTC_6x5 , astc, 6, 5, x128, , , , xyzw, rgb
-PIPE_FORMAT_ASTC_6x6 , astc, 6, 6, x128, , , , xyzw, rgb
-PIPE_FORMAT_ASTC_8x5 , astc, 8, 5, x128, , , , xyzw, rgb
-PIPE_FORMAT_ASTC_8x6 , astc, 8, 6, x128, , , , xyzw, rgb
-PIPE_FORMAT_ASTC_8x8 , astc, 8, 8, x128, , , , xyzw, rgb
-PIPE_FORMAT_ASTC_10x5 , astc,10, 5, x128, , , , xyzw, rgb
-PIPE_FORMAT_ASTC_10x6 , astc,10, 6, x128, , , , xyzw, rgb
-PIPE_FORMAT_ASTC_10x8 , astc,10, 8, x128, , , , xyzw, rgb
-PIPE_FORMAT_ASTC_10x10 , astc,10,10, x128, , , , xyzw, rgb
-PIPE_FORMAT_ASTC_12x10 , astc,12,10, x128, , , , xyzw, rgb
-PIPE_FORMAT_ASTC_12x12 , astc,12,12, x128, , , , xyzw, rgb
-
-PIPE_FORMAT_ASTC_4x4_SRGB , astc, 4, 4, x128, , , , xyzw, srgb
-PIPE_FORMAT_ASTC_5x4_SRGB , astc, 5, 4, x128, , , , xyzw, srgb
-PIPE_FORMAT_ASTC_5x5_SRGB , astc, 5, 5, x128, , , , xyzw, srgb
-PIPE_FORMAT_ASTC_6x5_SRGB , astc, 6, 5, x128, , , , xyzw, srgb
-PIPE_FORMAT_ASTC_6x6_SRGB , astc, 6, 6, x128, , , , xyzw, srgb
-PIPE_FORMAT_ASTC_8x5_SRGB , astc, 8, 5, x128, , , , xyzw, srgb
-PIPE_FORMAT_ASTC_8x6_SRGB , astc, 8, 6, x128, , , , xyzw, srgb
-PIPE_FORMAT_ASTC_8x8_SRGB , astc, 8, 8, x128, , , , xyzw, srgb
-PIPE_FORMAT_ASTC_10x5_SRGB , astc,10, 5, x128, , , , xyzw, srgb
-PIPE_FORMAT_ASTC_10x6_SRGB , astc,10, 6, x128, , , , xyzw, srgb
-PIPE_FORMAT_ASTC_10x8_SRGB , astc,10, 8, x128, , , , xyzw, srgb
-PIPE_FORMAT_ASTC_10x10_SRGB , astc,10,10, x128, , , , xyzw, srgb
-PIPE_FORMAT_ASTC_12x10_SRGB , astc,12,10, x128, , , , xyzw, srgb
-PIPE_FORMAT_ASTC_12x12_SRGB , astc,12,12, x128, , , , xyzw, srgb
-
# Straightforward D3D10-like formats (also used for
# vertex buffer element description)
#
diff --git a/src/gallium/auxiliary/util/u_format.h b/src/gallium/auxiliary/util/u_format.h
index ffdb864..a1b1b28 100644
--- a/src/gallium/auxiliary/util/u_format.h
+++ b/src/gallium/auxiliary/util/u_format.h
@@ -84,14 +84,9 @@ enum util_format_layout {
UTIL_FORMAT_LAYOUT_BPTC = 7,
/**
- * ASTC
- */
- UTIL_FORMAT_LAYOUT_ASTC = 8,
-
- /**
* Everything else that doesn't fit in any of the above layouts.
*/
- UTIL_FORMAT_LAYOUT_OTHER = 9
+ UTIL_FORMAT_LAYOUT_OTHER = 8
};
@@ -486,7 +481,6 @@ util_format_is_compressed(enum pipe_format format)
case UTIL_FORMAT_LAYOUT_RGTC:
case UTIL_FORMAT_LAYOUT_ETC:
case UTIL_FORMAT_LAYOUT_BPTC:
- case UTIL_FORMAT_LAYOUT_ASTC:
/* XXX add other formats in the future */
return TRUE;
default:
@@ -930,35 +924,6 @@ util_format_srgb(enum pipe_format format)
return PIPE_FORMAT_B5G6R5_SRGB;
case PIPE_FORMAT_BPTC_RGBA_UNORM:
return PIPE_FORMAT_BPTC_SRGBA;
- case PIPE_FORMAT_ASTC_4x4:
- return PIPE_FORMAT_ASTC_4x4_SRGB;
- case PIPE_FORMAT_ASTC_5x4:
- return PIPE_FORMAT_ASTC_5x4_SRGB;
- case PIPE_FORMAT_ASTC_5x5:
- return PIPE_FORMAT_ASTC_5x5_SRGB;
- case PIPE_FORMAT_ASTC_6x5:
- return PIPE_FORMAT_ASTC_6x5_SRGB;
- case PIPE_FORMAT_ASTC_6x6:
- return PIPE_FORMAT_ASTC_6x6_SRGB;
- case PIPE_FORMAT_ASTC_8x5:
- return PIPE_FORMAT_ASTC_8x5_SRGB;
- case PIPE_FORMAT_ASTC_8x6:
- return PIPE_FORMAT_ASTC_8x6_SRGB;
- case PIPE_FORMAT_ASTC_8x8:
- return PIPE_FORMAT_ASTC_8x8_SRGB;
- case PIPE_FORMAT_ASTC_10x5:
- return PIPE_FORMAT_ASTC_10x5_SRGB;
- case PIPE_FORMAT_ASTC_10x6:
- return PIPE_FORMAT_ASTC_10x6_SRGB;
- case PIPE_FORMAT_ASTC_10x8:
- return PIPE_FORMAT_ASTC_10x8_SRGB;
- case PIPE_FORMAT_ASTC_10x10:
- return PIPE_FORMAT_ASTC_10x10_SRGB;
- case PIPE_FORMAT_ASTC_12x10:
- return PIPE_FORMAT_ASTC_12x10_SRGB;
- case PIPE_FORMAT_ASTC_12x12:
- return PIPE_FORMAT_ASTC_12x12_SRGB;
-
default:
return PIPE_FORMAT_NONE;
}
@@ -1006,34 +971,6 @@ util_format_linear(enum pipe_format format)
return PIPE_FORMAT_B5G6R5_UNORM;
case PIPE_FORMAT_BPTC_SRGBA:
return PIPE_FORMAT_BPTC_RGBA_UNORM;
- case PIPE_FORMAT_ASTC_4x4_SRGB:
- return PIPE_FORMAT_ASTC_4x4;
- case PIPE_FORMAT_ASTC_5x4_SRGB:
- return PIPE_FORMAT_ASTC_5x4;
- case PIPE_FORMAT_ASTC_5x5_SRGB:
- return PIPE_FORMAT_ASTC_5x5;
- case PIPE_FORMAT_ASTC_6x5_SRGB:
- return PIPE_FORMAT_ASTC_6x5;
- case PIPE_FORMAT_ASTC_6x6_SRGB:
- return PIPE_FORMAT_ASTC_6x6;
- case PIPE_FORMAT_ASTC_8x5_SRGB:
- return PIPE_FORMAT_ASTC_8x5;
- case PIPE_FORMAT_ASTC_8x6_SRGB:
- return PIPE_FORMAT_ASTC_8x6;
- case PIPE_FORMAT_ASTC_8x8_SRGB:
- return PIPE_FORMAT_ASTC_8x8;
- case PIPE_FORMAT_ASTC_10x5_SRGB:
- return PIPE_FORMAT_ASTC_10x5;
- case PIPE_FORMAT_ASTC_10x6_SRGB:
- return PIPE_FORMAT_ASTC_10x6;
- case PIPE_FORMAT_ASTC_10x8_SRGB:
- return PIPE_FORMAT_ASTC_10x8;
- case PIPE_FORMAT_ASTC_10x10_SRGB:
- return PIPE_FORMAT_ASTC_10x10;
- case PIPE_FORMAT_ASTC_12x10_SRGB:
- return PIPE_FORMAT_ASTC_12x10;
- case PIPE_FORMAT_ASTC_12x12_SRGB:
- return PIPE_FORMAT_ASTC_12x12;
default:
return format;
}
diff --git a/src/gallium/auxiliary/util/u_format_pack.py b/src/gallium/auxiliary/util/u_format_pack.py
index d4bb1de..fb42de7 100644
--- a/src/gallium/auxiliary/util/u_format_pack.py
+++ b/src/gallium/auxiliary/util/u_format_pack.py
@@ -686,7 +686,7 @@ def generate_format_fetch(format, dst_channel, dst_native_type, dst_suffix):
def is_format_hand_written(format):
- return format.layout in ('s3tc', 'rgtc', 'etc', 'bptc', 'astc', 'subsampled', 'other') or format.colorspace == ZS
+ return format.layout in ('s3tc', 'rgtc', 'etc', 'bptc', 'subsampled', 'other') or format.colorspace == ZS
def generate(formats):
diff --git a/src/gallium/auxiliary/util/u_format_table.py b/src/gallium/auxiliary/util/u_format_table.py
index 879d10f..aceb0ca 100755
--- a/src/gallium/auxiliary/util/u_format_table.py
+++ b/src/gallium/auxiliary/util/u_format_table.py
@@ -90,6 +90,7 @@ def write_format_table(formats):
print '#include "u_format_rgtc.h"'
print '#include "u_format_latc.h"'
print '#include "u_format_etc.h"'
+ print '#include "u_format_fake.h"'
print
u_format_pack.generate(formats)
@@ -138,15 +139,10 @@ def write_format_table(formats):
u_format_pack.print_channels(format, do_channel_array)
u_format_pack.print_channels(format, do_swizzle_array)
print " %s," % (colorspace_map(format.colorspace),)
- access = True
- if format.layout in ('bptc', 'astc'):
- access = False
- if format.layout == 'etc' and format.short_name() != 'etc1_rgb8':
- access = False
- if format.colorspace != ZS and not format.is_pure_color() and access:
+ if format.colorspace != ZS and not format.is_pure_color():
print " &util_format_%s_unpack_rgba_8unorm," % format.short_name()
print " &util_format_%s_pack_rgba_8unorm," % format.short_name()
- if format.layout == 's3tc' or format.layout == 'rgtc':
+ if format.layout == 's3tc' or format.layout == 'rgtc' or format.layout == 'bptc':
print " &util_format_%s_fetch_rgba_8unorm," % format.short_name()
else:
print " NULL, /* fetch_rgba_8unorm */"
diff --git a/src/gallium/include/pipe/p_format.h b/src/gallium/include/pipe/p_format.h
index d9c9f9b..5f0690e 100644
--- a/src/gallium/include/pipe/p_format.h
+++ b/src/gallium/include/pipe/p_format.h
@@ -359,36 +359,6 @@ enum pipe_format {
PIPE_FORMAT_ETC2_RG11_UNORM = 277,
PIPE_FORMAT_ETC2_RG11_SNORM = 278,
- PIPE_FORMAT_ASTC_4x4 = 279,
- PIPE_FORMAT_ASTC_5x4 = 280,
- PIPE_FORMAT_ASTC_5x5 = 281,
- PIPE_FORMAT_ASTC_6x5 = 282,
- PIPE_FORMAT_ASTC_6x6 = 283,
- PIPE_FORMAT_ASTC_8x5 = 284,
- PIPE_FORMAT_ASTC_8x6 = 285,
- PIPE_FORMAT_ASTC_8x8 = 286,
- PIPE_FORMAT_ASTC_10x5 = 287,
- PIPE_FORMAT_ASTC_10x6 = 288,
- PIPE_FORMAT_ASTC_10x8 = 289,
- PIPE_FORMAT_ASTC_10x10 = 290,
- PIPE_FORMAT_ASTC_12x10 = 291,
- PIPE_FORMAT_ASTC_12x12 = 292,
-
- PIPE_FORMAT_ASTC_4x4_SRGB = 293,
- PIPE_FORMAT_ASTC_5x4_SRGB = 294,
- PIPE_FORMAT_ASTC_5x5_SRGB = 295,
- PIPE_FORMAT_ASTC_6x5_SRGB = 296,
- PIPE_FORMAT_ASTC_6x6_SRGB = 297,
- PIPE_FORMAT_ASTC_8x5_SRGB = 298,
- PIPE_FORMAT_ASTC_8x6_SRGB = 299,
- PIPE_FORMAT_ASTC_8x8_SRGB = 300,
- PIPE_FORMAT_ASTC_10x5_SRGB = 301,
- PIPE_FORMAT_ASTC_10x6_SRGB = 302,
- PIPE_FORMAT_ASTC_10x8_SRGB = 303,
- PIPE_FORMAT_ASTC_10x10_SRGB = 304,
- PIPE_FORMAT_ASTC_12x10_SRGB = 305,
- PIPE_FORMAT_ASTC_12x12_SRGB = 306,
-
PIPE_FORMAT_COUNT
};
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index a2418e2..99e96e1 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -343,7 +343,7 @@ struct st_extension_cap_mapping {
struct st_extension_format_mapping {
int extension_offset[2];
- enum pipe_format format[32];
+ enum pipe_format format[8];
/* If TRUE, at least one format must be supported for the extensions to be
* advertised. If FALSE, all the formats must be supported. */
@@ -569,36 +569,6 @@ void st_init_extensions(struct pipe_screen *screen,
PIPE_FORMAT_BPTC_RGB_FLOAT,
PIPE_FORMAT_BPTC_RGB_UFLOAT } },
- { { o(KHR_texture_compression_astc_ldr) },
- { PIPE_FORMAT_ASTC_4x4,
- PIPE_FORMAT_ASTC_5x4,
- PIPE_FORMAT_ASTC_5x5,
- PIPE_FORMAT_ASTC_6x5,
- PIPE_FORMAT_ASTC_6x6,
- PIPE_FORMAT_ASTC_8x5,
- PIPE_FORMAT_ASTC_8x6,
- PIPE_FORMAT_ASTC_8x8,
- PIPE_FORMAT_ASTC_10x5,
- PIPE_FORMAT_ASTC_10x6,
- PIPE_FORMAT_ASTC_10x8,
- PIPE_FORMAT_ASTC_10x10,
- PIPE_FORMAT_ASTC_12x10,
- PIPE_FORMAT_ASTC_12x12,
- PIPE_FORMAT_ASTC_4x4_SRGB,
- PIPE_FORMAT_ASTC_5x4_SRGB,
- PIPE_FORMAT_ASTC_5x5_SRGB,
- PIPE_FORMAT_ASTC_6x5_SRGB,
- PIPE_FORMAT_ASTC_6x6_SRGB,
- PIPE_FORMAT_ASTC_8x5_SRGB,
- PIPE_FORMAT_ASTC_8x6_SRGB,
- PIPE_FORMAT_ASTC_8x8_SRGB,
- PIPE_FORMAT_ASTC_10x5_SRGB,
- PIPE_FORMAT_ASTC_10x6_SRGB,
- PIPE_FORMAT_ASTC_10x8_SRGB,
- PIPE_FORMAT_ASTC_10x10_SRGB,
- PIPE_FORMAT_ASTC_12x10_SRGB,
- PIPE_FORMAT_ASTC_12x12_SRGB } },
-
{ { o(EXT_texture_shared_exponent) },
{ PIPE_FORMAT_R9G9B9E5_FLOAT } },
diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index 2b92bad..144b7d6 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -465,64 +465,6 @@ st_mesa_format_to_pipe_format(struct st_context *st, mesa_format mesaFormat)
case MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1:
return st->has_etc2 ? PIPE_FORMAT_ETC2_SRGB8A1 : PIPE_FORMAT_B8G8R8A8_SRGB;
- case MESA_FORMAT_RGBA_ASTC_4x4:
- return PIPE_FORMAT_ASTC_4x4;
- case MESA_FORMAT_RGBA_ASTC_5x4:
- return PIPE_FORMAT_ASTC_5x4;
- case MESA_FORMAT_RGBA_ASTC_5x5:
- return PIPE_FORMAT_ASTC_5x5;
- case MESA_FORMAT_RGBA_ASTC_6x5:
- return PIPE_FORMAT_ASTC_6x5;
- case MESA_FORMAT_RGBA_ASTC_6x6:
- return PIPE_FORMAT_ASTC_6x6;
- case MESA_FORMAT_RGBA_ASTC_8x5:
- return PIPE_FORMAT_ASTC_8x5;
- case MESA_FORMAT_RGBA_ASTC_8x6:
- return PIPE_FORMAT_ASTC_8x6;
- case MESA_FORMAT_RGBA_ASTC_8x8:
- return PIPE_FORMAT_ASTC_8x8;
- case MESA_FORMAT_RGBA_ASTC_10x5:
- return PIPE_FORMAT_ASTC_10x5;
- case MESA_FORMAT_RGBA_ASTC_10x6:
- return PIPE_FORMAT_ASTC_10x6;
- case MESA_FORMAT_RGBA_ASTC_10x8:
- return PIPE_FORMAT_ASTC_10x8;
- case MESA_FORMAT_RGBA_ASTC_10x10:
- return PIPE_FORMAT_ASTC_10x10;
- case MESA_FORMAT_RGBA_ASTC_12x10:
- return PIPE_FORMAT_ASTC_12x10;
- case MESA_FORMAT_RGBA_ASTC_12x12:
- return PIPE_FORMAT_ASTC_12x12;
-
- case MESA_FORMAT_SRGB8_ALPHA8_ASTC_4x4:
- return PIPE_FORMAT_ASTC_4x4_SRGB;
- case MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x4:
- return PIPE_FORMAT_ASTC_5x4_SRGB;
- case MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x5:
- return PIPE_FORMAT_ASTC_5x5_SRGB;
- case MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x5:
- return PIPE_FORMAT_ASTC_6x5_SRGB;
- case MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x6:
- return PIPE_FORMAT_ASTC_6x6_SRGB;
- case MESA_FORMAT_SRGB8_ALPHA8_ASTC_8x5:
- return PIPE_FORMAT_ASTC_8x5_SRGB;
- case MESA_FORMAT_SRGB8_ALPHA8_ASTC_8x6:
- return PIPE_FORMAT_ASTC_8x6_SRGB;
- case MESA_FORMAT_SRGB8_ALPHA8_ASTC_8x8:
- return PIPE_FORMAT_ASTC_8x8_SRGB;
- case MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x5:
- return PIPE_FORMAT_ASTC_10x5_SRGB;
- case MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x6:
- return PIPE_FORMAT_ASTC_10x6_SRGB;
- case MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x8:
- return PIPE_FORMAT_ASTC_10x8_SRGB;
- case MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x10:
- return PIPE_FORMAT_ASTC_10x10_SRGB;
- case MESA_FORMAT_SRGB8_ALPHA8_ASTC_12x10:
- return PIPE_FORMAT_ASTC_12x10_SRGB;
- case MESA_FORMAT_SRGB8_ALPHA8_ASTC_12x12:
- return PIPE_FORMAT_ASTC_12x12_SRGB;
-
default:
return PIPE_FORMAT_NONE;
}
@@ -941,64 +883,6 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
case PIPE_FORMAT_ETC2_RG11_SNORM:
return MESA_FORMAT_ETC2_SIGNED_RG11_EAC;
- case PIPE_FORMAT_ASTC_4x4:
- return MESA_FORMAT_RGBA_ASTC_4x4;
- case PIPE_FORMAT_ASTC_5x4:
- return MESA_FORMAT_RGBA_ASTC_5x4;
- case PIPE_FORMAT_ASTC_5x5:
- return MESA_FORMAT_RGBA_ASTC_5x5;
- case PIPE_FORMAT_ASTC_6x5:
- return MESA_FORMAT_RGBA_ASTC_6x5;
- case PIPE_FORMAT_ASTC_6x6:
- return MESA_FORMAT_RGBA_ASTC_6x6;
- case PIPE_FORMAT_ASTC_8x5:
- return MESA_FORMAT_RGBA_ASTC_8x5;
- case PIPE_FORMAT_ASTC_8x6:
- return MESA_FORMAT_RGBA_ASTC_8x6;
- case PIPE_FORMAT_ASTC_8x8:
- return MESA_FORMAT_RGBA_ASTC_8x8;
- case PIPE_FORMAT_ASTC_10x5:
- return MESA_FORMAT_RGBA_ASTC_10x5;
- case PIPE_FORMAT_ASTC_10x6:
- return MESA_FORMAT_RGBA_ASTC_10x6;
- case PIPE_FORMAT_ASTC_10x8:
- return MESA_FORMAT_RGBA_ASTC_10x8;
- case PIPE_FORMAT_ASTC_10x10:
- return MESA_FORMAT_RGBA_ASTC_10x10;
- case PIPE_FORMAT_ASTC_12x10:
- return MESA_FORMAT_RGBA_ASTC_12x10;
- case PIPE_FORMAT_ASTC_12x12:
- return MESA_FORMAT_RGBA_ASTC_12x12;
-
- case PIPE_FORMAT_ASTC_4x4_SRGB:
- return MESA_FORMAT_SRGB8_ALPHA8_ASTC_4x4;
- case PIPE_FORMAT_ASTC_5x4_SRGB:
- return MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x4;
- case PIPE_FORMAT_ASTC_5x5_SRGB:
- return MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x5;
- case PIPE_FORMAT_ASTC_6x5_SRGB:
- return MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x5;
- case PIPE_FORMAT_ASTC_6x6_SRGB:
- return MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x6;
- case PIPE_FORMAT_ASTC_8x5_SRGB:
- return MESA_FORMAT_SRGB8_ALPHA8_ASTC_8x5;
- case PIPE_FORMAT_ASTC_8x6_SRGB:
- return MESA_FORMAT_SRGB8_ALPHA8_ASTC_8x6;
- case PIPE_FORMAT_ASTC_8x8_SRGB:
- return MESA_FORMAT_SRGB8_ALPHA8_ASTC_8x8;
- case PIPE_FORMAT_ASTC_10x5_SRGB:
- return MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x5;
- case PIPE_FORMAT_ASTC_10x6_SRGB:
- return MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x6;
- case PIPE_FORMAT_ASTC_10x8_SRGB:
- return MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x8;
- case PIPE_FORMAT_ASTC_10x10_SRGB:
- return MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x10;
- case PIPE_FORMAT_ASTC_12x10_SRGB:
- return MESA_FORMAT_SRGB8_ALPHA8_ASTC_12x10;
- case PIPE_FORMAT_ASTC_12x12_SRGB:
- return MESA_FORMAT_SRGB8_ALPHA8_ASTC_12x12;
-
default:
return MESA_FORMAT_NONE;
}
@@ -1502,121 +1386,6 @@ static const struct format_mapping format_map[] = {
{ PIPE_FORMAT_BPTC_RGB_UFLOAT, 0 },
},
- /* ASTC */
- {
- { GL_COMPRESSED_RGBA_ASTC_4x4_KHR, 0 },
- { PIPE_FORMAT_ASTC_4x4, 0},
- },
- {
- { GL_COMPRESSED_RGBA_ASTC_5x4_KHR, 0 },
- { PIPE_FORMAT_ASTC_5x4, 0},
- },
- {
- { GL_COMPRESSED_RGBA_ASTC_5x5_KHR, 0 },
- { PIPE_FORMAT_ASTC_5x5, 0},
- },
- {
- { GL_COMPRESSED_RGBA_ASTC_6x5_KHR, 0 },
- { PIPE_FORMAT_ASTC_6x5, 0},
- },
- {
- { GL_COMPRESSED_RGBA_ASTC_6x6_KHR, 0 },
- { PIPE_FORMAT_ASTC_6x6, 0},
- },
- {
- { GL_COMPRESSED_RGBA_ASTC_8x5_KHR, 0 },
- { PIPE_FORMAT_ASTC_8x5, 0},
- },
- {
- { GL_COMPRESSED_RGBA_ASTC_8x6_KHR, 0 },
- { PIPE_FORMAT_ASTC_8x6, 0},
- },
- {
- { GL_COMPRESSED_RGBA_ASTC_8x8_KHR, 0 },
- { PIPE_FORMAT_ASTC_8x8, 0},
- },
- {
- { GL_COMPRESSED_RGBA_ASTC_10x5_KHR, 0 },
- { PIPE_FORMAT_ASTC_10x5, 0},
- },
- {
- { GL_COMPRESSED_RGBA_ASTC_10x6_KHR, 0 },
- { PIPE_FORMAT_ASTC_10x6, 0},
- },
- {
- { GL_COMPRESSED_RGBA_ASTC_10x8_KHR, 0 },
- { PIPE_FORMAT_ASTC_10x8, 0},
- },
- {
- { GL_COMPRESSED_RGBA_ASTC_10x10_KHR, 0 },
- { PIPE_FORMAT_ASTC_10x10, 0},
- },
- {
- { GL_COMPRESSED_RGBA_ASTC_12x10_KHR, 0 },
- { PIPE_FORMAT_ASTC_12x10, 0},
- },
- {
- { GL_COMPRESSED_RGBA_ASTC_12x12_KHR, 0 },
- { PIPE_FORMAT_ASTC_12x12, 0},
- },
-
- {
- { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR, 0 },
- { PIPE_FORMAT_ASTC_4x4_SRGB, 0},
- },
- {
- { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR, 0 },
- { PIPE_FORMAT_ASTC_5x4_SRGB, 0},
- },
- {
- { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR, 0 },
- { PIPE_FORMAT_ASTC_5x5_SRGB, 0},
- },
- {
- { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR, 0 },
- { PIPE_FORMAT_ASTC_6x5_SRGB, 0},
- },
- {
- { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR, 0 },
- { PIPE_FORMAT_ASTC_6x6_SRGB, 0},
- },
- {
- { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR, 0 },
- { PIPE_FORMAT_ASTC_8x5_SRGB, 0},
- },
- {
- { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR, 0 },
- { PIPE_FORMAT_ASTC_8x6_SRGB, 0},
- },
- {
- { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR, 0 },
- { PIPE_FORMAT_ASTC_8x8_SRGB, 0},
- },
- {
- { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR, 0 },
- { PIPE_FORMAT_ASTC_10x5_SRGB, 0},
- },
- {
- { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR, 0 },
- { PIPE_FORMAT_ASTC_10x6_SRGB, 0},
- },
- {
- { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR, 0 },
- { PIPE_FORMAT_ASTC_10x8_SRGB, 0},
- },
- {
- { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR, 0 },
- { PIPE_FORMAT_ASTC_10x10_SRGB, 0},
- },
- {
- { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR, 0 },
- { PIPE_FORMAT_ASTC_12x10_SRGB, 0},
- },
- {
- { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR, 0 },
- { PIPE_FORMAT_ASTC_12x12_SRGB, 0},
- },
-
/* signed/unsigned integer formats.
*/
{
More information about the mesa-commit
mailing list