*/
-#include "main/colormac.h"
#include "main/macros.h"
#include "main/texcompress.h"
#include "main/texcompress_fxt1.h"
#include "s_texfetch.h"
#include "../../gallium/auxiliary/util/u_format_rgb9e5.h"
#include "../../gallium/auxiliary/util/u_format_r11g11b10f.h"
-
-
-/**
- * Convert an 8-bit sRGB value from non-linear space to a
- * linear RGB value in [0, 1].
- * Implemented with a 256-entry lookup table.
- */
-static inline GLfloat
-nonlinear_to_linear(GLubyte cs8)
-{
- static GLfloat table[256];
- static GLboolean tableReady = GL_FALSE;
- if (!tableReady) {
- /* compute lookup table now */
- GLuint i;
- for (i = 0; i < 256; i++) {
- const GLfloat cs = UBYTE_TO_FLOAT(i);
- if (cs <= 0.04045) {
- table[i] = cs / 12.92f;
- }
- else {
- table[i] = (GLfloat) pow((cs + 0.055) / 1.055, 2.4);
- }
- }
- tableReady = GL_TRUE;
- }
- return table[cs8];
-}
-
+#include "util/format_srgb.h"
/* Texel fetch routines for all supported formats
NULL \
}
+#define FETCH_COMPRESSED(NAME) \
+ { \
+ MESA_FORMAT_ ## NAME, \
+ fetch_compressed, \
+ fetch_compressed, \
+ fetch_compressed \
+ }
+
/**
* Table to map MESA_FORMAT_ to texel fetch/store funcs.
*/
FETCH_FUNCS(B10G10R10A2_UNORM),
FETCH_NULL(B10G10R10X2_UNORM),
FETCH_FUNCS(R10G10B10A2_UNORM),
+ FETCH_NULL(R10G10B10X2_UNORM),
+
FETCH_FUNCS(S8_UINT_Z24_UNORM),
{
MESA_FORMAT_X8_UINT_Z24_UNORM,
fetch_texel_2d_Z24_UNORM_S8_UINT,
fetch_texel_3d_Z24_UNORM_S8_UINT
},
+ FETCH_NULL(R3G3B2_UNORM),
+ FETCH_NULL(A4B4G4R4_UNORM),
+ FETCH_NULL(R4G4B4A4_UNORM),
+ FETCH_NULL(R5G5B5A1_UNORM),
+ FETCH_NULL(A2B10G10R10_UNORM),
+ FETCH_NULL(A2R10G10B10_UNORM),
+
FETCH_FUNCS(YCBCR),
FETCH_FUNCS(YCBCR_REV),
FETCH_FUNCS(R8G8_SNORM),
FETCH_NULL(G8R8_SNORM),
FETCH_FUNCS(L8A8_SNORM),
+ FETCH_FUNCS(A8L8_SNORM),
/* Array signed/normalized formats */
FETCH_FUNCS(A_SNORM8),
/* Packed sRGB formats */
FETCH_FUNCS(A8B8G8R8_SRGB),
FETCH_FUNCS(B8G8R8A8_SRGB),
+ FETCH_FUNCS(A8R8G8B8_SRGB),
FETCH_NULL(B8G8R8X8_SRGB),
+ FETCH_NULL(X8R8G8B8_SRGB),
FETCH_FUNCS(R8G8B8A8_SRGB),
FETCH_FUNCS(R8G8B8X8_SRGB),
+ FETCH_FUNCS(X8B8G8R8_SRGB),
FETCH_FUNCS(L8A8_SRGB),
+ FETCH_FUNCS(A8L8_SRGB),
/* Array sRGB formats */
FETCH_FUNCS(L_SRGB8),
},
/* Packed signed/unsigned non-normalized integer formats */
+ FETCH_NULL(A8B8G8R8_UINT),
+ FETCH_NULL(A8R8G8B8_UINT),
+ FETCH_NULL(R8G8B8A8_UINT),
+ FETCH_NULL(B8G8R8A8_UINT),
FETCH_NULL(B10G10R10A2_UINT),
FETCH_NULL(R10G10B10A2_UINT),
+ FETCH_NULL(A2B10G10R10_UINT),
+ FETCH_NULL(A2R10G10B10_UINT),
+ FETCH_NULL(B5G6R5_UINT),
+ FETCH_NULL(R5G6B5_UINT),
+ FETCH_NULL(B2G3R3_UINT),
+ FETCH_NULL(R3G3B2_UINT),
+ FETCH_NULL(A4B4G4R4_UINT),
+ FETCH_NULL(R4G4B4A4_UINT),
+ FETCH_NULL(B4G4R4A4_UINT),
+ FETCH_NULL(A4R4G4B4_UINT),
+ FETCH_NULL(A1B5G5R5_UINT),
+ FETCH_NULL(B5G5R5A1_UINT),
+ FETCH_NULL(A1R5G5B5_UINT),
+ FETCH_NULL(R5G5B5A1_UINT),
/* Array signed/unsigned non-normalized integer formats */
FETCH_NULL(A_UINT8),
FETCH_NULL(RGBX_SINT32),
/* DXT compressed formats */
- {
- MESA_FORMAT_RGB_DXT1,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
- {
- MESA_FORMAT_RGBA_DXT1,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
- {
- MESA_FORMAT_RGBA_DXT3,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
- {
- MESA_FORMAT_RGBA_DXT5,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
+ FETCH_COMPRESSED(RGB_DXT1),
+ FETCH_COMPRESSED(RGBA_DXT1),
+ FETCH_COMPRESSED(RGBA_DXT3),
+ FETCH_COMPRESSED(RGBA_DXT5),
/* DXT sRGB compressed formats */
- {
- MESA_FORMAT_SRGB_DXT1,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
- {
- MESA_FORMAT_SRGBA_DXT1,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
- {
- MESA_FORMAT_SRGBA_DXT3,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
- {
- MESA_FORMAT_SRGBA_DXT5,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
+ FETCH_COMPRESSED(SRGB_DXT1),
+ FETCH_COMPRESSED(SRGBA_DXT1),
+ FETCH_COMPRESSED(SRGBA_DXT3),
+ FETCH_COMPRESSED(SRGBA_DXT5),
/* FXT1 compressed formats */
- {
- MESA_FORMAT_RGB_FXT1,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
- {
- MESA_FORMAT_RGBA_FXT1,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
+ FETCH_COMPRESSED(RGB_FXT1),
+ FETCH_COMPRESSED(RGBA_FXT1),
/* RGTC compressed formats */
- {
- MESA_FORMAT_R_RGTC1_UNORM,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
- {
- MESA_FORMAT_R_RGTC1_SNORM,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
- {
- MESA_FORMAT_RG_RGTC2_UNORM,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
- {
- MESA_FORMAT_RG_RGTC2_SNORM,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
+ FETCH_COMPRESSED(R_RGTC1_UNORM),
+ FETCH_COMPRESSED(R_RGTC1_SNORM),
+ FETCH_COMPRESSED(RG_RGTC2_UNORM),
+ FETCH_COMPRESSED(RG_RGTC2_SNORM),
/* LATC1/2 compressed formats */
- {
- MESA_FORMAT_L_LATC1_UNORM,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
- {
- MESA_FORMAT_L_LATC1_SNORM,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
- {
- MESA_FORMAT_LA_LATC2_UNORM,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
- {
- MESA_FORMAT_LA_LATC2_SNORM,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
+ FETCH_COMPRESSED(L_LATC1_UNORM),
+ FETCH_COMPRESSED(L_LATC1_SNORM),
+ FETCH_COMPRESSED(LA_LATC2_UNORM),
+ FETCH_COMPRESSED(LA_LATC2_SNORM),
/* ETC1/2 compressed formats */
- {
- MESA_FORMAT_ETC1_RGB8,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
- {
- MESA_FORMAT_ETC2_RGB8,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
- {
- MESA_FORMAT_ETC2_SRGB8,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
- {
- MESA_FORMAT_ETC2_RGBA8_EAC,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
- {
- MESA_FORMAT_ETC2_SRGB8_ALPHA8_EAC,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
- {
- MESA_FORMAT_ETC2_R11_EAC,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
- {
- MESA_FORMAT_ETC2_RG11_EAC,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
- {
- MESA_FORMAT_ETC2_SIGNED_R11_EAC,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
- {
- MESA_FORMAT_ETC2_SIGNED_RG11_EAC,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
- {
- MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- },
- {
- MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1,
- fetch_compressed,
- fetch_compressed,
- fetch_compressed
- }
+ FETCH_COMPRESSED(ETC1_RGB8),
+ FETCH_COMPRESSED(ETC2_RGB8),
+ FETCH_COMPRESSED(ETC2_SRGB8),
+ FETCH_COMPRESSED(ETC2_RGBA8_EAC),
+ FETCH_COMPRESSED(ETC2_SRGB8_ALPHA8_EAC),
+ FETCH_COMPRESSED(ETC2_R11_EAC),
+ FETCH_COMPRESSED(ETC2_RG11_EAC),
+ FETCH_COMPRESSED(ETC2_SIGNED_R11_EAC),
+ FETCH_COMPRESSED(ETC2_SIGNED_RG11_EAC),
+ FETCH_COMPRESSED(ETC2_RGB8_PUNCHTHROUGH_ALPHA1),
+ FETCH_COMPRESSED(ETC2_SRGB8_PUNCHTHROUGH_ALPHA1),
+ FETCH_COMPRESSED(BPTC_RGBA_UNORM),
+ FETCH_COMPRESSED(BPTC_SRGB_ALPHA_UNORM),
+ FETCH_COMPRESSED(BPTC_RGB_SIGNED_FLOAT),
+ FETCH_COMPRESSED(BPTC_RGB_UNSIGNED_FLOAT),
+
+ /* ASTC compressed formats */
+ FETCH_NULL(RGBA_ASTC_4x4),
+ FETCH_NULL(RGBA_ASTC_5x4),
+ FETCH_NULL(RGBA_ASTC_5x5),
+ FETCH_NULL(RGBA_ASTC_6x5),
+ FETCH_NULL(RGBA_ASTC_6x6),
+ FETCH_NULL(RGBA_ASTC_8x5),
+ FETCH_NULL(RGBA_ASTC_8x6),
+ FETCH_NULL(RGBA_ASTC_8x8),
+ FETCH_NULL(RGBA_ASTC_10x5),
+ FETCH_NULL(RGBA_ASTC_10x6),
+ FETCH_NULL(RGBA_ASTC_10x8),
+ FETCH_NULL(RGBA_ASTC_10x10),
+ FETCH_NULL(RGBA_ASTC_12x10),
+ FETCH_NULL(RGBA_ASTC_12x12),
+ FETCH_NULL(SRGB8_ALPHA8_ASTC_4x4),
+ FETCH_NULL(SRGB8_ALPHA8_ASTC_5x4),
+ FETCH_NULL(SRGB8_ALPHA8_ASTC_5x5),
+ FETCH_NULL(SRGB8_ALPHA8_ASTC_6x5),
+ FETCH_NULL(SRGB8_ALPHA8_ASTC_6x6),
+ FETCH_NULL(SRGB8_ALPHA8_ASTC_8x5),
+ FETCH_NULL(SRGB8_ALPHA8_ASTC_8x6),
+ FETCH_NULL(SRGB8_ALPHA8_ASTC_8x8),
+ FETCH_NULL(SRGB8_ALPHA8_ASTC_10x5),
+ FETCH_NULL(SRGB8_ALPHA8_ASTC_10x6),
+ FETCH_NULL(SRGB8_ALPHA8_ASTC_10x8),
+ FETCH_NULL(SRGB8_ALPHA8_ASTC_10x10),
+ FETCH_NULL(SRGB8_ALPHA8_ASTC_12x10),
+ FETCH_NULL(SRGB8_ALPHA8_ASTC_12x12),
+
+ FETCH_NULL(RGBA_ASTC_3x3x3),
+ FETCH_NULL(RGBA_ASTC_4x3x3),
+ FETCH_NULL(RGBA_ASTC_4x4x3),
+ FETCH_NULL(RGBA_ASTC_4x4x4),
+ FETCH_NULL(RGBA_ASTC_5x4x4),
+ FETCH_NULL(RGBA_ASTC_5x5x4),
+ FETCH_NULL(RGBA_ASTC_5x5x5),
+ FETCH_NULL(RGBA_ASTC_6x5x5),
+ FETCH_NULL(RGBA_ASTC_6x6x5),
+ FETCH_NULL(RGBA_ASTC_6x6x6),
+ FETCH_NULL(SRGB8_ALPHA8_ASTC_3x3x3),
+ FETCH_NULL(SRGB8_ALPHA8_ASTC_4x3x3),
+ FETCH_NULL(SRGB8_ALPHA8_ASTC_4x4x3),
+ FETCH_NULL(SRGB8_ALPHA8_ASTC_4x4x4),
+ FETCH_NULL(SRGB8_ALPHA8_ASTC_5x4x4),
+ FETCH_NULL(SRGB8_ALPHA8_ASTC_5x5x4),
+ FETCH_NULL(SRGB8_ALPHA8_ASTC_5x5x5),
+ FETCH_NULL(SRGB8_ALPHA8_ASTC_6x5x5),
+ FETCH_NULL(SRGB8_ALPHA8_ASTC_6x6x5),
+ FETCH_NULL(SRGB8_ALPHA8_ASTC_6x6x6)
};
}
#endif
- STATIC_ASSERT(Elements(texfetch_funcs) == MESA_FORMAT_COUNT);
+ STATIC_ASSERT(ARRAY_SIZE(texfetch_funcs) == MESA_FORMAT_COUNT);
if (samp->sRGBDecode == GL_SKIP_DECODE_EXT &&
_mesa_get_format_color_encoding(format) == GL_SRGB) {
texImage->FetchCompressedTexel = _mesa_get_compressed_fetch_func(format);
- ASSERT(texImage->FetchTexel);
+ assert(texImage->FetchTexel);
}
void