X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fswrast%2Fs_texfetch.c;h=721d0883853b15141297af43f4eba9471651a269;hb=75da9c9933a97e6f2baf0884b98350df800ee785;hp=098a32fd4beb3866d13732b593563ac4eac1c93c;hpb=6ef720561326b3ef9a2eb9e20f1a4ef0395d111b;p=mesa.git diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c index 098a32fd4be..721d0883853 100644 --- a/src/mesa/swrast/s_texfetch.c +++ b/src/mesa/swrast/s_texfetch.c @@ -33,7 +33,6 @@ */ -#include "main/colormac.h" #include "main/macros.h" #include "main/texcompress.h" #include "main/texcompress_fxt1.h" @@ -46,35 +45,7 @@ #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 @@ -129,9 +100,32 @@ static void fetch_null_texelf( const struct swrast_texture_image *texImage, } +#define FETCH_FUNCS(NAME) \ + { \ + MESA_FORMAT_ ## NAME, \ + fetch_texel_1d_ ## NAME, \ + fetch_texel_2d_ ## NAME, \ + fetch_texel_3d_ ## NAME, \ + } + +#define FETCH_NULL(NAME) \ + { \ + MESA_FORMAT_ ## NAME, \ + NULL, \ + NULL, \ + NULL \ + } + +#define FETCH_COMPRESSED(NAME) \ + { \ + MESA_FORMAT_ ## NAME, \ + fetch_compressed, \ + fetch_compressed, \ + fetch_compressed \ + } + /** * Table to map MESA_FORMAT_ to texel fetch/store funcs. - * XXX this is somewhat temporary. */ static struct { mesa_format Name; @@ -149,632 +143,145 @@ texfetch_funcs[] = }, /* Packed unorm formats */ - { - MESA_FORMAT_A8B8G8R8_UNORM, - fetch_texel_1d_A8B8G8R8_UNORM, - fetch_texel_2d_A8B8G8R8_UNORM, - fetch_texel_3d_A8B8G8R8_UNORM - }, - { - MESA_FORMAT_X8B8G8R8_UNORM, - fetch_texel_1d_X8B8G8R8_UNORM, - fetch_texel_2d_X8B8G8R8_UNORM, - fetch_texel_3d_X8B8G8R8_UNORM - }, - { - MESA_FORMAT_R8G8B8A8_UNORM, - fetch_texel_1d_R8G8B8A_UNORM, - fetch_texel_2d_R8G8B8A_UNORM, - fetch_texel_3d_R8G8B8A_UNORM - }, - { - MESA_FORMAT_R8G8B8X8_UNORM, - fetch_texel_1d_R8G8B8X8_UNORM, - fetch_texel_2d_R8G8B8X8_UNORM, - fetch_texel_3d_R8G8B8X8_UNORM - }, - { - MESA_FORMAT_B8G8R8A8_UNORM, - fetch_texel_1d_B8G8R8A8_UNORM, - fetch_texel_2d_B8G8R8A8_UNORM, - fetch_texel_3d_B8G8R8A8_UNORM - }, - { - MESA_FORMAT_B8G8R8X8_UNORM, - fetch_texel_1d_B8G8R8X8_UNORM, - fetch_texel_2d_B8G8R8X8_UNORM, - fetch_texel_3d_B8G8R8X8_UNORM - }, - { - MESA_FORMAT_A8R8G8B8_UNORM, - fetch_texel_1d_A8R8G8B8_UNORM, - fetch_texel_2d_A8R8G8B8_UNORM, - fetch_texel_3d_A8R8G8B8_UNORM - }, - { - MESA_FORMAT_X8R8G8B8_UNORM, - fetch_texel_1d_X8R8G8B8_UNORM, - fetch_texel_2d_X8R8G8B8_UNORM, - fetch_texel_3d_X8R8G8B8_UNORM - }, - { - MESA_FORMAT_L16A16_UNORM, - fetch_texel_1d_L16A16_UNORM, - fetch_texel_2d_L16A16_UNORM, - fetch_texel_3d_L16A16_UNORM - }, - { - MESA_FORMAT_A16L16_UNORM, - fetch_texel_1d_A16L16_UNORM, - fetch_texel_2d_A16L16_UNORM, - fetch_texel_3d_A16L16_UNORM - }, - { - MESA_FORMAT_B5G6R5_UNORM, - fetch_texel_1d_B5G6R5_UNORM, - fetch_texel_2d_B5G6R5_UNORM, - fetch_texel_3d_B5G6R5_UNORM - }, - { - MESA_FORMAT_R5G6B5_UNORM, - fetch_texel_1d_R5G6B5_UNORM, - fetch_texel_2d_R5G6B5_UNORM, - fetch_texel_3d_R5G6B5_UNORM - }, - { - MESA_FORMAT_B4G4R4A4_UNORM, - fetch_texel_1d_B4G4R4A4_UNORM, - fetch_texel_2d_B4G4R4A4_UNORM, - fetch_texel_3d_B4G4R4A4_UNORM - }, - { - MESA_FORMAT_B4G4R4X4_UNORM, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_A4R4G4B4_UNORM, - fetch_texel_1d_A4R4G4B4_UNORM, - fetch_texel_2d_A4R4G4B4_UNORM, - fetch_texel_3d_A4R4G4B4_UNORM - }, - { - MESA_FORMAT_A1B5G5R5_UNORM, - fetch_texel_1d_A1B5G5R5_UNORM, - fetch_texel_2d_A1B5G5R5_UNORM, - fetch_texel_3d_A1B5G5R5_UNORM - }, - { - MESA_FORMAT_B5G5R5A1_UNORM, - fetch_texel_1d_B5G5R5A1_UNORM, - fetch_texel_2d_B5G5R5A1_UNORM, - fetch_texel_3d_B5G5R5A1_UNORM - }, - { - MESA_FORMAT_B5G5R5X1_UNORM, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_A1R5G5B5_UNORM, - fetch_texel_1d_A1R5G5B5_UNORM, - fetch_texel_2d_A1R5G5B5_UNORM, - fetch_texel_3d_A1R5G5B5_UNORM - }, - { - MESA_FORMAT_L8A8_UNORM, - fetch_texel_1d_L8A8_UNORM, - fetch_texel_2d_L8A8_UNORM, - fetch_texel_3d_L8A8_UNORM - }, - { - MESA_FORMAT_A8L8_UNORM, - fetch_texel_1d_A8L8_UNORM, - fetch_texel_2d_A8L8_UNORM, - fetch_texel_3d_A8L8_UNORM - }, - { - MESA_FORMAT_R8G8_UNORM, - fetch_texel_1d_R8G8_UNORM, - fetch_texel_2d_R8G8_UNORM, - fetch_texel_3d_R8G8_UNORM - }, - { - MESA_FORMAT_G8R8_UNORM, - fetch_texel_1d_G8R8_UNORM, - fetch_texel_2d_G8R8_UNORM, - fetch_texel_3d_G8R8_UNORM - }, - { - MESA_FORMAT_L4A4_UNORM, - fetch_texel_1d_L4A4_UNORM, - fetch_texel_2d_L4A4_UNORM, - fetch_texel_3d_L4A4_UNORM - }, - { - MESA_FORMAT_B2G3R3_UNORM, - fetch_texel_1d_B2G3R3_UNORM, - fetch_texel_2d_B2G3R3_UNORM, - fetch_texel_3d_B2G3R3_UNORM - }, - { - MESA_FORMAT_R16G16_UNORM, - fetch_texel_1d_R16G16_UNORM, - fetch_texel_2d_R16G16_UNORM, - fetch_texel_3d_R16G16_UNORM - }, - { - MESA_FORMAT_G16R16_UNORM, - fetch_texel_1d_G16R16_UNORM, - fetch_texel_2d_G16R16_UNORM, - fetch_texel_3d_G16R16_UNORM - }, - { - MESA_FORMAT_B10G10R10A2_UNORM, - fetch_texel_1d_B10G10R10A2_UNORM, - fetch_texel_2d_B10G10R10A2_UNORM, - fetch_texel_3d_B10G10R10A2_UNORM - }, - { - MESA_FORMAT_B10G10R10X2_UNORM, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_R10G10B10A2_UNORM, - fetch_texel_1d_R10G10B10A2_UNORM, - fetch_texel_2d_R10G10B10A2_UNORM, - fetch_texel_3d_R10G10B10A2_UNORM - }, - { - MESA_FORMAT_S8_UINT_Z24_UNORM, - fetch_texel_1d_S8_UINT_Z24_UNORM, - fetch_texel_2d_S8_UINT_Z24_UNORM, - fetch_texel_3d_S8_UINT_Z24_UNORM - }, + FETCH_FUNCS(A8B8G8R8_UNORM), + FETCH_FUNCS(X8B8G8R8_UNORM), + FETCH_FUNCS(R8G8B8A8_UNORM), + FETCH_FUNCS(R8G8B8X8_UNORM), + FETCH_FUNCS(B8G8R8A8_UNORM), + FETCH_FUNCS(B8G8R8X8_UNORM), + FETCH_FUNCS(A8R8G8B8_UNORM), + FETCH_FUNCS(X8R8G8B8_UNORM), + FETCH_FUNCS(L16A16_UNORM), + FETCH_FUNCS(A16L16_UNORM), + FETCH_FUNCS(B5G6R5_UNORM), + FETCH_FUNCS(R5G6B5_UNORM), + FETCH_FUNCS(B4G4R4A4_UNORM), + FETCH_NULL(B4G4R4X4_UNORM), + FETCH_FUNCS(A4R4G4B4_UNORM), + FETCH_FUNCS(A1B5G5R5_UNORM), + FETCH_FUNCS(B5G5R5A1_UNORM), + FETCH_NULL(B5G5R5X1_UNORM), + FETCH_FUNCS(A1R5G5B5_UNORM), + FETCH_FUNCS(L8A8_UNORM), + FETCH_FUNCS(A8L8_UNORM), + FETCH_FUNCS(R8G8_UNORM), + FETCH_FUNCS(G8R8_UNORM), + FETCH_FUNCS(L4A4_UNORM), + FETCH_FUNCS(B2G3R3_UNORM), + FETCH_FUNCS(R16G16_UNORM), + FETCH_FUNCS(G16R16_UNORM), + 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_1d_S8_UINT_Z24_UNORM, fetch_texel_2d_S8_UINT_Z24_UNORM, fetch_texel_3d_S8_UINT_Z24_UNORM }, - { - MESA_FORMAT_Z24_UNORM_S8_UINT, - fetch_texel_1d_Z24_UNORM_S8_UINT, - fetch_texel_2d_Z24_UNORM_S8_UINT, - fetch_texel_3d_Z24_UNORM_S8_UINT - }, + FETCH_FUNCS(Z24_UNORM_S8_UINT), { MESA_FORMAT_Z24_UNORM_X8_UINT, fetch_texel_1d_Z24_UNORM_S8_UINT, fetch_texel_2d_Z24_UNORM_S8_UINT, fetch_texel_3d_Z24_UNORM_S8_UINT }, - { - MESA_FORMAT_YCBCR, - fetch_texel_1d_YCBCR, - fetch_texel_2d_YCBCR, - fetch_texel_3d_YCBCR - }, - { - MESA_FORMAT_YCBCR_REV, - fetch_texel_1d_YCBCR_REV, - fetch_texel_2d_YCBCR_REV, - fetch_texel_3d_YCBCR_REV - }, - { - MESA_FORMAT_DUDV8, - fetch_texel_1d_DUDV8, - fetch_texel_2d_DUDV8, - fetch_texel_3d_DUDV8 - }, + 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), /* Array unorm formats */ - { - MESA_FORMAT_A_UNORM8, - fetch_texel_1d_A_UNORM8, - fetch_texel_2d_A_UNORM8, - fetch_texel_3d_A_UNORM8 - }, - { - MESA_FORMAT_A_UNORM16, - fetch_texel_1d_A_UNORM16, - fetch_texel_2d_A_UNORM16, - fetch_texel_3d_A_UNORM16 - }, - { - MESA_FORMAT_L_UNORM8, - fetch_texel_1d_L_UNORM8, - fetch_texel_2d_L_UNORM8, - fetch_texel_3d_L_UNORM8 - }, - { - MESA_FORMAT_L_UNORM16, - fetch_texel_1d_L_UNORM16, - fetch_texel_2d_L_UNORM16, - fetch_texel_3d_L_UNORM16 - }, - { - MESA_FORMAT_I_UNORM8, - fetch_texel_1d_I_UNORM8, - fetch_texel_2d_I_UNORM8, - fetch_texel_3d_I_UNORM8 - }, - { - MESA_FORMAT_I_UNORM16, - fetch_texel_1d_I_UNORM16, - fetch_texel_2d_I_UNORM16, - fetch_texel_3d_I_UNORM16 - }, - { - MESA_FORMAT_R_UNORM8, - fetch_texel_1d_R_UNORM8, - fetch_texel_2d_R_UNORM8, - fetch_texel_3d_R_UNORM8 - }, - { - MESA_FORMAT_R_UNORM16, - fetch_texel_1d_R_UNORM16, - fetch_texel_2d_R_UNORM16, - fetch_texel_3d_R_UNORM16 - }, - { - MESA_FORMAT_BGR_UNORM8, - fetch_texel_1d_BGR_UNORM8, - fetch_texel_2d_BGR_UNORM8, - fetch_texel_3d_BGR_UNORM8 - }, - { - MESA_FORMAT_RGB_UNORM8, - fetch_texel_1d_RGB_UNORM8, - fetch_texel_2d_RGB_UNORM8, - fetch_texel_3d_RGB_UNORM8 - }, - { - MESA_FORMAT_RGBA_UNORM16, - fetch_texel_1d_rgba_16, - fetch_texel_2d_rgba_16, - fetch_texel_3d_rgba_16 - }, - { - MESA_FORMAT_RGBX_UNORM16, - fetch_texel_1d_RGBX_UNORM16, - fetch_texel_2d_RGBX_UNORM16, - fetch_texel_3d_RGBX_UNORM16 - }, - { - MESA_FORMAT_Z_UNORM16, - fetch_texel_1d_Z_UNORM16, - fetch_texel_2d_Z_UNORM16, - fetch_texel_3d_Z_UNORM16 - }, - { - MESA_FORMAT_Z_UNORM32, - fetch_texel_1d_Z_UNORM32, - fetch_texel_2d_Z_UNORM32, - fetch_texel_3d_Z_UNORM32 - }, - { - MESA_FORMAT_S_UINT8, - NULL, - NULL, - NULL - }, + FETCH_FUNCS(A_UNORM8), + FETCH_FUNCS(A_UNORM16), + FETCH_FUNCS(L_UNORM8), + FETCH_FUNCS(L_UNORM16), + FETCH_FUNCS(I_UNORM8), + FETCH_FUNCS(I_UNORM16), + FETCH_FUNCS(R_UNORM8), + FETCH_FUNCS(R_UNORM16), + FETCH_FUNCS(BGR_UNORM8), + FETCH_FUNCS(RGB_UNORM8), + FETCH_FUNCS(RGBA_UNORM16), + FETCH_FUNCS(RGBX_UNORM16), + FETCH_FUNCS(Z_UNORM16), + FETCH_FUNCS(Z_UNORM32), + FETCH_NULL(S_UINT8), /* Packed signed/normalized formats */ - { - MESA_FORMAT_A8B8G8R8_SNORM, - fetch_texel_1d_A8B8G8R8_SNORM, - fetch_texel_2d_A8B8G8R8_SNORM, - fetch_texel_3d_A8B8G8R8_SNORM - }, - { - MESA_FORMAT_X8B8G8R8_SNORM, - fetch_texel_1d_X8B8G8R8_SNORM, - fetch_texel_2d_X8B8G8R8_SNORM, - fetch_texel_3d_X8B8G8R8_SNORM - }, - { - MESA_FORMAT_R8G8B8A8_SNORM, - fetch_texel_1d_R8G8B8A8_SNORM, - fetch_texel_2d_R8G8B8A8_SNORM, - fetch_texel_3d_R8G8B8A8_SNORM - }, - { - MESA_FORMAT_R8G8B8X8_SNORM, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_R16G16_SNORM, - fetch_texel_1d_R16G16_SNORM, - fetch_texel_2d_R16G16_SNORM, - fetch_texel_3d_R16G16_SNORM - }, - { - MESA_FORMAT_G16R16_SNORM, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_R8G8_SNORM, - fetch_texel_1d_R8G8_SNORM, - fetch_texel_2d_R8G8_SNORM, - fetch_texel_3d_R8G8_SNORM - }, - { - MESA_FORMAT_G8R8_SNORM, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_L8A8_SNORM, - fetch_texel_1d_L8A8_SNORM, - fetch_texel_2d_L8A8_SNORM, - fetch_texel_3d_L8A8_SNORM - }, + FETCH_FUNCS(A8B8G8R8_SNORM), + FETCH_FUNCS(X8B8G8R8_SNORM), + FETCH_FUNCS(R8G8B8A8_SNORM), + FETCH_NULL(R8G8B8X8_SNORM), + FETCH_FUNCS(R16G16_SNORM), + FETCH_NULL(G16R16_SNORM), + FETCH_FUNCS(R8G8_SNORM), + FETCH_NULL(G8R8_SNORM), + FETCH_FUNCS(L8A8_SNORM), + FETCH_FUNCS(A8L8_SNORM), /* Array signed/normalized formats */ - { - MESA_FORMAT_A_SNORM8, - fetch_texel_1d_A_SNORM8, - fetch_texel_2d_A_SNORM8, - fetch_texel_3d_A_SNORM8 - }, - { - MESA_FORMAT_A_SNORM16, - fetch_texel_1d_A_SNORM16, - fetch_texel_2d_A_SNORM16, - fetch_texel_3d_A_SNORM16 - }, - { - MESA_FORMAT_L_SNORM8, - fetch_texel_1d_L_SNORM8, - fetch_texel_2d_L_SNORM8, - fetch_texel_3d_L_SNORM8 - }, - { - MESA_FORMAT_L_SNORM16, - fetch_texel_1d_L_SNORM16, - fetch_texel_2d_L_SNORM16, - fetch_texel_3d_L_SNORM16 - }, - { - MESA_FORMAT_I_SNORM8, - fetch_texel_1d_I_SNORM8, - fetch_texel_2d_I_SNORM8, - fetch_texel_3d_I_SNORM8 - }, - { - MESA_FORMAT_I_SNORM16, - fetch_texel_1d_I_SNORM16, - fetch_texel_2d_I_SNORM16, - fetch_texel_3d_I_SNORM16 - }, - { - MESA_FORMAT_R_SNORM8, - fetch_texel_1d_R_SNORM8, - fetch_texel_2d_R_SNORM8, - fetch_texel_3d_R_SNORM8 - }, - { - MESA_FORMAT_R_SNORM16, - fetch_texel_1d_R_SNORM16, - fetch_texel_2d_R_SNORM16, - fetch_texel_3d_R_SNORM16 - }, - { - MESA_FORMAT_LA_SNORM16, - fetch_texel_1d_LA_SNORM16, - fetch_texel_2d_LA_SNORM16, - fetch_texel_3d_LA_SNORM16 - }, - { - MESA_FORMAT_RGB_SNORM16, - fetch_texel_1d_RGB_SNORM16, - fetch_texel_2d_RGB_SNORM16, - fetch_texel_3d_RGB_SNORM16 - }, - { - MESA_FORMAT_RGBA_SNORM16, - fetch_texel_1d_RGBA_SNORM16, - fetch_texel_2d_RGBA_SNORM16, - fetch_texel_3d_RGBA_SNORM16 - }, - { - MESA_FORMAT_RGBX_SNORM16, - NULL, - NULL, - NULL - }, + FETCH_FUNCS(A_SNORM8), + FETCH_FUNCS(A_SNORM16), + FETCH_FUNCS(L_SNORM8), + FETCH_FUNCS(L_SNORM16), + FETCH_FUNCS(I_SNORM8), + FETCH_FUNCS(I_SNORM16), + FETCH_FUNCS(R_SNORM8), + FETCH_FUNCS(R_SNORM16), + FETCH_FUNCS(LA_SNORM16), + FETCH_FUNCS(RGB_SNORM16), + FETCH_FUNCS(RGBA_SNORM16), + FETCH_NULL(RGBX_SNORM16), /* Packed sRGB formats */ - { - MESA_FORMAT_A8B8G8R8_SRGB, - fetch_texel_1d_A8B8G8R8_SRGB, - fetch_texel_2d_A8B8G8R8_SRGB, - fetch_texel_3d_A8B8G8R8_SRGB - }, - { - MESA_FORMAT_B8G8R8A8_SRGB, - fetch_texel_1d_B8G8R8A8_SRGB, - fetch_texel_2d_B8G8R8A8_SRGB, - fetch_texel_3d_B8G8R8A8_SRGB - }, - { - MESA_FORMAT_B8G8R8X8_SRGB, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_R8G8B8A8_SRGB, - fetch_texel_1d_R8G8B8A8_SRGB, - fetch_texel_2d_R8G8B8A8_SRGB, - fetch_texel_3d_R8G8B8A8_SRGB - }, - { - MESA_FORMAT_R8G8B8X8_SRGB, - fetch_texel_1d_R8G8B8X8_SRGB, - fetch_texel_2d_R8G8B8X8_SRGB, - fetch_texel_3d_R8G8B8X8_SRGB - }, - { - MESA_FORMAT_L8A8_SRGB, - fetch_texel_1d_L8A8_SRGB, - fetch_texel_2d_L8A8_SRGB, - fetch_texel_3d_L8A8_SRGB - }, + 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 */ - { - MESA_FORMAT_L_SRGB8, - fetch_texel_1d_L_SRGB8, - fetch_texel_2d_L_SRGB8, - fetch_texel_3d_L_SRGB8 - }, - { - MESA_FORMAT_BGR_SRGB8, - fetch_texel_1d_BGR_SRGB8, - fetch_texel_2d_BGR_SRGB8, - fetch_texel_3d_BGR_SRGB8 - }, + FETCH_FUNCS(L_SRGB8), + FETCH_FUNCS(BGR_SRGB8), /* Packed float formats */ - { - MESA_FORMAT_R9G9B9E5_FLOAT, - fetch_texel_1d_R9G9B9E5_FLOAT, - fetch_texel_2d_R9G9B9E5_FLOAT, - fetch_texel_3d_R9G9B9E5_FLOAT - }, - { - MESA_FORMAT_R11G11B10_FLOAT, - fetch_texel_1d_R11G11B10_FLOAT, - fetch_texel_2d_R11G11B10_FLOAT, - fetch_texel_3d_R11G11B10_FLOAT - }, - { - MESA_FORMAT_Z32_FLOAT_S8X24_UINT, - fetch_texel_1d_Z32_FLOAT_S8X24_UINT, - fetch_texel_2d_Z32_FLOAT_S8X24_UINT, - fetch_texel_3d_Z32_FLOAT_S8X24_UINT - }, + FETCH_FUNCS(R9G9B9E5_FLOAT), + FETCH_FUNCS(R11G11B10_FLOAT), + FETCH_FUNCS(Z32_FLOAT_S8X24_UINT), /* Array float formats */ - { - MESA_FORMAT_A_FLOAT16, - fetch_texel_1d_A_FLOAT16, - fetch_texel_2d_A_FLOAT16, - fetch_texel_3d_A_FLOAT16 - }, - { - MESA_FORMAT_A_FLOAT32, - fetch_texel_1d_A_FLOAT32, - fetch_texel_2d_A_FLOAT32, - fetch_texel_3d_A_FLOAT32 - }, - { - MESA_FORMAT_L_FLOAT16, - fetch_texel_1d_L_FLOAT16, - fetch_texel_2d_L_FLOAT16, - fetch_texel_3d_L_FLOAT16 - }, - { - MESA_FORMAT_L_FLOAT32, - fetch_texel_1d_L_FLOAT32, - fetch_texel_2d_L_FLOAT32, - fetch_texel_3d_L_FLOAT32 - }, - { - MESA_FORMAT_LA_FLOAT16, - fetch_texel_1d_LA_FLOAT16, - fetch_texel_2d_LA_FLOAT16, - fetch_texel_3d_LA_FLOAT16 - }, - { - MESA_FORMAT_LA_FLOAT32, - fetch_texel_1d_LA_FLOAT32, - fetch_texel_2d_LA_FLOAT32, - fetch_texel_3d_LA_FLOAT32 - }, - { - MESA_FORMAT_I_FLOAT16, - fetch_texel_1d_I_FLOAT16, - fetch_texel_2d_I_FLOAT16, - fetch_texel_3d_I_FLOAT16 - }, - { - MESA_FORMAT_I_FLOAT32, - fetch_texel_1d_I_FLOAT32, - fetch_texel_2d_I_FLOAT32, - fetch_texel_3d_I_FLOAT32 - }, - { - MESA_FORMAT_R_FLOAT16, - fetch_texel_1d_R_FLOAT16, - fetch_texel_2d_R_FLOAT16, - fetch_texel_3d_R_FLOAT16 - }, - { - MESA_FORMAT_R_FLOAT32, - fetch_texel_1d_R_FLOAT32, - fetch_texel_2d_R_FLOAT32, - fetch_texel_3d_R_FLOAT32 - }, - { - MESA_FORMAT_RG_FLOAT16, - fetch_texel_1d_RG_FLOAT16, - fetch_texel_2d_RG_FLOAT16, - fetch_texel_3d_RG_FLOAT16 - }, - { - MESA_FORMAT_RG_FLOAT32, - fetch_texel_1d_RG_FLOAT32, - fetch_texel_2d_RG_FLOAT32, - fetch_texel_3d_RG_FLOAT32 - }, - { - MESA_FORMAT_RGB_FLOAT16, - fetch_texel_1d_RGB_FLOAT16, - fetch_texel_2d_RGB_FLOAT16, - fetch_texel_3d_RGB_FLOAT16 - }, - { - MESA_FORMAT_RGB_FLOAT32, - fetch_texel_1d_RGB_FLOAT32, - fetch_texel_2d_RGB_FLOAT32, - fetch_texel_3d_RGB_FLOAT32 - }, - { - MESA_FORMAT_RGBA_FLOAT16, - fetch_texel_1d_RGBA_FLOAT16, - fetch_texel_2d_RGBA_FLOAT16, - fetch_texel_3d_RGBA_FLOAT16 - }, - { - MESA_FORMAT_RGBA_FLOAT32, - fetch_texel_1d_RGBA_FLOAT32, - fetch_texel_2d_RGBA_FLOAT32, - fetch_texel_3d_RGBA_FLOAT32 - }, - { - MESA_FORMAT_RGBX_FLOAT16, - fetch_texel_1d_RGBX_FLOAT16, - fetch_texel_2d_RGBX_FLOAT16, - fetch_texel_3d_RGBX_FLOAT16 - }, - { - MESA_FORMAT_RGBX_FLOAT32, - fetch_texel_1d_RGBX_FLOAT32, - fetch_texel_2d_RGBX_FLOAT32, - fetch_texel_3d_RGBX_FLOAT32 - }, + FETCH_FUNCS(A_FLOAT16), + FETCH_FUNCS(A_FLOAT32), + FETCH_FUNCS(L_FLOAT16), + FETCH_FUNCS(L_FLOAT32), + FETCH_FUNCS(LA_FLOAT16), + FETCH_FUNCS(LA_FLOAT32), + FETCH_FUNCS(I_FLOAT16), + FETCH_FUNCS(I_FLOAT32), + FETCH_FUNCS(R_FLOAT16), + FETCH_FUNCS(R_FLOAT32), + FETCH_FUNCS(RG_FLOAT16), + FETCH_FUNCS(RG_FLOAT32), + FETCH_FUNCS(RGB_FLOAT16), + FETCH_FUNCS(RGB_FLOAT32), + FETCH_FUNCS(RGBA_FLOAT16), + FETCH_FUNCS(RGBA_FLOAT32), + FETCH_FUNCS(RGBX_FLOAT16), + FETCH_FUNCS(RGBX_FLOAT32), { MESA_FORMAT_Z_FLOAT32, fetch_texel_1d_R_FLOAT32, /* Reuse the R32F functions. */ @@ -783,530 +290,178 @@ texfetch_funcs[] = }, /* Packed signed/unsigned non-normalized integer formats */ - { - MESA_FORMAT_B10G10R10A2_UINT, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_R10G10B10A2_UINT, - NULL, - NULL, - NULL - }, + 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 */ - { - MESA_FORMAT_A_UINT8, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_A_UINT16, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_A_UINT32, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_A_SINT8, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_A_SINT16, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_A_SINT32, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_I_UINT8, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_I_UINT16, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_I_UINT32, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_I_SINT8, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_I_SINT16, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_I_SINT32, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_L_UINT8, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_L_UINT16, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_L_UINT32, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_L_SINT8, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_L_SINT16, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_L_SINT32, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_LA_UINT8, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_LA_UINT16, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_LA_UINT32, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_LA_SINT8, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_LA_SINT16, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_LA_SINT32, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_R_UINT8, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_R_UINT16, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_R_UINT32, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_R_SINT8, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_R_SINT16, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_R_SINT32, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_RG_UINT8, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_RG_UINT16, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_RG_UINT32, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_RG_SINT8, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_RG_SINT16, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_RG_SINT32, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_RGB_UINT8, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_RGB_UINT16, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_RGB_UINT32, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_RGB_SINT8, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_RGB_SINT16, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_RGB_SINT32, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_RGBA_UINT8, - fetch_texel_1d_rgba_uint8, - fetch_texel_2d_rgba_uint8, - fetch_texel_3d_rgba_uint8 - }, - { - MESA_FORMAT_RGBA_UINT16, - fetch_texel_1d_rgba_uint16, - fetch_texel_2d_rgba_uint16, - fetch_texel_3d_rgba_uint16 - }, - { - MESA_FORMAT_RGBA_UINT32, - fetch_texel_1d_rgba_uint32, - fetch_texel_2d_rgba_uint32, - fetch_texel_3d_rgba_uint32 - }, - { - MESA_FORMAT_RGBA_SINT8, - fetch_texel_1d_rgba_int8, - fetch_texel_2d_rgba_int8, - fetch_texel_3d_rgba_int8 - }, - { - MESA_FORMAT_RGBA_SINT16, - fetch_texel_1d_rgba_int16, - fetch_texel_2d_rgba_int16, - fetch_texel_3d_rgba_int16 - }, - { - MESA_FORMAT_RGBA_SINT32, - fetch_texel_1d_rgba_int32, - fetch_texel_2d_rgba_int32, - fetch_texel_3d_rgba_int32 - }, - { - MESA_FORMAT_RGBX_UINT8, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_RGBX_UINT16, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_RGBX_UINT32, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_RGBX_SINT8, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_RGBX_SINT16, - NULL, - NULL, - NULL - }, - { - MESA_FORMAT_RGBX_SINT32, - NULL, - NULL, - NULL - }, + FETCH_NULL(A_UINT8), + FETCH_NULL(A_UINT16), + FETCH_NULL(A_UINT32), + FETCH_NULL(A_SINT8), + FETCH_NULL(A_SINT16), + FETCH_NULL(A_SINT32), + FETCH_NULL(I_UINT8), + FETCH_NULL(I_UINT16), + FETCH_NULL(I_UINT32), + FETCH_NULL(I_SINT8), + FETCH_NULL(I_SINT16), + FETCH_NULL(I_SINT32), + FETCH_NULL(L_UINT8), + FETCH_NULL(L_UINT16), + FETCH_NULL(L_UINT32), + FETCH_NULL(L_SINT8), + FETCH_NULL(L_SINT16), + FETCH_NULL(L_SINT32), + FETCH_NULL(LA_UINT8), + FETCH_NULL(LA_UINT16), + FETCH_NULL(LA_UINT32), + FETCH_NULL(LA_SINT8), + FETCH_NULL(LA_SINT16), + FETCH_NULL(LA_SINT32), + FETCH_NULL(R_UINT8), + FETCH_NULL(R_UINT16), + FETCH_NULL(R_UINT32), + FETCH_NULL(R_SINT8), + FETCH_NULL(R_SINT16), + FETCH_NULL(R_SINT32), + FETCH_NULL(RG_UINT8), + FETCH_NULL(RG_UINT16), + FETCH_NULL(RG_UINT32), + FETCH_NULL(RG_SINT8), + FETCH_NULL(RG_SINT16), + FETCH_NULL(RG_SINT32), + FETCH_NULL(RGB_UINT8), + FETCH_NULL(RGB_UINT16), + FETCH_NULL(RGB_UINT32), + FETCH_NULL(RGB_SINT8), + FETCH_NULL(RGB_SINT16), + FETCH_NULL(RGB_SINT32), + FETCH_FUNCS(RGBA_UINT8), + FETCH_FUNCS(RGBA_UINT16), + FETCH_FUNCS(RGBA_UINT32), + FETCH_FUNCS(RGBA_SINT8), + FETCH_FUNCS(RGBA_SINT16), + FETCH_FUNCS(RGBA_SINT32), + FETCH_NULL(RGBX_UINT8), + FETCH_NULL(RGBX_UINT16), + FETCH_NULL(RGBX_UINT32), + FETCH_NULL(RGBX_SINT8), + FETCH_NULL(RGBX_SINT16), + 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) }; @@ -1327,7 +482,7 @@ set_fetch_functions(const struct gl_sampler_object *samp, } #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) { @@ -1352,7 +507,7 @@ set_fetch_functions(const struct gl_sampler_object *samp, texImage->FetchCompressedTexel = _mesa_get_compressed_fetch_func(format); - ASSERT(texImage->FetchTexel); + assert(texImage->FetchTexel); } void