KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: Fix MESA_FORMAT names with ALPH, INTENSITY, and LUMINANCE 

Compressed spelled out color components ALPHA, INTENSITY, and LUMINANCE to A, I, and L:
    s/MESA_FORMAT_ALPHA_UINT8\b/MESA_FORMAT_A_UINT8/g'
    s/MESA_FORMAT_ALPHA_UINT16\b/MESA_FORMAT_A_UINT16/g'
    s/MESA_FORMAT_ALPHA_UINT32\b/MESA_FORMAT_A_UINT32/g'
    s/MESA_FORMAT_ALPHA_INT32\b/MESA_FORMAT_A_SINT32/g'
    s/MESA_FORMAT_ALPHA_INT16\b/MESA_FORMAT_A_SINT16/g'
    s/MESA_FORMAT_ALPHA_INT8\b/MESA_FORMAT_A_SINT8/g'
    s/MESA_FORMAT_INTENSITY_UINT8\b/MESA_FORMAT_I_UINT8/g'
    s/MESA_FORMAT_INTENSITY_UINT16\b/MESA_FORMAT_I_UINT16/g'
    s/MESA_FORMAT_INTENSITY_UINT32\b/MESA_FORMAT_I_UINT32/g'
    s/MESA_FORMAT_INTENSITY_INT32\b/MESA_FORMAT_I_SINT32/g'
    s/MESA_FORMAT_INTENSITY_INT16\b/MESA_FORMAT_I_SINT16/g'
    s/MESA_FORMAT_INTENSITY_INT8\b/MESA_FORMAT_I_SINT8/g'
    s/MESA_FORMAT_LUMINANCE_UINT8\b/MESA_FORMAT_L_UINT8/g'
    s/MESA_FORMAT_LUMINANCE_UINT16\b/MESA_FORMAT_L_UINT16/g'
    s/MESA_FORMAT_LUMINANCE_UINT32\b/MESA_FORMAT_L_UINT32/g'
    s/MESA_FORMAT_LUMINANCE_INT32\b/MESA_FORMAT_L_SINT32/g'
    s/MESA_FORMAT_LUMINANCE_INT16\b/MESA_FORMAT_L_SINT16/g'
    s/MESA_FORMAT_LUMINANCE_INT8\b/MESA_FORMAT_L_SINT8/g'
    s/MESA_FORMAT_LUMINANCE_ALPHA_UINT8\b/MESA_FORMAT_LA_UINT8/g'
    s/MESA_FORMAT_LUMINANCE_ALPHA_UINT16\b/MESA_FORMAT_LA_UINT16/g'
    s/MESA_FORMAT_LUMINANCE_ALPHA_UINT32\b/MESA_FORMAT_LA_UINT32/g'
    s/MESA_FORMAT_LUMINANCE_ALPHA_INT32\b/MESA_FORMAT_LA_SINT32/g'
    s/MESA_FORMAT_LUMINANCE_ALPHA_INT16\b/MESA_FORMAT_LA_SINT16/g'
    s/MESA_FORMAT_LUMINANCE_ALPHA_INT8\b/MESA_FORMAT_LA_SINT8/g'
    s/MESA_FORMAT_ALPHA_FLOAT16\b/MESA_FORMAT_A_FLOAT16/g'
    s/MESA_FORMAT_ALPHA_FLOAT32\b/MESA_FORMAT_A_FLOAT32/g'
    s/MESA_FORMAT_INTESITY_FLOAT16\b/MESA_FORMAT_I_FLOAT16/g'
    s/MESA_FORMAT_INTESITY_FLOAT32\b/MESA_FORMAT_I_FLOAT32/g'
    s/MESA_FORMAT_INTENSITY_FLOAT16\b/MESA_FORMAT_I_FLOAT16/g'
    s/MESA_FORMAT_INTENSITY_FLOAT32\b/MESA_FORMAT_I_FLOAT32/g'
    s/MESA_FORMAT_LUMINANCE_FLOAT16\b/MESA_FORMAT_L_FLOAT16/g'
    s/MESA_FORMAT_LUMINANCE_FLOAT32\b/MESA_FORMAT_L_FLOAT32/g'
    s/MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16\b/MESA_FORMAT_LA_FLOAT16/g'
    s/MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32\b/MESA_FORMAT_LA_FLOAT32/g'
This commit is contained in:
Mark Mueller 2014-01-21 21:44:59 -08:00
parent eeed49f5f2
commit 2e02e195fe
11 changed files with 510 additions and 510 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/mesa/drivers/dri/i965/brw_surface_formats.c
View File

@ -386,46 +386,46 @@ brw_format_for_mesa_format(mesa_format mesa_format)
[MESA_FORMAT_RGBA_FLOAT16] = BRW_SURFACEFORMAT_R16G16B16A16_FLOAT, [MESA_FORMAT_RGBA_FLOAT16] = BRW_SURFACEFORMAT_R16G16B16A16_FLOAT,
[MESA_FORMAT_RGB_FLOAT32] = BRW_SURFACEFORMAT_R32G32B32_FLOAT, [MESA_FORMAT_RGB_FLOAT32] = BRW_SURFACEFORMAT_R32G32B32_FLOAT,
[MESA_FORMAT_RGB_FLOAT16] = BRW_SURFACEFORMAT_R16G16B16_FLOAT, [MESA_FORMAT_RGB_FLOAT16] = BRW_SURFACEFORMAT_R16G16B16_FLOAT,
[MESA_FORMAT_ALPHA_FLOAT32] = BRW_SURFACEFORMAT_A32_FLOAT, [MESA_FORMAT_A_FLOAT32] = BRW_SURFACEFORMAT_A32_FLOAT,
[MESA_FORMAT_ALPHA_FLOAT16] = BRW_SURFACEFORMAT_A16_FLOAT, [MESA_FORMAT_A_FLOAT16] = BRW_SURFACEFORMAT_A16_FLOAT,
[MESA_FORMAT_LUMINANCE_FLOAT32] = BRW_SURFACEFORMAT_L32_FLOAT, [MESA_FORMAT_L_FLOAT32] = BRW_SURFACEFORMAT_L32_FLOAT,
[MESA_FORMAT_LUMINANCE_FLOAT16] = BRW_SURFACEFORMAT_L16_FLOAT, [MESA_FORMAT_L_FLOAT16] = BRW_SURFACEFORMAT_L16_FLOAT,
[MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32] = BRW_SURFACEFORMAT_L32A32_FLOAT, [MESA_FORMAT_LA_FLOAT32] = BRW_SURFACEFORMAT_L32A32_FLOAT,
[MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16] = BRW_SURFACEFORMAT_L16A16_FLOAT, [MESA_FORMAT_LA_FLOAT16] = BRW_SURFACEFORMAT_L16A16_FLOAT,
[MESA_FORMAT_INTENSITY_FLOAT32] = BRW_SURFACEFORMAT_I32_FLOAT, [MESA_FORMAT_I_FLOAT32] = BRW_SURFACEFORMAT_I32_FLOAT,
[MESA_FORMAT_INTENSITY_FLOAT16] = BRW_SURFACEFORMAT_I16_FLOAT, [MESA_FORMAT_I_FLOAT16] = BRW_SURFACEFORMAT_I16_FLOAT,
[MESA_FORMAT_R_FLOAT32] = BRW_SURFACEFORMAT_R32_FLOAT, [MESA_FORMAT_R_FLOAT32] = BRW_SURFACEFORMAT_R32_FLOAT,
[MESA_FORMAT_R_FLOAT16] = BRW_SURFACEFORMAT_R16_FLOAT, [MESA_FORMAT_R_FLOAT16] = BRW_SURFACEFORMAT_R16_FLOAT,
[MESA_FORMAT_RG_FLOAT32] = BRW_SURFACEFORMAT_R32G32_FLOAT, [MESA_FORMAT_RG_FLOAT32] = BRW_SURFACEFORMAT_R32G32_FLOAT,
[MESA_FORMAT_RG_FLOAT16] = BRW_SURFACEFORMAT_R16G16_FLOAT, [MESA_FORMAT_RG_FLOAT16] = BRW_SURFACEFORMAT_R16G16_FLOAT,
[MESA_FORMAT_ALPHA_UINT8] = 0, [MESA_FORMAT_A_UINT8] = 0,
[MESA_FORMAT_ALPHA_UINT16] = 0, [MESA_FORMAT_A_UINT16] = 0,
[MESA_FORMAT_ALPHA_UINT32] = 0, [MESA_FORMAT_A_UINT32] = 0,
[MESA_FORMAT_ALPHA_INT8] = 0, [MESA_FORMAT_A_SINT8] = 0,
[MESA_FORMAT_ALPHA_INT16] = 0, [MESA_FORMAT_A_SINT16] = 0,
[MESA_FORMAT_ALPHA_INT32] = 0, [MESA_FORMAT_A_SINT32] = 0,
[MESA_FORMAT_INTENSITY_UINT8] = 0, [MESA_FORMAT_I_UINT8] = 0,
[MESA_FORMAT_INTENSITY_UINT16] = 0, [MESA_FORMAT_I_UINT16] = 0,
[MESA_FORMAT_INTENSITY_UINT32] = 0, [MESA_FORMAT_I_UINT32] = 0,
[MESA_FORMAT_INTENSITY_INT8] = 0, [MESA_FORMAT_I_SINT8] = 0,
[MESA_FORMAT_INTENSITY_INT16] = 0, [MESA_FORMAT_I_SINT16] = 0,
[MESA_FORMAT_INTENSITY_INT32] = 0, [MESA_FORMAT_I_SINT32] = 0,
[MESA_FORMAT_LUMINANCE_UINT8] = 0, [MESA_FORMAT_L_UINT8] = 0,
[MESA_FORMAT_LUMINANCE_UINT16] = 0, [MESA_FORMAT_L_UINT16] = 0,
[MESA_FORMAT_LUMINANCE_UINT32] = 0, [MESA_FORMAT_L_UINT32] = 0,
[MESA_FORMAT_LUMINANCE_INT8] = 0, [MESA_FORMAT_L_SINT8] = 0,
[MESA_FORMAT_LUMINANCE_INT16] = 0, [MESA_FORMAT_L_SINT16] = 0,
[MESA_FORMAT_LUMINANCE_INT32] = 0, [MESA_FORMAT_L_SINT32] = 0,
[MESA_FORMAT_LUMINANCE_ALPHA_UINT8] = 0, [MESA_FORMAT_LA_UINT8] = 0,
[MESA_FORMAT_LUMINANCE_ALPHA_UINT16] = 0, [MESA_FORMAT_LA_UINT16] = 0,
[MESA_FORMAT_LUMINANCE_ALPHA_UINT32] = 0, [MESA_FORMAT_LA_UINT32] = 0,
[MESA_FORMAT_LUMINANCE_ALPHA_INT8] = 0, [MESA_FORMAT_LA_SINT8] = 0,
[MESA_FORMAT_LUMINANCE_ALPHA_INT16] = 0, [MESA_FORMAT_LA_SINT16] = 0,
[MESA_FORMAT_LUMINANCE_ALPHA_INT32] = 0, [MESA_FORMAT_LA_SINT32] = 0,
[MESA_FORMAT_R_INT8] = BRW_SURFACEFORMAT_R8_SINT, [MESA_FORMAT_R_INT8] = BRW_SURFACEFORMAT_R8_SINT,
[MESA_FORMAT_RG_INT8] = BRW_SURFACEFORMAT_R8G8_SINT, [MESA_FORMAT_RG_INT8] = BRW_SURFACEFORMAT_R8G8_SINT,

16
src/mesa/drivers/dri/radeon/radeon_texture.c
View File

@ -403,21 +403,21 @@ mesa_format radeonChooseTextureFormat(struct gl_context * ctx,
return MESA_FORMAT_RGBA_DXT5; return MESA_FORMAT_RGBA_DXT5;
case GL_ALPHA16F_ARB: case GL_ALPHA16F_ARB:
return MESA_FORMAT_ALPHA_FLOAT16; return MESA_FORMAT_A_FLOAT16;
case GL_ALPHA32F_ARB: case GL_ALPHA32F_ARB:
return MESA_FORMAT_ALPHA_FLOAT32; return MESA_FORMAT_A_FLOAT32;
case GL_LUMINANCE16F_ARB: case GL_LUMINANCE16F_ARB:
return MESA_FORMAT_LUMINANCE_FLOAT16; return MESA_FORMAT_L_FLOAT16;
case GL_LUMINANCE32F_ARB: case GL_LUMINANCE32F_ARB:
return MESA_FORMAT_LUMINANCE_FLOAT32; return MESA_FORMAT_L_FLOAT32;
case GL_LUMINANCE_ALPHA16F_ARB: case GL_LUMINANCE_ALPHA16F_ARB:
return MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16; return MESA_FORMAT_LA_FLOAT16;
case GL_LUMINANCE_ALPHA32F_ARB: case GL_LUMINANCE_ALPHA32F_ARB:
return MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32; return MESA_FORMAT_LA_FLOAT32;
case GL_INTENSITY16F_ARB: case GL_INTENSITY16F_ARB:
return MESA_FORMAT_INTENSITY_FLOAT16; return MESA_FORMAT_I_FLOAT16;
case GL_INTENSITY32F_ARB: case GL_INTENSITY32F_ARB:
return MESA_FORMAT_INTENSITY_FLOAT32; return MESA_FORMAT_I_FLOAT32;
case GL_RGB16F_ARB: case GL_RGB16F_ARB:
return MESA_FORMAT_RGBA_FLOAT16; return MESA_FORMAT_RGBA_FLOAT16;
case GL_RGB32F_ARB: case GL_RGB32F_ARB:

44
src/mesa/main/format_pack.c
View File

@ -1229,7 +1229,7 @@ pack_float_RGB_FLOAT16(const GLfloat src[4], void *dst)
} }
/* MESA_FORMAT_ALPHA_FLOAT32 */ /* MESA_FORMAT_A_FLOAT32 */
static void static void
pack_ubyte_ALPHA_FLOAT32(const GLubyte src[4], void *dst) pack_ubyte_ALPHA_FLOAT32(const GLubyte src[4], void *dst)
@ -1246,7 +1246,7 @@ pack_float_ALPHA_FLOAT32(const GLfloat src[4], void *dst)
} }
/* MESA_FORMAT_ALPHA_FLOAT16 */ /* MESA_FORMAT_A_FLOAT16 */
static void static void
pack_ubyte_ALPHA_FLOAT16(const GLubyte src[4], void *dst) pack_ubyte_ALPHA_FLOAT16(const GLubyte src[4], void *dst)
@ -1263,7 +1263,7 @@ pack_float_ALPHA_FLOAT16(const GLfloat src[4], void *dst)
} }
/* MESA_FORMAT_LUMINANCE_FLOAT32 (and INTENSITY_FLOAT32, R_FLOAT32) */ /* MESA_FORMAT_L_FLOAT32 (and INTENSITY_FLOAT32, R_FLOAT32) */
static void static void
pack_ubyte_LUMINANCE_FLOAT32(const GLubyte src[4], void *dst) pack_ubyte_LUMINANCE_FLOAT32(const GLubyte src[4], void *dst)
@ -1280,7 +1280,7 @@ pack_float_LUMINANCE_FLOAT32(const GLfloat src[4], void *dst)
} }
/* MESA_FORMAT_LUMINANCE_FLOAT16 (and INTENSITY_FLOAT16, R_FLOAT32) */ /* MESA_FORMAT_L_FLOAT16 (and INTENSITY_FLOAT16, R_FLOAT32) */
static void static void
pack_ubyte_LUMINANCE_FLOAT16(const GLubyte src[4], void *dst) pack_ubyte_LUMINANCE_FLOAT16(const GLubyte src[4], void *dst)
@ -1297,7 +1297,7 @@ pack_float_LUMINANCE_FLOAT16(const GLfloat src[4], void *dst)
} }
/* MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32 */ /* MESA_FORMAT_LA_FLOAT32 */
static void static void
pack_ubyte_LUMINANCE_ALPHA_FLOAT32(const GLubyte src[4], void *dst) pack_ubyte_LUMINANCE_ALPHA_FLOAT32(const GLubyte src[4], void *dst)
@ -1316,7 +1316,7 @@ pack_float_LUMINANCE_ALPHA_FLOAT32(const GLfloat src[4], void *dst)
} }
/* MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16 */ /* MESA_FORMAT_LA_FLOAT16 */
static void static void
pack_ubyte_LUMINANCE_ALPHA_FLOAT16(const GLubyte src[4], void *dst) pack_ubyte_LUMINANCE_ALPHA_FLOAT16(const GLubyte src[4], void *dst)
@ -1961,14 +1961,14 @@ _mesa_get_pack_ubyte_rgba_function(mesa_format format)
table[MESA_FORMAT_RGBA_FLOAT16] = pack_ubyte_RGBA_FLOAT16; table[MESA_FORMAT_RGBA_FLOAT16] = pack_ubyte_RGBA_FLOAT16;
table[MESA_FORMAT_RGB_FLOAT32] = pack_ubyte_RGB_FLOAT32; table[MESA_FORMAT_RGB_FLOAT32] = pack_ubyte_RGB_FLOAT32;
table[MESA_FORMAT_RGB_FLOAT16] = pack_ubyte_RGB_FLOAT16; table[MESA_FORMAT_RGB_FLOAT16] = pack_ubyte_RGB_FLOAT16;
table[MESA_FORMAT_ALPHA_FLOAT32] = pack_ubyte_ALPHA_FLOAT32; table[MESA_FORMAT_A_FLOAT32] = pack_ubyte_ALPHA_FLOAT32;
table[MESA_FORMAT_ALPHA_FLOAT16] = pack_ubyte_ALPHA_FLOAT16; table[MESA_FORMAT_A_FLOAT16] = pack_ubyte_ALPHA_FLOAT16;
table[MESA_FORMAT_LUMINANCE_FLOAT32] = pack_ubyte_LUMINANCE_FLOAT32; table[MESA_FORMAT_L_FLOAT32] = pack_ubyte_LUMINANCE_FLOAT32;
table[MESA_FORMAT_LUMINANCE_FLOAT16] = pack_ubyte_LUMINANCE_FLOAT16; table[MESA_FORMAT_L_FLOAT16] = pack_ubyte_LUMINANCE_FLOAT16;
table[MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32] = pack_ubyte_LUMINANCE_ALPHA_FLOAT32; table[MESA_FORMAT_LA_FLOAT32] = pack_ubyte_LUMINANCE_ALPHA_FLOAT32;
table[MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16] = pack_ubyte_LUMINANCE_ALPHA_FLOAT16; table[MESA_FORMAT_LA_FLOAT16] = pack_ubyte_LUMINANCE_ALPHA_FLOAT16;
table[MESA_FORMAT_INTENSITY_FLOAT32] = pack_ubyte_LUMINANCE_FLOAT32; table[MESA_FORMAT_I_FLOAT32] = pack_ubyte_LUMINANCE_FLOAT32;
table[MESA_FORMAT_INTENSITY_FLOAT16] = pack_ubyte_LUMINANCE_FLOAT16; table[MESA_FORMAT_I_FLOAT16] = pack_ubyte_LUMINANCE_FLOAT16;
table[MESA_FORMAT_R_FLOAT32] = pack_ubyte_LUMINANCE_FLOAT32; table[MESA_FORMAT_R_FLOAT32] = pack_ubyte_LUMINANCE_FLOAT32;
table[MESA_FORMAT_R_FLOAT16] = pack_ubyte_LUMINANCE_FLOAT16; table[MESA_FORMAT_R_FLOAT16] = pack_ubyte_LUMINANCE_FLOAT16;
table[MESA_FORMAT_RG_FLOAT32] = pack_ubyte_RG_FLOAT32; table[MESA_FORMAT_RG_FLOAT32] = pack_ubyte_RG_FLOAT32;
@ -2124,15 +2124,15 @@ _mesa_get_pack_float_rgba_function(mesa_format format)
table[MESA_FORMAT_RGBA_FLOAT16] = pack_float_RGBA_FLOAT16; table[MESA_FORMAT_RGBA_FLOAT16] = pack_float_RGBA_FLOAT16;
table[MESA_FORMAT_RGB_FLOAT32] = pack_float_RGB_FLOAT32; table[MESA_FORMAT_RGB_FLOAT32] = pack_float_RGB_FLOAT32;
table[MESA_FORMAT_RGB_FLOAT16] = pack_float_RGB_FLOAT16; table[MESA_FORMAT_RGB_FLOAT16] = pack_float_RGB_FLOAT16;
table[MESA_FORMAT_ALPHA_FLOAT32] = pack_float_ALPHA_FLOAT32; table[MESA_FORMAT_A_FLOAT32] = pack_float_ALPHA_FLOAT32;
table[MESA_FORMAT_ALPHA_FLOAT16] = pack_float_ALPHA_FLOAT16; table[MESA_FORMAT_A_FLOAT16] = pack_float_ALPHA_FLOAT16;
table[MESA_FORMAT_LUMINANCE_FLOAT32] = pack_float_LUMINANCE_FLOAT32; table[MESA_FORMAT_L_FLOAT32] = pack_float_LUMINANCE_FLOAT32;
table[MESA_FORMAT_LUMINANCE_FLOAT16] = pack_float_LUMINANCE_FLOAT16; table[MESA_FORMAT_L_FLOAT16] = pack_float_LUMINANCE_FLOAT16;
table[MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32] = pack_float_LUMINANCE_ALPHA_FLOAT32; table[MESA_FORMAT_LA_FLOAT32] = pack_float_LUMINANCE_ALPHA_FLOAT32;
table[MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16] = pack_float_LUMINANCE_ALPHA_FLOAT16; table[MESA_FORMAT_LA_FLOAT16] = pack_float_LUMINANCE_ALPHA_FLOAT16;
table[MESA_FORMAT_INTENSITY_FLOAT32] = pack_float_LUMINANCE_FLOAT32; table[MESA_FORMAT_I_FLOAT32] = pack_float_LUMINANCE_FLOAT32;
table[MESA_FORMAT_INTENSITY_FLOAT16] = pack_float_LUMINANCE_FLOAT16; table[MESA_FORMAT_I_FLOAT16] = pack_float_LUMINANCE_FLOAT16;
table[MESA_FORMAT_R_FLOAT32] = pack_float_LUMINANCE_FLOAT32; table[MESA_FORMAT_R_FLOAT32] = pack_float_LUMINANCE_FLOAT32;
table[MESA_FORMAT_R_FLOAT16] = pack_float_LUMINANCE_FLOAT16; table[MESA_FORMAT_R_FLOAT16] = pack_float_LUMINANCE_FLOAT16;
table[MESA_FORMAT_RG_FLOAT32] = pack_float_RG_FLOAT32; table[MESA_FORMAT_RG_FLOAT32] = pack_float_RG_FLOAT32;

112
src/mesa/main/format_unpack.c
View File

@ -2387,46 +2387,46 @@ get_unpack_rgba_function(mesa_format format)
table[MESA_FORMAT_RGBA_FLOAT16] = unpack_RGBA_FLOAT16; table[MESA_FORMAT_RGBA_FLOAT16] = unpack_RGBA_FLOAT16;
table[MESA_FORMAT_RGB_FLOAT32] = unpack_RGB_FLOAT32; table[MESA_FORMAT_RGB_FLOAT32] = unpack_RGB_FLOAT32;
table[MESA_FORMAT_RGB_FLOAT16] = unpack_RGB_FLOAT16; table[MESA_FORMAT_RGB_FLOAT16] = unpack_RGB_FLOAT16;
table[MESA_FORMAT_ALPHA_FLOAT32] = unpack_ALPHA_FLOAT32; table[MESA_FORMAT_A_FLOAT32] = unpack_ALPHA_FLOAT32;
table[MESA_FORMAT_ALPHA_FLOAT16] = unpack_ALPHA_FLOAT16; table[MESA_FORMAT_A_FLOAT16] = unpack_ALPHA_FLOAT16;
table[MESA_FORMAT_LUMINANCE_FLOAT32] = unpack_LUMINANCE_FLOAT32; table[MESA_FORMAT_L_FLOAT32] = unpack_LUMINANCE_FLOAT32;
table[MESA_FORMAT_LUMINANCE_FLOAT16] = unpack_LUMINANCE_FLOAT16; table[MESA_FORMAT_L_FLOAT16] = unpack_LUMINANCE_FLOAT16;
table[MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32] = unpack_LUMINANCE_ALPHA_FLOAT32; table[MESA_FORMAT_LA_FLOAT32] = unpack_LUMINANCE_ALPHA_FLOAT32;
table[MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16] = unpack_LUMINANCE_ALPHA_FLOAT16; table[MESA_FORMAT_LA_FLOAT16] = unpack_LUMINANCE_ALPHA_FLOAT16;
table[MESA_FORMAT_INTENSITY_FLOAT32] = unpack_INTENSITY_FLOAT32; table[MESA_FORMAT_I_FLOAT32] = unpack_INTENSITY_FLOAT32;
table[MESA_FORMAT_INTENSITY_FLOAT16] = unpack_INTENSITY_FLOAT16; table[MESA_FORMAT_I_FLOAT16] = unpack_INTENSITY_FLOAT16;
table[MESA_FORMAT_R_FLOAT32] = unpack_R_FLOAT32; table[MESA_FORMAT_R_FLOAT32] = unpack_R_FLOAT32;
table[MESA_FORMAT_R_FLOAT16] = unpack_R_FLOAT16; table[MESA_FORMAT_R_FLOAT16] = unpack_R_FLOAT16;
table[MESA_FORMAT_RG_FLOAT32] = unpack_RG_FLOAT32; table[MESA_FORMAT_RG_FLOAT32] = unpack_RG_FLOAT32;
table[MESA_FORMAT_RG_FLOAT16] = unpack_RG_FLOAT16; table[MESA_FORMAT_RG_FLOAT16] = unpack_RG_FLOAT16;
table[MESA_FORMAT_ALPHA_UINT8] = unpack_ALPHA_UINT8; table[MESA_FORMAT_A_UINT8] = unpack_ALPHA_UINT8;
table[MESA_FORMAT_ALPHA_UINT16] = unpack_ALPHA_UINT16; table[MESA_FORMAT_A_UINT16] = unpack_ALPHA_UINT16;
table[MESA_FORMAT_ALPHA_UINT32] = unpack_ALPHA_UINT32; table[MESA_FORMAT_A_UINT32] = unpack_ALPHA_UINT32;
table[MESA_FORMAT_ALPHA_INT8] = unpack_ALPHA_INT8; table[MESA_FORMAT_A_SINT8] = unpack_ALPHA_INT8;
table[MESA_FORMAT_ALPHA_INT16] = unpack_ALPHA_INT16; table[MESA_FORMAT_A_SINT16] = unpack_ALPHA_INT16;
table[MESA_FORMAT_ALPHA_INT32] = unpack_ALPHA_INT32; table[MESA_FORMAT_A_SINT32] = unpack_ALPHA_INT32;
table[MESA_FORMAT_INTENSITY_UINT8] = unpack_INTENSITY_UINT8; table[MESA_FORMAT_I_UINT8] = unpack_INTENSITY_UINT8;
table[MESA_FORMAT_INTENSITY_UINT16] = unpack_INTENSITY_UINT16; table[MESA_FORMAT_I_UINT16] = unpack_INTENSITY_UINT16;
table[MESA_FORMAT_INTENSITY_UINT32] = unpack_INTENSITY_UINT32; table[MESA_FORMAT_I_UINT32] = unpack_INTENSITY_UINT32;
table[MESA_FORMAT_INTENSITY_INT8] = unpack_INTENSITY_INT8; table[MESA_FORMAT_I_SINT8] = unpack_INTENSITY_INT8;
table[MESA_FORMAT_INTENSITY_INT16] = unpack_INTENSITY_INT16; table[MESA_FORMAT_I_SINT16] = unpack_INTENSITY_INT16;
table[MESA_FORMAT_INTENSITY_INT32] = unpack_INTENSITY_INT32; table[MESA_FORMAT_I_SINT32] = unpack_INTENSITY_INT32;
table[MESA_FORMAT_LUMINANCE_UINT8] = unpack_LUMINANCE_UINT8; table[MESA_FORMAT_L_UINT8] = unpack_LUMINANCE_UINT8;
table[MESA_FORMAT_LUMINANCE_UINT16] = unpack_LUMINANCE_UINT16; table[MESA_FORMAT_L_UINT16] = unpack_LUMINANCE_UINT16;
table[MESA_FORMAT_LUMINANCE_UINT32] = unpack_LUMINANCE_UINT32; table[MESA_FORMAT_L_UINT32] = unpack_LUMINANCE_UINT32;
table[MESA_FORMAT_LUMINANCE_INT8] = unpack_LUMINANCE_INT8; table[MESA_FORMAT_L_SINT8] = unpack_LUMINANCE_INT8;
table[MESA_FORMAT_LUMINANCE_INT16] = unpack_LUMINANCE_INT16; table[MESA_FORMAT_L_SINT16] = unpack_LUMINANCE_INT16;
table[MESA_FORMAT_LUMINANCE_INT32] = unpack_LUMINANCE_INT32; table[MESA_FORMAT_L_SINT32] = unpack_LUMINANCE_INT32;
table[MESA_FORMAT_LUMINANCE_ALPHA_UINT8] = unpack_LUMINANCE_ALPHA_UINT8; table[MESA_FORMAT_LA_UINT8] = unpack_LUMINANCE_ALPHA_UINT8;
table[MESA_FORMAT_LUMINANCE_ALPHA_UINT16] = unpack_LUMINANCE_ALPHA_UINT16; table[MESA_FORMAT_LA_UINT16] = unpack_LUMINANCE_ALPHA_UINT16;
table[MESA_FORMAT_LUMINANCE_ALPHA_UINT32] = unpack_LUMINANCE_ALPHA_UINT32; table[MESA_FORMAT_LA_UINT32] = unpack_LUMINANCE_ALPHA_UINT32;
table[MESA_FORMAT_LUMINANCE_ALPHA_INT8] = unpack_LUMINANCE_ALPHA_INT8; table[MESA_FORMAT_LA_SINT8] = unpack_LUMINANCE_ALPHA_INT8;
table[MESA_FORMAT_LUMINANCE_ALPHA_INT16] = unpack_LUMINANCE_ALPHA_INT16; table[MESA_FORMAT_LA_SINT16] = unpack_LUMINANCE_ALPHA_INT16;
table[MESA_FORMAT_LUMINANCE_ALPHA_INT32] = unpack_LUMINANCE_ALPHA_INT32; table[MESA_FORMAT_LA_SINT32] = unpack_LUMINANCE_ALPHA_INT32;
table[MESA_FORMAT_R_INT8] = unpack_R_INT8; table[MESA_FORMAT_R_INT8] = unpack_R_INT8;
table[MESA_FORMAT_RG_INT8] = unpack_RG_INT8; table[MESA_FORMAT_RG_INT8] = unpack_RG_INT8;
@ -3731,78 +3731,78 @@ _mesa_unpack_uint_rgba_row(mesa_format format, GLuint n,
unpack_int_rgba_R_INT8(src, dst, n); unpack_int_rgba_R_INT8(src, dst, n);
break; break;
case MESA_FORMAT_ALPHA_UINT32: case MESA_FORMAT_A_UINT32:
case MESA_FORMAT_ALPHA_INT32: case MESA_FORMAT_A_SINT32:
unpack_int_rgba_ALPHA_UINT32(src, dst, n); unpack_int_rgba_ALPHA_UINT32(src, dst, n);
break; break;
case MESA_FORMAT_ALPHA_UINT16: case MESA_FORMAT_A_UINT16:
unpack_int_rgba_ALPHA_UINT16(src, dst, n); unpack_int_rgba_ALPHA_UINT16(src, dst, n);
break; break;
case MESA_FORMAT_ALPHA_INT16: case MESA_FORMAT_A_SINT16:
unpack_int_rgba_ALPHA_INT16(src, dst, n); unpack_int_rgba_ALPHA_INT16(src, dst, n);
break; break;
case MESA_FORMAT_ALPHA_UINT8: case MESA_FORMAT_A_UINT8:
unpack_int_rgba_ALPHA_UINT8(src, dst, n); unpack_int_rgba_ALPHA_UINT8(src, dst, n);
break; break;
case MESA_FORMAT_ALPHA_INT8: case MESA_FORMAT_A_SINT8:
unpack_int_rgba_ALPHA_INT8(src, dst, n); unpack_int_rgba_ALPHA_INT8(src, dst, n);
break; break;
case MESA_FORMAT_LUMINANCE_UINT32: case MESA_FORMAT_L_UINT32:
case MESA_FORMAT_LUMINANCE_INT32: case MESA_FORMAT_L_SINT32:
unpack_int_rgba_LUMINANCE_UINT32(src, dst, n); unpack_int_rgba_LUMINANCE_UINT32(src, dst, n);
break; break;
case MESA_FORMAT_LUMINANCE_UINT16: case MESA_FORMAT_L_UINT16:
unpack_int_rgba_LUMINANCE_UINT16(src, dst, n); unpack_int_rgba_LUMINANCE_UINT16(src, dst, n);
break; break;
case MESA_FORMAT_LUMINANCE_INT16: case MESA_FORMAT_L_SINT16:
unpack_int_rgba_LUMINANCE_INT16(src, dst, n); unpack_int_rgba_LUMINANCE_INT16(src, dst, n);
break; break;
case MESA_FORMAT_LUMINANCE_UINT8: case MESA_FORMAT_L_UINT8:
unpack_int_rgba_LUMINANCE_UINT8(src, dst, n); unpack_int_rgba_LUMINANCE_UINT8(src, dst, n);
break; break;
case MESA_FORMAT_LUMINANCE_INT8: case MESA_FORMAT_L_SINT8:
unpack_int_rgba_LUMINANCE_INT8(src, dst, n); unpack_int_rgba_LUMINANCE_INT8(src, dst, n);
break; break;
case MESA_FORMAT_LUMINANCE_ALPHA_UINT32: case MESA_FORMAT_LA_UINT32:
case MESA_FORMAT_LUMINANCE_ALPHA_INT32: case MESA_FORMAT_LA_SINT32:
unpack_int_rgba_LUMINANCE_ALPHA_UINT32(src, dst, n); unpack_int_rgba_LUMINANCE_ALPHA_UINT32(src, dst, n);
break; break;
case MESA_FORMAT_LUMINANCE_ALPHA_UINT16: case MESA_FORMAT_LA_UINT16:
unpack_int_rgba_LUMINANCE_ALPHA_UINT16(src, dst, n); unpack_int_rgba_LUMINANCE_ALPHA_UINT16(src, dst, n);
break; break;
case MESA_FORMAT_LUMINANCE_ALPHA_INT16: case MESA_FORMAT_LA_SINT16:
unpack_int_rgba_LUMINANCE_ALPHA_INT16(src, dst, n); unpack_int_rgba_LUMINANCE_ALPHA_INT16(src, dst, n);
break; break;
case MESA_FORMAT_LUMINANCE_ALPHA_UINT8: case MESA_FORMAT_LA_UINT8:
unpack_int_rgba_LUMINANCE_ALPHA_UINT8(src, dst, n); unpack_int_rgba_LUMINANCE_ALPHA_UINT8(src, dst, n);
break; break;
case MESA_FORMAT_LUMINANCE_ALPHA_INT8: case MESA_FORMAT_LA_SINT8:
unpack_int_rgba_LUMINANCE_ALPHA_INT8(src, dst, n); unpack_int_rgba_LUMINANCE_ALPHA_INT8(src, dst, n);
break; break;
case MESA_FORMAT_INTENSITY_UINT32: case MESA_FORMAT_I_UINT32:
case MESA_FORMAT_INTENSITY_INT32: case MESA_FORMAT_I_SINT32:
unpack_int_rgba_INTENSITY_UINT32(src, dst, n); unpack_int_rgba_INTENSITY_UINT32(src, dst, n);
break; break;
case MESA_FORMAT_INTENSITY_UINT16: case MESA_FORMAT_I_UINT16:
unpack_int_rgba_INTENSITY_UINT16(src, dst, n); unpack_int_rgba_INTENSITY_UINT16(src, dst, n);
break; break;
case MESA_FORMAT_INTENSITY_INT16: case MESA_FORMAT_I_SINT16:
unpack_int_rgba_INTENSITY_INT16(src, dst, n); unpack_int_rgba_INTENSITY_INT16(src, dst, n);
break; break;
case MESA_FORMAT_INTENSITY_UINT8: case MESA_FORMAT_I_UINT8:
unpack_int_rgba_INTENSITY_UINT8(src, dst, n); unpack_int_rgba_INTENSITY_UINT8(src, dst, n);
break; break;
case MESA_FORMAT_INTENSITY_INT8: case MESA_FORMAT_I_SINT8:
unpack_int_rgba_INTENSITY_INT8(src, dst, n); unpack_int_rgba_INTENSITY_INT8(src, dst, n);
break; break;

256
src/mesa/main/formats.c
View File

@ -666,8 +666,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 6 1, 1, 6
}, },
{ {
MESA_FORMAT_ALPHA_FLOAT32, MESA_FORMAT_A_FLOAT32,
"MESA_FORMAT_ALPHA_FLOAT32", "MESA_FORMAT_A_FLOAT32",
GL_ALPHA, GL_ALPHA,
GL_FLOAT, GL_FLOAT,
0, 0, 0, 32, 0, 0, 0, 32,
@ -675,8 +675,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 4 1, 1, 4
}, },
{ {
MESA_FORMAT_ALPHA_FLOAT16, MESA_FORMAT_A_FLOAT16,
"MESA_FORMAT_ALPHA_FLOAT16", "MESA_FORMAT_A_FLOAT16",
GL_ALPHA, GL_ALPHA,
GL_FLOAT, GL_FLOAT,
0, 0, 0, 16, 0, 0, 0, 16,
@ -684,8 +684,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 2 1, 1, 2
}, },
{ {
MESA_FORMAT_LUMINANCE_FLOAT32, MESA_FORMAT_L_FLOAT32,
"MESA_FORMAT_LUMINANCE_FLOAT32", "MESA_FORMAT_L_FLOAT32",
GL_LUMINANCE, GL_LUMINANCE,
GL_FLOAT, GL_FLOAT,
0, 0, 0, 0, 0, 0, 0, 0,
@ -693,8 +693,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 4 1, 1, 4
}, },
{ {
MESA_FORMAT_LUMINANCE_FLOAT16, MESA_FORMAT_L_FLOAT16,
"MESA_FORMAT_LUMINANCE_FLOAT16", "MESA_FORMAT_L_FLOAT16",
GL_LUMINANCE, GL_LUMINANCE,
GL_FLOAT, GL_FLOAT,
0, 0, 0, 0, 0, 0, 0, 0,
@ -702,8 +702,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 2 1, 1, 2
}, },
{ {
MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32, MESA_FORMAT_LA_FLOAT32,
"MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32", "MESA_FORMAT_LA_FLOAT32",
GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA,
GL_FLOAT, GL_FLOAT,
0, 0, 0, 32, 0, 0, 0, 32,
@ -711,8 +711,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 8 1, 1, 8
}, },
{ {
MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16, MESA_FORMAT_LA_FLOAT16,
"MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16", "MESA_FORMAT_LA_FLOAT16",
GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA,
GL_FLOAT, GL_FLOAT,
0, 0, 0, 16, 0, 0, 0, 16,
@ -720,8 +720,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 4 1, 1, 4
}, },
{ {
MESA_FORMAT_INTENSITY_FLOAT32, MESA_FORMAT_I_FLOAT32,
"MESA_FORMAT_INTENSITY_FLOAT32", "MESA_FORMAT_I_FLOAT32",
GL_INTENSITY, GL_INTENSITY,
GL_FLOAT, GL_FLOAT,
0, 0, 0, 0, 0, 0, 0, 0,
@ -729,8 +729,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 4 1, 1, 4
}, },
{ {
MESA_FORMAT_INTENSITY_FLOAT16, MESA_FORMAT_I_FLOAT16,
"MESA_FORMAT_INTENSITY_FLOAT16", "MESA_FORMAT_I_FLOAT16",
GL_INTENSITY, GL_INTENSITY,
GL_FLOAT, GL_FLOAT,
0, 0, 0, 0, 0, 0, 0, 0,
@ -777,8 +777,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
/* unnormalized signed int formats */ /* unnormalized signed int formats */
/* unnormalized unsigned int formats */ /* unnormalized unsigned int formats */
{ {
MESA_FORMAT_ALPHA_UINT8, MESA_FORMAT_A_UINT8,
"MESA_FORMAT_ALPHA_UINT8", "MESA_FORMAT_A_UINT8",
GL_ALPHA, GL_ALPHA,
GL_UNSIGNED_INT, GL_UNSIGNED_INT,
0, 0, 0, 8, 0, 0, 0, 8,
@ -786,8 +786,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 1 1, 1, 1
}, },
{ {
MESA_FORMAT_ALPHA_UINT16, MESA_FORMAT_A_UINT16,
"MESA_FORMAT_ALPHA_UINT16", "MESA_FORMAT_A_UINT16",
GL_ALPHA, GL_ALPHA,
GL_UNSIGNED_INT, GL_UNSIGNED_INT,
0, 0, 0, 16, 0, 0, 0, 16,
@ -795,8 +795,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 2 1, 1, 2
}, },
{ {
MESA_FORMAT_ALPHA_UINT32, MESA_FORMAT_A_UINT32,
"MESA_FORMAT_ALPHA_UINT32", "MESA_FORMAT_A_UINT32",
GL_ALPHA, GL_ALPHA,
GL_UNSIGNED_INT, GL_UNSIGNED_INT,
0, 0, 0, 32, 0, 0, 0, 32,
@ -804,8 +804,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 4 1, 1, 4
}, },
{ {
MESA_FORMAT_ALPHA_INT8, MESA_FORMAT_A_SINT8,
"MESA_FORMAT_ALPHA_INT8", "MESA_FORMAT_A_SINT8",
GL_ALPHA, GL_ALPHA,
GL_INT, GL_INT,
0, 0, 0, 8, 0, 0, 0, 8,
@ -813,8 +813,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 1 1, 1, 1
}, },
{ {
MESA_FORMAT_ALPHA_INT16, MESA_FORMAT_A_SINT16,
"MESA_FORMAT_ALPHA_INT16", "MESA_FORMAT_A_SINT16",
GL_ALPHA, GL_ALPHA,
GL_INT, GL_INT,
0, 0, 0, 16, 0, 0, 0, 16,
@ -822,8 +822,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 2 1, 1, 2
}, },
{ {
MESA_FORMAT_ALPHA_INT32, MESA_FORMAT_A_SINT32,
"MESA_FORMAT_ALPHA_INT32", "MESA_FORMAT_A_SINT32",
GL_ALPHA, GL_ALPHA,
GL_INT, GL_INT,
0, 0, 0, 32, 0, 0, 0, 32,
@ -831,8 +831,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 4 1, 1, 4
}, },
{ {
MESA_FORMAT_INTENSITY_UINT8, MESA_FORMAT_I_UINT8,
"MESA_FORMAT_INTENSITY_UINT8", "MESA_FORMAT_I_UINT8",
GL_INTENSITY, GL_INTENSITY,
GL_UNSIGNED_INT, GL_UNSIGNED_INT,
0, 0, 0, 0, 0, 0, 0, 0,
@ -840,8 +840,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 1 1, 1, 1
}, },
{ {
MESA_FORMAT_INTENSITY_UINT16, MESA_FORMAT_I_UINT16,
"MESA_FORMAT_INTENSITY_UINT16", "MESA_FORMAT_I_UINT16",
GL_INTENSITY, GL_INTENSITY,
GL_UNSIGNED_INT, GL_UNSIGNED_INT,
0, 0, 0, 0, 0, 0, 0, 0,
@ -849,8 +849,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 2 1, 1, 2
}, },
{ {
MESA_FORMAT_INTENSITY_UINT32, MESA_FORMAT_I_UINT32,
"MESA_FORMAT_INTENSITY_UINT32", "MESA_FORMAT_I_UINT32",
GL_INTENSITY, GL_INTENSITY,
GL_UNSIGNED_INT, GL_UNSIGNED_INT,
0, 0, 0, 0, 0, 0, 0, 0,
@ -858,8 +858,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 4 1, 1, 4
}, },
{ {
MESA_FORMAT_INTENSITY_INT8, MESA_FORMAT_I_SINT8,
"MESA_FORMAT_INTENSITY_INT8", "MESA_FORMAT_I_SINT8",
GL_INTENSITY, GL_INTENSITY,
GL_INT, GL_INT,
0, 0, 0, 0, 0, 0, 0, 0,
@ -867,8 +867,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 1 1, 1, 1
}, },
{ {
MESA_FORMAT_INTENSITY_INT16, MESA_FORMAT_I_SINT16,
"MESA_FORMAT_INTENSITY_INT16", "MESA_FORMAT_I_SINT16",
GL_INTENSITY, GL_INTENSITY,
GL_INT, GL_INT,
0, 0, 0, 0, 0, 0, 0, 0,
@ -876,8 +876,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 2 1, 1, 2
}, },
{ {
MESA_FORMAT_INTENSITY_INT32, MESA_FORMAT_I_SINT32,
"MESA_FORMAT_INTENSITY_INT32", "MESA_FORMAT_I_SINT32",
GL_INTENSITY, GL_INTENSITY,
GL_INT, GL_INT,
0, 0, 0, 0, 0, 0, 0, 0,
@ -885,8 +885,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 4 1, 1, 4
}, },
{ {
MESA_FORMAT_LUMINANCE_UINT8, MESA_FORMAT_L_UINT8,
"MESA_FORMAT_LUMINANCE_UINT8", "MESA_FORMAT_L_UINT8",
GL_LUMINANCE, GL_LUMINANCE,
GL_UNSIGNED_INT, GL_UNSIGNED_INT,
0, 0, 0, 0, 0, 0, 0, 0,
@ -894,8 +894,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 1 1, 1, 1
}, },
{ {
MESA_FORMAT_LUMINANCE_UINT16, MESA_FORMAT_L_UINT16,
"MESA_FORMAT_LUMINANCE_UINT16", "MESA_FORMAT_L_UINT16",
GL_LUMINANCE, GL_LUMINANCE,
GL_UNSIGNED_INT, GL_UNSIGNED_INT,
0, 0, 0, 0, 0, 0, 0, 0,
@ -903,8 +903,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 2 1, 1, 2
}, },
{ {
MESA_FORMAT_LUMINANCE_UINT32, MESA_FORMAT_L_UINT32,
"MESA_FORMAT_LUMINANCE_UINT32", "MESA_FORMAT_L_UINT32",
GL_LUMINANCE, GL_LUMINANCE,
GL_UNSIGNED_INT, GL_UNSIGNED_INT,
0, 0, 0, 0, 0, 0, 0, 0,
@ -912,8 +912,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 4 1, 1, 4
}, },
{ {
MESA_FORMAT_LUMINANCE_INT8, MESA_FORMAT_L_SINT8,
"MESA_FORMAT_LUMINANCE_INT8", "MESA_FORMAT_L_SINT8",
GL_LUMINANCE, GL_LUMINANCE,
GL_INT, GL_INT,
0, 0, 0, 0, 0, 0, 0, 0,
@ -921,8 +921,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 1 1, 1, 1
}, },
{ {
MESA_FORMAT_LUMINANCE_INT16, MESA_FORMAT_L_SINT16,
"MESA_FORMAT_LUMINANCE_INT16", "MESA_FORMAT_L_SINT16",
GL_LUMINANCE, GL_LUMINANCE,
GL_INT, GL_INT,
0, 0, 0, 0, 0, 0, 0, 0,
@ -930,8 +930,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 2 1, 1, 2
}, },
{ {
MESA_FORMAT_LUMINANCE_INT32, MESA_FORMAT_L_SINT32,
"MESA_FORMAT_LUMINANCE_INT32", "MESA_FORMAT_L_SINT32",
GL_LUMINANCE, GL_LUMINANCE,
GL_INT, GL_INT,
0, 0, 0, 0, 0, 0, 0, 0,
@ -939,8 +939,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 4 1, 1, 4
}, },
{ {
MESA_FORMAT_LUMINANCE_ALPHA_UINT8, MESA_FORMAT_LA_UINT8,
"MESA_FORMAT_LUMINANCE_ALPHA_UINT8", "MESA_FORMAT_LA_UINT8",
GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA,
GL_UNSIGNED_INT, GL_UNSIGNED_INT,
0, 0, 0, 8, 0, 0, 0, 8,
@ -948,8 +948,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 2 1, 1, 2
}, },
{ {
MESA_FORMAT_LUMINANCE_ALPHA_UINT16, MESA_FORMAT_LA_UINT16,
"MESA_FORMAT_LUMINANCE_ALPHA_UINT16", "MESA_FORMAT_LA_UINT16",
GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA,
GL_UNSIGNED_INT, GL_UNSIGNED_INT,
0, 0, 0, 16, 0, 0, 0, 16,
@ -957,8 +957,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 4 1, 1, 4
}, },
{ {
MESA_FORMAT_LUMINANCE_ALPHA_UINT32, MESA_FORMAT_LA_UINT32,
"MESA_FORMAT_LUMINANCE_ALPHA_UINT32", "MESA_FORMAT_LA_UINT32",
GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA,
GL_UNSIGNED_INT, GL_UNSIGNED_INT,
0, 0, 0, 32, 0, 0, 0, 32,
@ -966,8 +966,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 8 1, 1, 8
}, },
{ {
MESA_FORMAT_LUMINANCE_ALPHA_INT8, MESA_FORMAT_LA_SINT8,
"MESA_FORMAT_LUMINANCE_ALPHA_INT8", "MESA_FORMAT_LA_SINT8",
GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA,
GL_INT, GL_INT,
0, 0, 0, 8, 0, 0, 0, 8,
@ -975,8 +975,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 2 1, 1, 2
}, },
{ {
MESA_FORMAT_LUMINANCE_ALPHA_INT16, MESA_FORMAT_LA_SINT16,
"MESA_FORMAT_LUMINANCE_ALPHA_INT16", "MESA_FORMAT_LA_SINT16",
GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA,
GL_INT, GL_INT,
0, 0, 0, 16, 0, 0, 0, 16,
@ -984,8 +984,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 4 1, 1, 4
}, },
{ {
MESA_FORMAT_LUMINANCE_ALPHA_INT32, MESA_FORMAT_LA_SINT32,
"MESA_FORMAT_LUMINANCE_ALPHA_INT32", "MESA_FORMAT_LA_SINT32",
GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA,
GL_INT, GL_INT,
0, 0, 0, 32, 0, 0, 0, 32,
@ -2625,91 +2625,91 @@ _mesa_format_to_type_and_comps(mesa_format format,
*datatype = GL_HALF_FLOAT_ARB; *datatype = GL_HALF_FLOAT_ARB;
*comps = 3; *comps = 3;
return; return;
case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32: case MESA_FORMAT_LA_FLOAT32:
case MESA_FORMAT_RG_FLOAT32: case MESA_FORMAT_RG_FLOAT32:
*datatype = GL_FLOAT; *datatype = GL_FLOAT;
*comps = 2; *comps = 2;
return; return;
case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16: case MESA_FORMAT_LA_FLOAT16:
case MESA_FORMAT_RG_FLOAT16: case MESA_FORMAT_RG_FLOAT16:
*datatype = GL_HALF_FLOAT_ARB; *datatype = GL_HALF_FLOAT_ARB;
*comps = 2; *comps = 2;
return; return;
case MESA_FORMAT_ALPHA_FLOAT32: case MESA_FORMAT_A_FLOAT32:
case MESA_FORMAT_LUMINANCE_FLOAT32: case MESA_FORMAT_L_FLOAT32:
case MESA_FORMAT_INTENSITY_FLOAT32: case MESA_FORMAT_I_FLOAT32:
case MESA_FORMAT_R_FLOAT32: case MESA_FORMAT_R_FLOAT32:
*datatype = GL_FLOAT; *datatype = GL_FLOAT;
*comps = 1; *comps = 1;
return; return;
case MESA_FORMAT_ALPHA_FLOAT16: case MESA_FORMAT_A_FLOAT16:
case MESA_FORMAT_LUMINANCE_FLOAT16: case MESA_FORMAT_L_FLOAT16:
case MESA_FORMAT_INTENSITY_FLOAT16: case MESA_FORMAT_I_FLOAT16:
case MESA_FORMAT_R_FLOAT16: case MESA_FORMAT_R_FLOAT16:
*datatype = GL_HALF_FLOAT_ARB; *datatype = GL_HALF_FLOAT_ARB;
*comps = 1; *comps = 1;
return; return;
case MESA_FORMAT_ALPHA_UINT8: case MESA_FORMAT_A_UINT8:
case MESA_FORMAT_LUMINANCE_UINT8: case MESA_FORMAT_L_UINT8:
case MESA_FORMAT_INTENSITY_UINT8: case MESA_FORMAT_I_UINT8:
*datatype = GL_UNSIGNED_BYTE; *datatype = GL_UNSIGNED_BYTE;
*comps = 1; *comps = 1;
return; return;
case MESA_FORMAT_LUMINANCE_ALPHA_UINT8: case MESA_FORMAT_LA_UINT8:
*datatype = GL_UNSIGNED_BYTE; *datatype = GL_UNSIGNED_BYTE;
*comps = 2; *comps = 2;
return; return;
case MESA_FORMAT_ALPHA_UINT16: case MESA_FORMAT_A_UINT16:
case MESA_FORMAT_LUMINANCE_UINT16: case MESA_FORMAT_L_UINT16:
case MESA_FORMAT_INTENSITY_UINT16: case MESA_FORMAT_I_UINT16:
*datatype = GL_UNSIGNED_SHORT; *datatype = GL_UNSIGNED_SHORT;
*comps = 1; *comps = 1;
return; return;
case MESA_FORMAT_LUMINANCE_ALPHA_UINT16: case MESA_FORMAT_LA_UINT16:
*datatype = GL_UNSIGNED_SHORT; *datatype = GL_UNSIGNED_SHORT;
*comps = 2; *comps = 2;
return; return;
case MESA_FORMAT_ALPHA_UINT32: case MESA_FORMAT_A_UINT32:
case MESA_FORMAT_LUMINANCE_UINT32: case MESA_FORMAT_L_UINT32:
case MESA_FORMAT_INTENSITY_UINT32: case MESA_FORMAT_I_UINT32:
*datatype = GL_UNSIGNED_INT; *datatype = GL_UNSIGNED_INT;
*comps = 1; *comps = 1;
return; return;
case MESA_FORMAT_LUMINANCE_ALPHA_UINT32: case MESA_FORMAT_LA_UINT32:
*datatype = GL_UNSIGNED_INT; *datatype = GL_UNSIGNED_INT;
*comps = 2; *comps = 2;
return; return;
case MESA_FORMAT_ALPHA_INT8: case MESA_FORMAT_A_SINT8:
case MESA_FORMAT_LUMINANCE_INT8: case MESA_FORMAT_L_SINT8:
case MESA_FORMAT_INTENSITY_INT8: case MESA_FORMAT_I_SINT8:
*datatype = GL_BYTE; *datatype = GL_BYTE;
*comps = 1; *comps = 1;
return; return;
case MESA_FORMAT_LUMINANCE_ALPHA_INT8: case MESA_FORMAT_LA_SINT8:
*datatype = GL_BYTE; *datatype = GL_BYTE;
*comps = 2; *comps = 2;
return; return;
case MESA_FORMAT_ALPHA_INT16: case MESA_FORMAT_A_SINT16:
case MESA_FORMAT_LUMINANCE_INT16: case MESA_FORMAT_L_SINT16:
case MESA_FORMAT_INTENSITY_INT16: case MESA_FORMAT_I_SINT16:
*datatype = GL_SHORT; *datatype = GL_SHORT;
*comps = 1; *comps = 1;
return; return;
case MESA_FORMAT_LUMINANCE_ALPHA_INT16: case MESA_FORMAT_LA_SINT16:
*datatype = GL_SHORT; *datatype = GL_SHORT;
*comps = 2; *comps = 2;
return; return;
case MESA_FORMAT_ALPHA_INT32: case MESA_FORMAT_A_SINT32:
case MESA_FORMAT_LUMINANCE_INT32: case MESA_FORMAT_L_SINT32:
case MESA_FORMAT_INTENSITY_INT32: case MESA_FORMAT_I_SINT32:
*datatype = GL_INT; *datatype = GL_INT;
*comps = 1; *comps = 1;
return; return;
case MESA_FORMAT_LUMINANCE_ALPHA_INT32: case MESA_FORMAT_LA_SINT32:
*datatype = GL_INT; *datatype = GL_INT;
*comps = 2; *comps = 2;
return; return;
@ -3164,24 +3164,24 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format,
case MESA_FORMAT_RGB_FLOAT16: case MESA_FORMAT_RGB_FLOAT16:
return format == GL_RGB && type == GL_HALF_FLOAT && !swapBytes; return format == GL_RGB && type == GL_HALF_FLOAT && !swapBytes;
case MESA_FORMAT_ALPHA_FLOAT32: case MESA_FORMAT_A_FLOAT32:
return format == GL_ALPHA && type == GL_FLOAT && !swapBytes; return format == GL_ALPHA && type == GL_FLOAT && !swapBytes;
case MESA_FORMAT_ALPHA_FLOAT16: case MESA_FORMAT_A_FLOAT16:
return format == GL_ALPHA && type == GL_HALF_FLOAT && !swapBytes; return format == GL_ALPHA && type == GL_HALF_FLOAT && !swapBytes;
case MESA_FORMAT_LUMINANCE_FLOAT32: case MESA_FORMAT_L_FLOAT32:
return format == GL_LUMINANCE && type == GL_FLOAT && !swapBytes; return format == GL_LUMINANCE && type == GL_FLOAT && !swapBytes;
case MESA_FORMAT_LUMINANCE_FLOAT16: case MESA_FORMAT_L_FLOAT16:
return format == GL_LUMINANCE && type == GL_HALF_FLOAT && !swapBytes; return format == GL_LUMINANCE && type == GL_HALF_FLOAT && !swapBytes;
case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32: case MESA_FORMAT_LA_FLOAT32:
return format == GL_LUMINANCE_ALPHA && type == GL_FLOAT && !swapBytes; return format == GL_LUMINANCE_ALPHA && type == GL_FLOAT && !swapBytes;
case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16: case MESA_FORMAT_LA_FLOAT16:
return format == GL_LUMINANCE_ALPHA && type == GL_HALF_FLOAT && !swapBytes; return format == GL_LUMINANCE_ALPHA && type == GL_HALF_FLOAT && !swapBytes;
case MESA_FORMAT_INTENSITY_FLOAT32: case MESA_FORMAT_I_FLOAT32:
return format == GL_INTENSITY && type == GL_FLOAT && !swapBytes; return format == GL_INTENSITY && type == GL_FLOAT && !swapBytes;
case MESA_FORMAT_INTENSITY_FLOAT16: case MESA_FORMAT_I_FLOAT16:
return format == GL_INTENSITY && type == GL_HALF_FLOAT && !swapBytes; return format == GL_INTENSITY && type == GL_HALF_FLOAT && !swapBytes;
case MESA_FORMAT_R_FLOAT32: case MESA_FORMAT_R_FLOAT32:
@ -3194,62 +3194,62 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format,
case MESA_FORMAT_RG_FLOAT16: case MESA_FORMAT_RG_FLOAT16:
return format == GL_RG && type == GL_HALF_FLOAT && !swapBytes; return format == GL_RG && type == GL_HALF_FLOAT && !swapBytes;
case MESA_FORMAT_ALPHA_UINT8: case MESA_FORMAT_A_UINT8:
return format == GL_ALPHA_INTEGER && type == GL_UNSIGNED_BYTE; return format == GL_ALPHA_INTEGER && type == GL_UNSIGNED_BYTE;
case MESA_FORMAT_ALPHA_UINT16: case MESA_FORMAT_A_UINT16:
return format == GL_ALPHA_INTEGER && type == GL_UNSIGNED_SHORT && return format == GL_ALPHA_INTEGER && type == GL_UNSIGNED_SHORT &&
!swapBytes; !swapBytes;
case MESA_FORMAT_ALPHA_UINT32: case MESA_FORMAT_A_UINT32:
return format == GL_ALPHA_INTEGER && type == GL_UNSIGNED_INT && return format == GL_ALPHA_INTEGER && type == GL_UNSIGNED_INT &&
!swapBytes; !swapBytes;
case MESA_FORMAT_ALPHA_INT8: case MESA_FORMAT_A_SINT8:
return format == GL_ALPHA_INTEGER && type == GL_BYTE; return format == GL_ALPHA_INTEGER && type == GL_BYTE;
case MESA_FORMAT_ALPHA_INT16: case MESA_FORMAT_A_SINT16:
return format == GL_ALPHA_INTEGER && type == GL_SHORT && !swapBytes; return format == GL_ALPHA_INTEGER && type == GL_SHORT && !swapBytes;
case MESA_FORMAT_ALPHA_INT32: case MESA_FORMAT_A_SINT32:
return format == GL_ALPHA_INTEGER && type == GL_INT && !swapBytes; return format == GL_ALPHA_INTEGER && type == GL_INT && !swapBytes;
case MESA_FORMAT_INTENSITY_UINT8: case MESA_FORMAT_I_UINT8:
case MESA_FORMAT_INTENSITY_UINT16: case MESA_FORMAT_I_UINT16:
case MESA_FORMAT_INTENSITY_UINT32: case MESA_FORMAT_I_UINT32:
case MESA_FORMAT_INTENSITY_INT8: case MESA_FORMAT_I_SINT8:
case MESA_FORMAT_INTENSITY_INT16: case MESA_FORMAT_I_SINT16:
case MESA_FORMAT_INTENSITY_INT32: case MESA_FORMAT_I_SINT32:
/* GL_INTENSITY_INTEGER_EXT doesn't exist. */ /* GL_INTENSITY_INTEGER_EXT doesn't exist. */
return GL_FALSE; return GL_FALSE;
case MESA_FORMAT_LUMINANCE_UINT8: case MESA_FORMAT_L_UINT8:
return format == GL_LUMINANCE_INTEGER_EXT && type == GL_UNSIGNED_BYTE; return format == GL_LUMINANCE_INTEGER_EXT && type == GL_UNSIGNED_BYTE;
case MESA_FORMAT_LUMINANCE_UINT16: case MESA_FORMAT_L_UINT16:
return format == GL_LUMINANCE_INTEGER_EXT && type == GL_UNSIGNED_SHORT && return format == GL_LUMINANCE_INTEGER_EXT && type == GL_UNSIGNED_SHORT &&
!swapBytes; !swapBytes;
case MESA_FORMAT_LUMINANCE_UINT32: case MESA_FORMAT_L_UINT32:
return format == GL_LUMINANCE_INTEGER_EXT && type == GL_UNSIGNED_INT && return format == GL_LUMINANCE_INTEGER_EXT && type == GL_UNSIGNED_INT &&
!swapBytes; !swapBytes;
case MESA_FORMAT_LUMINANCE_INT8: case MESA_FORMAT_L_SINT8:
return format == GL_LUMINANCE_INTEGER_EXT && type == GL_BYTE; return format == GL_LUMINANCE_INTEGER_EXT && type == GL_BYTE;
case MESA_FORMAT_LUMINANCE_INT16: case MESA_FORMAT_L_SINT16:
return format == GL_LUMINANCE_INTEGER_EXT && type == GL_SHORT && return format == GL_LUMINANCE_INTEGER_EXT && type == GL_SHORT &&
!swapBytes; !swapBytes;
case MESA_FORMAT_LUMINANCE_INT32: case MESA_FORMAT_L_SINT32:
return format == GL_LUMINANCE_INTEGER_EXT && type == GL_INT && !swapBytes; return format == GL_LUMINANCE_INTEGER_EXT && type == GL_INT && !swapBytes;
case MESA_FORMAT_LUMINANCE_ALPHA_UINT8: case MESA_FORMAT_LA_UINT8:
return format == GL_LUMINANCE_ALPHA_INTEGER_EXT && return format == GL_LUMINANCE_ALPHA_INTEGER_EXT &&
type == GL_UNSIGNED_BYTE && !swapBytes; type == GL_UNSIGNED_BYTE && !swapBytes;
case MESA_FORMAT_LUMINANCE_ALPHA_UINT16: case MESA_FORMAT_LA_UINT16:
return format == GL_LUMINANCE_ALPHA_INTEGER_EXT && return format == GL_LUMINANCE_ALPHA_INTEGER_EXT &&
type == GL_UNSIGNED_SHORT && !swapBytes; type == GL_UNSIGNED_SHORT && !swapBytes;
case MESA_FORMAT_LUMINANCE_ALPHA_UINT32: case MESA_FORMAT_LA_UINT32:
return format == GL_LUMINANCE_ALPHA_INTEGER_EXT && return format == GL_LUMINANCE_ALPHA_INTEGER_EXT &&
type == GL_UNSIGNED_INT && !swapBytes; type == GL_UNSIGNED_INT && !swapBytes;
case MESA_FORMAT_LUMINANCE_ALPHA_INT8: case MESA_FORMAT_LA_SINT8:
return format == GL_LUMINANCE_ALPHA_INTEGER_EXT && type == GL_BYTE && return format == GL_LUMINANCE_ALPHA_INTEGER_EXT && type == GL_BYTE &&
!swapBytes; !swapBytes;
case MESA_FORMAT_LUMINANCE_ALPHA_INT16: case MESA_FORMAT_LA_SINT16:
return format == GL_LUMINANCE_ALPHA_INTEGER_EXT && type == GL_SHORT && return format == GL_LUMINANCE_ALPHA_INTEGER_EXT && type == GL_SHORT &&
!swapBytes; !swapBytes;
case MESA_FORMAT_LUMINANCE_ALPHA_INT32: case MESA_FORMAT_LA_SINT32:
return format == GL_LUMINANCE_ALPHA_INTEGER_EXT && type == GL_INT && return format == GL_LUMINANCE_ALPHA_INTEGER_EXT && type == GL_INT &&
!swapBytes; !swapBytes;

64
src/mesa/main/formats.h
View File

@ -450,14 +450,14 @@ typedef enum
MESA_FORMAT_RGBA_FLOAT16, MESA_FORMAT_RGBA_FLOAT16,
MESA_FORMAT_RGB_FLOAT32, MESA_FORMAT_RGB_FLOAT32,
MESA_FORMAT_RGB_FLOAT16, MESA_FORMAT_RGB_FLOAT16,
MESA_FORMAT_ALPHA_FLOAT32, MESA_FORMAT_A_FLOAT32,
MESA_FORMAT_ALPHA_FLOAT16, MESA_FORMAT_A_FLOAT16,
MESA_FORMAT_LUMINANCE_FLOAT32, MESA_FORMAT_L_FLOAT32,
MESA_FORMAT_LUMINANCE_FLOAT16, MESA_FORMAT_L_FLOAT16,
MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32, MESA_FORMAT_LA_FLOAT32,
MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16, MESA_FORMAT_LA_FLOAT16,
MESA_FORMAT_INTENSITY_FLOAT32, MESA_FORMAT_I_FLOAT32,
MESA_FORMAT_INTENSITY_FLOAT16, MESA_FORMAT_I_FLOAT16,
MESA_FORMAT_R_FLOAT32, MESA_FORMAT_R_FLOAT32,
MESA_FORMAT_R_FLOAT16, MESA_FORMAT_R_FLOAT16,
MESA_FORMAT_RG_FLOAT32, MESA_FORMAT_RG_FLOAT32,
@ -471,32 +471,32 @@ typedef enum
*/ */
/* Type A formats */ /* Type A formats */
MESA_FORMAT_ALPHA_UINT8, MESA_FORMAT_A_UINT8,
MESA_FORMAT_ALPHA_UINT16, MESA_FORMAT_A_UINT16,
MESA_FORMAT_ALPHA_UINT32, MESA_FORMAT_A_UINT32,
MESA_FORMAT_ALPHA_INT8, MESA_FORMAT_A_SINT8,
MESA_FORMAT_ALPHA_INT16, MESA_FORMAT_A_SINT16,
MESA_FORMAT_ALPHA_INT32, MESA_FORMAT_A_SINT32,
MESA_FORMAT_INTENSITY_UINT8, MESA_FORMAT_I_UINT8,
MESA_FORMAT_INTENSITY_UINT16, MESA_FORMAT_I_UINT16,
MESA_FORMAT_INTENSITY_UINT32, MESA_FORMAT_I_UINT32,
MESA_FORMAT_INTENSITY_INT8, MESA_FORMAT_I_SINT8,
MESA_FORMAT_INTENSITY_INT16, MESA_FORMAT_I_SINT16,
MESA_FORMAT_INTENSITY_INT32, MESA_FORMAT_I_SINT32,
MESA_FORMAT_LUMINANCE_UINT8, MESA_FORMAT_L_UINT8,
MESA_FORMAT_LUMINANCE_UINT16, MESA_FORMAT_L_UINT16,
MESA_FORMAT_LUMINANCE_UINT32, MESA_FORMAT_L_UINT32,
MESA_FORMAT_LUMINANCE_INT8, MESA_FORMAT_L_SINT8,
MESA_FORMAT_LUMINANCE_INT16, MESA_FORMAT_L_SINT16,
MESA_FORMAT_LUMINANCE_INT32, MESA_FORMAT_L_SINT32,
MESA_FORMAT_LUMINANCE_ALPHA_UINT8, MESA_FORMAT_LA_UINT8,
MESA_FORMAT_LUMINANCE_ALPHA_UINT16, MESA_FORMAT_LA_UINT16,
MESA_FORMAT_LUMINANCE_ALPHA_UINT32, MESA_FORMAT_LA_UINT32,
MESA_FORMAT_LUMINANCE_ALPHA_INT8, MESA_FORMAT_LA_SINT8,
MESA_FORMAT_LUMINANCE_ALPHA_INT16, MESA_FORMAT_LA_SINT16,
MESA_FORMAT_LUMINANCE_ALPHA_INT32, MESA_FORMAT_LA_SINT32,
MESA_FORMAT_R_INT8, MESA_FORMAT_R_INT8,
MESA_FORMAT_RG_INT8, MESA_FORMAT_RG_INT8,

80
src/mesa/main/texformat.c
View File

@ -343,51 +343,51 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
return MESA_FORMAT_SRGBA_DXT5; return MESA_FORMAT_SRGBA_DXT5;
case GL_ALPHA16F_ARB: case GL_ALPHA16F_ARB:
RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT16); RETURN_IF_SUPPORTED(MESA_FORMAT_A_FLOAT16);
RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT32); RETURN_IF_SUPPORTED(MESA_FORMAT_A_FLOAT32);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
break; break;
case GL_ALPHA32F_ARB: case GL_ALPHA32F_ARB:
RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT32); RETURN_IF_SUPPORTED(MESA_FORMAT_A_FLOAT32);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT16); RETURN_IF_SUPPORTED(MESA_FORMAT_A_FLOAT16);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
break; break;
case GL_LUMINANCE16F_ARB: case GL_LUMINANCE16F_ARB:
RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_FLOAT16); RETURN_IF_SUPPORTED(MESA_FORMAT_L_FLOAT16);
RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_FLOAT32); RETURN_IF_SUPPORTED(MESA_FORMAT_L_FLOAT32);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
break; break;
case GL_LUMINANCE32F_ARB: case GL_LUMINANCE32F_ARB:
RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_FLOAT32); RETURN_IF_SUPPORTED(MESA_FORMAT_L_FLOAT32);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_FLOAT16); RETURN_IF_SUPPORTED(MESA_FORMAT_L_FLOAT16);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
break; break;
case GL_LUMINANCE_ALPHA16F_ARB: case GL_LUMINANCE_ALPHA16F_ARB:
RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16); RETURN_IF_SUPPORTED(MESA_FORMAT_LA_FLOAT16);
RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32); RETURN_IF_SUPPORTED(MESA_FORMAT_LA_FLOAT32);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
break; break;
case GL_LUMINANCE_ALPHA32F_ARB: case GL_LUMINANCE_ALPHA32F_ARB:
RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32); RETURN_IF_SUPPORTED(MESA_FORMAT_LA_FLOAT32);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16); RETURN_IF_SUPPORTED(MESA_FORMAT_LA_FLOAT16);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
break; break;
case GL_INTENSITY16F_ARB: case GL_INTENSITY16F_ARB:
RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT16); RETURN_IF_SUPPORTED(MESA_FORMAT_I_FLOAT16);
RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT32); RETURN_IF_SUPPORTED(MESA_FORMAT_I_FLOAT32);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
break; break;
case GL_INTENSITY32F_ARB: case GL_INTENSITY32F_ARB:
RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT32); RETURN_IF_SUPPORTED(MESA_FORMAT_I_FLOAT32);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT16); RETURN_IF_SUPPORTED(MESA_FORMAT_I_FLOAT16);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
break; break;
case GL_RGB16F_ARB: case GL_RGB16F_ARB:
@ -562,99 +562,99 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
break; break;
case GL_ALPHA8UI_EXT: case GL_ALPHA8UI_EXT:
RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_UINT8); RETURN_IF_SUPPORTED(MESA_FORMAT_A_UINT8);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8);
break; break;
case GL_ALPHA16UI_EXT: case GL_ALPHA16UI_EXT:
RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_UINT16); RETURN_IF_SUPPORTED(MESA_FORMAT_A_UINT16);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16);
break; break;
case GL_ALPHA32UI_EXT: case GL_ALPHA32UI_EXT:
RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_UINT32); RETURN_IF_SUPPORTED(MESA_FORMAT_A_UINT32);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);
break; break;
case GL_ALPHA8I_EXT: case GL_ALPHA8I_EXT:
RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_INT8); RETURN_IF_SUPPORTED(MESA_FORMAT_A_SINT8);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
break; break;
case GL_ALPHA16I_EXT: case GL_ALPHA16I_EXT:
RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_INT16); RETURN_IF_SUPPORTED(MESA_FORMAT_A_SINT16);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
break; break;
case GL_ALPHA32I_EXT: case GL_ALPHA32I_EXT:
RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_INT32); RETURN_IF_SUPPORTED(MESA_FORMAT_A_SINT32);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
break; break;
case GL_LUMINANCE8UI_EXT: case GL_LUMINANCE8UI_EXT:
RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_UINT8); RETURN_IF_SUPPORTED(MESA_FORMAT_L_UINT8);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8);
break; break;
case GL_LUMINANCE16UI_EXT: case GL_LUMINANCE16UI_EXT:
RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_UINT16); RETURN_IF_SUPPORTED(MESA_FORMAT_L_UINT16);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16);
break; break;
case GL_LUMINANCE32UI_EXT: case GL_LUMINANCE32UI_EXT:
RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_UINT32); RETURN_IF_SUPPORTED(MESA_FORMAT_L_UINT32);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);
break; break;
case GL_LUMINANCE8I_EXT: case GL_LUMINANCE8I_EXT:
RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_INT8); RETURN_IF_SUPPORTED(MESA_FORMAT_L_SINT8);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
break; break;
case GL_LUMINANCE16I_EXT: case GL_LUMINANCE16I_EXT:
RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_INT16); RETURN_IF_SUPPORTED(MESA_FORMAT_L_SINT16);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
break; break;
case GL_LUMINANCE32I_EXT: case GL_LUMINANCE32I_EXT:
RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_INT32); RETURN_IF_SUPPORTED(MESA_FORMAT_L_SINT32);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
break; break;
case GL_LUMINANCE_ALPHA8UI_EXT: case GL_LUMINANCE_ALPHA8UI_EXT:
RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_UINT8); RETURN_IF_SUPPORTED(MESA_FORMAT_LA_UINT8);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8);
break; break;
case GL_LUMINANCE_ALPHA16UI_EXT: case GL_LUMINANCE_ALPHA16UI_EXT:
RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_UINT16); RETURN_IF_SUPPORTED(MESA_FORMAT_LA_UINT16);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16);
break; break;
case GL_LUMINANCE_ALPHA32UI_EXT: case GL_LUMINANCE_ALPHA32UI_EXT:
RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_UINT32); RETURN_IF_SUPPORTED(MESA_FORMAT_LA_UINT32);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);
break; break;
case GL_LUMINANCE_ALPHA8I_EXT: case GL_LUMINANCE_ALPHA8I_EXT:
RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_INT8); RETURN_IF_SUPPORTED(MESA_FORMAT_LA_SINT8);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
break; break;
case GL_LUMINANCE_ALPHA16I_EXT: case GL_LUMINANCE_ALPHA16I_EXT:
RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_INT16); RETURN_IF_SUPPORTED(MESA_FORMAT_LA_SINT16);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
break; break;
case GL_LUMINANCE_ALPHA32I_EXT: case GL_LUMINANCE_ALPHA32I_EXT:
RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_INT32); RETURN_IF_SUPPORTED(MESA_FORMAT_LA_SINT32);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
break; break;
case GL_INTENSITY8UI_EXT: case GL_INTENSITY8UI_EXT:
RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_UINT8); RETURN_IF_SUPPORTED(MESA_FORMAT_I_UINT8);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8);
break; break;
case GL_INTENSITY16UI_EXT: case GL_INTENSITY16UI_EXT:
RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_UINT16); RETURN_IF_SUPPORTED(MESA_FORMAT_I_UINT16);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16);
break; break;
case GL_INTENSITY32UI_EXT: case GL_INTENSITY32UI_EXT:
RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_UINT32); RETURN_IF_SUPPORTED(MESA_FORMAT_I_UINT32);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);
break; break;
case GL_INTENSITY8I_EXT: case GL_INTENSITY8I_EXT:
RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_INT8); RETURN_IF_SUPPORTED(MESA_FORMAT_I_SINT8);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
break; break;
case GL_INTENSITY16I_EXT: case GL_INTENSITY16I_EXT:
RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_INT16); RETURN_IF_SUPPORTED(MESA_FORMAT_I_SINT16);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
break; break;
case GL_INTENSITY32I_EXT: case GL_INTENSITY32I_EXT:
RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_INT32); RETURN_IF_SUPPORTED(MESA_FORMAT_I_SINT32);
RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
break; break;

64
src/mesa/main/teximage.c
View File

@ -4018,81 +4018,81 @@ get_texbuffer_format(const struct gl_context *ctx, GLenum internalFormat)
case GL_ALPHA16: case GL_ALPHA16:
return MESA_FORMAT_A_UNORM16; return MESA_FORMAT_A_UNORM16;
case GL_ALPHA16F_ARB: case GL_ALPHA16F_ARB:
return MESA_FORMAT_ALPHA_FLOAT16; return MESA_FORMAT_A_FLOAT16;
case GL_ALPHA32F_ARB: case GL_ALPHA32F_ARB:
return MESA_FORMAT_ALPHA_FLOAT32; return MESA_FORMAT_A_FLOAT32;
case GL_ALPHA8I_EXT: case GL_ALPHA8I_EXT:
return MESA_FORMAT_ALPHA_INT8; return MESA_FORMAT_A_SINT8;
case GL_ALPHA16I_EXT: case GL_ALPHA16I_EXT:
return MESA_FORMAT_ALPHA_INT16; return MESA_FORMAT_A_SINT16;
case GL_ALPHA32I_EXT: case GL_ALPHA32I_EXT:
return MESA_FORMAT_ALPHA_INT32; return MESA_FORMAT_A_SINT32;
case GL_ALPHA8UI_EXT: case GL_ALPHA8UI_EXT:
return MESA_FORMAT_ALPHA_UINT8; return MESA_FORMAT_A_UINT8;
case GL_ALPHA16UI_EXT: case GL_ALPHA16UI_EXT:
return MESA_FORMAT_ALPHA_UINT16; return MESA_FORMAT_A_UINT16;
case GL_ALPHA32UI_EXT: case GL_ALPHA32UI_EXT:
return MESA_FORMAT_ALPHA_UINT32; return MESA_FORMAT_A_UINT32;
case GL_LUMINANCE8: case GL_LUMINANCE8:
return MESA_FORMAT_L_UNORM8; return MESA_FORMAT_L_UNORM8;
case GL_LUMINANCE16: case GL_LUMINANCE16:
return MESA_FORMAT_L_UNORM16; return MESA_FORMAT_L_UNORM16;
case GL_LUMINANCE16F_ARB: case GL_LUMINANCE16F_ARB:
return MESA_FORMAT_LUMINANCE_FLOAT16; return MESA_FORMAT_L_FLOAT16;
case GL_LUMINANCE32F_ARB: case GL_LUMINANCE32F_ARB:
return MESA_FORMAT_LUMINANCE_FLOAT32; return MESA_FORMAT_L_FLOAT32;
case GL_LUMINANCE8I_EXT: case GL_LUMINANCE8I_EXT:
return MESA_FORMAT_LUMINANCE_INT8; return MESA_FORMAT_L_SINT8;
case GL_LUMINANCE16I_EXT: case GL_LUMINANCE16I_EXT:
return MESA_FORMAT_LUMINANCE_INT16; return MESA_FORMAT_L_SINT16;
case GL_LUMINANCE32I_EXT: case GL_LUMINANCE32I_EXT:
return MESA_FORMAT_LUMINANCE_INT32; return MESA_FORMAT_L_SINT32;
case GL_LUMINANCE8UI_EXT: case GL_LUMINANCE8UI_EXT:
return MESA_FORMAT_LUMINANCE_UINT8; return MESA_FORMAT_L_UINT8;
case GL_LUMINANCE16UI_EXT: case GL_LUMINANCE16UI_EXT:
return MESA_FORMAT_LUMINANCE_UINT16; return MESA_FORMAT_L_UINT16;
case GL_LUMINANCE32UI_EXT: case GL_LUMINANCE32UI_EXT:
return MESA_FORMAT_LUMINANCE_UINT32; return MESA_FORMAT_L_UINT32;
case GL_LUMINANCE8_ALPHA8: case GL_LUMINANCE8_ALPHA8:
return MESA_FORMAT_L8A8_UNORM; return MESA_FORMAT_L8A8_UNORM;
case GL_LUMINANCE16_ALPHA16: case GL_LUMINANCE16_ALPHA16:
return MESA_FORMAT_L16A16_UNORM; return MESA_FORMAT_L16A16_UNORM;
case GL_LUMINANCE_ALPHA16F_ARB: case GL_LUMINANCE_ALPHA16F_ARB:
return MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16; return MESA_FORMAT_LA_FLOAT16;
case GL_LUMINANCE_ALPHA32F_ARB: case GL_LUMINANCE_ALPHA32F_ARB:
return MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32; return MESA_FORMAT_LA_FLOAT32;
case GL_LUMINANCE_ALPHA8I_EXT: case GL_LUMINANCE_ALPHA8I_EXT:
return MESA_FORMAT_LUMINANCE_ALPHA_INT8; return MESA_FORMAT_LA_SINT8;
case GL_LUMINANCE_ALPHA16I_EXT: case GL_LUMINANCE_ALPHA16I_EXT:
return MESA_FORMAT_LUMINANCE_ALPHA_INT8; return MESA_FORMAT_LA_SINT8;
case GL_LUMINANCE_ALPHA32I_EXT: case GL_LUMINANCE_ALPHA32I_EXT:
return MESA_FORMAT_LUMINANCE_ALPHA_INT16; return MESA_FORMAT_LA_SINT16;
case GL_LUMINANCE_ALPHA8UI_EXT: case GL_LUMINANCE_ALPHA8UI_EXT:
return MESA_FORMAT_LUMINANCE_ALPHA_UINT8; return MESA_FORMAT_LA_UINT8;
case GL_LUMINANCE_ALPHA16UI_EXT: case GL_LUMINANCE_ALPHA16UI_EXT:
return MESA_FORMAT_LUMINANCE_ALPHA_UINT16; return MESA_FORMAT_LA_UINT16;
case GL_LUMINANCE_ALPHA32UI_EXT: case GL_LUMINANCE_ALPHA32UI_EXT:
return MESA_FORMAT_LUMINANCE_ALPHA_UINT32; return MESA_FORMAT_LA_UINT32;
case GL_INTENSITY8: case GL_INTENSITY8:
return MESA_FORMAT_I_UNORM8; return MESA_FORMAT_I_UNORM8;
case GL_INTENSITY16: case GL_INTENSITY16:
return MESA_FORMAT_I_UNORM16; return MESA_FORMAT_I_UNORM16;
case GL_INTENSITY16F_ARB: case GL_INTENSITY16F_ARB:
return MESA_FORMAT_INTENSITY_FLOAT16; return MESA_FORMAT_I_FLOAT16;
case GL_INTENSITY32F_ARB: case GL_INTENSITY32F_ARB:
return MESA_FORMAT_INTENSITY_FLOAT32; return MESA_FORMAT_I_FLOAT32;
case GL_INTENSITY8I_EXT: case GL_INTENSITY8I_EXT:
return MESA_FORMAT_INTENSITY_INT8; return MESA_FORMAT_I_SINT8;
case GL_INTENSITY16I_EXT: case GL_INTENSITY16I_EXT:
return MESA_FORMAT_INTENSITY_INT16; return MESA_FORMAT_I_SINT16;
case GL_INTENSITY32I_EXT: case GL_INTENSITY32I_EXT:
return MESA_FORMAT_INTENSITY_INT32; return MESA_FORMAT_I_SINT32;
case GL_INTENSITY8UI_EXT: case GL_INTENSITY8UI_EXT:
return MESA_FORMAT_INTENSITY_UINT8; return MESA_FORMAT_I_UINT8;
case GL_INTENSITY16UI_EXT: case GL_INTENSITY16UI_EXT:
return MESA_FORMAT_INTENSITY_UINT16; return MESA_FORMAT_I_UINT16;
case GL_INTENSITY32UI_EXT: case GL_INTENSITY32UI_EXT:
return MESA_FORMAT_INTENSITY_UINT32; return MESA_FORMAT_I_UINT32;
default: default:
break; break;
} }

128
src/mesa/main/texstore.c
View File

@ -2701,10 +2701,10 @@ _mesa_texstore_rgba_float32(TEXSTORE_PARAMS)
ASSERT(dstFormat == MESA_FORMAT_RGBA_FLOAT32 || ASSERT(dstFormat == MESA_FORMAT_RGBA_FLOAT32 ||
dstFormat == MESA_FORMAT_RGB_FLOAT32 || dstFormat == MESA_FORMAT_RGB_FLOAT32 ||
dstFormat == MESA_FORMAT_ALPHA_FLOAT32 || dstFormat == MESA_FORMAT_A_FLOAT32 ||
dstFormat == MESA_FORMAT_LUMINANCE_FLOAT32 || dstFormat == MESA_FORMAT_L_FLOAT32 ||
dstFormat == MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32 || dstFormat == MESA_FORMAT_LA_FLOAT32 ||
dstFormat == MESA_FORMAT_INTENSITY_FLOAT32 || dstFormat == MESA_FORMAT_I_FLOAT32 ||
dstFormat == MESA_FORMAT_R_FLOAT32 || dstFormat == MESA_FORMAT_R_FLOAT32 ||
dstFormat == MESA_FORMAT_RG_FLOAT32 || dstFormat == MESA_FORMAT_RG_FLOAT32 ||
dstFormat == MESA_FORMAT_RGBX_FLOAT32); dstFormat == MESA_FORMAT_RGBX_FLOAT32);
@ -2766,10 +2766,10 @@ _mesa_texstore_rgba_float16(TEXSTORE_PARAMS)
ASSERT(dstFormat == MESA_FORMAT_RGBA_FLOAT16 || ASSERT(dstFormat == MESA_FORMAT_RGBA_FLOAT16 ||
dstFormat == MESA_FORMAT_RGB_FLOAT16 || dstFormat == MESA_FORMAT_RGB_FLOAT16 ||
dstFormat == MESA_FORMAT_ALPHA_FLOAT16 || dstFormat == MESA_FORMAT_A_FLOAT16 ||
dstFormat == MESA_FORMAT_LUMINANCE_FLOAT16 || dstFormat == MESA_FORMAT_L_FLOAT16 ||
dstFormat == MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16 || dstFormat == MESA_FORMAT_LA_FLOAT16 ||
dstFormat == MESA_FORMAT_INTENSITY_FLOAT16 || dstFormat == MESA_FORMAT_I_FLOAT16 ||
dstFormat == MESA_FORMAT_R_FLOAT16 || dstFormat == MESA_FORMAT_R_FLOAT16 ||
dstFormat == MESA_FORMAT_RG_FLOAT16 || dstFormat == MESA_FORMAT_RG_FLOAT16 ||
dstFormat == MESA_FORMAT_RGBX_FLOAT16); dstFormat == MESA_FORMAT_RGBX_FLOAT16);
@ -2832,10 +2832,10 @@ _mesa_texstore_rgba_int8(TEXSTORE_PARAMS)
dstFormat == MESA_FORMAT_RG_INT8 || dstFormat == MESA_FORMAT_RG_INT8 ||
dstFormat == MESA_FORMAT_RGB_INT8 || dstFormat == MESA_FORMAT_RGB_INT8 ||
dstFormat == MESA_FORMAT_RGBA_INT8 || dstFormat == MESA_FORMAT_RGBA_INT8 ||
dstFormat == MESA_FORMAT_ALPHA_INT8 || dstFormat == MESA_FORMAT_A_SINT8 ||
dstFormat == MESA_FORMAT_INTENSITY_INT8 || dstFormat == MESA_FORMAT_I_SINT8 ||
dstFormat == MESA_FORMAT_LUMINANCE_INT8 || dstFormat == MESA_FORMAT_L_SINT8 ||
dstFormat == MESA_FORMAT_LUMINANCE_ALPHA_INT8 || dstFormat == MESA_FORMAT_LA_SINT8 ||
dstFormat == MESA_FORMAT_RGBX_SINT8); dstFormat == MESA_FORMAT_RGBX_SINT8);
ASSERT(baseInternalFormat == GL_RGBA || ASSERT(baseInternalFormat == GL_RGBA ||
baseInternalFormat == GL_RGB || baseInternalFormat == GL_RGB ||
@ -2903,10 +2903,10 @@ _mesa_texstore_rgba_int16(TEXSTORE_PARAMS)
dstFormat == MESA_FORMAT_RG_INT16 || dstFormat == MESA_FORMAT_RG_INT16 ||
dstFormat == MESA_FORMAT_RGB_INT16 || dstFormat == MESA_FORMAT_RGB_INT16 ||
dstFormat == MESA_FORMAT_RGBA_INT16 || dstFormat == MESA_FORMAT_RGBA_INT16 ||
dstFormat == MESA_FORMAT_ALPHA_INT16 || dstFormat == MESA_FORMAT_A_SINT16 ||
dstFormat == MESA_FORMAT_LUMINANCE_INT16 || dstFormat == MESA_FORMAT_L_SINT16 ||
dstFormat == MESA_FORMAT_INTENSITY_INT16 || dstFormat == MESA_FORMAT_I_SINT16 ||
dstFormat == MESA_FORMAT_LUMINANCE_ALPHA_INT16 || dstFormat == MESA_FORMAT_LA_SINT16 ||
dstFormat == MESA_FORMAT_RGBX_SINT16); dstFormat == MESA_FORMAT_RGBX_SINT16);
ASSERT(baseInternalFormat == GL_RGBA || ASSERT(baseInternalFormat == GL_RGBA ||
baseInternalFormat == GL_RGB || baseInternalFormat == GL_RGB ||
@ -2974,10 +2974,10 @@ _mesa_texstore_rgba_int32(TEXSTORE_PARAMS)
dstFormat == MESA_FORMAT_RG_INT32 || dstFormat == MESA_FORMAT_RG_INT32 ||
dstFormat == MESA_FORMAT_RGB_INT32 || dstFormat == MESA_FORMAT_RGB_INT32 ||
dstFormat == MESA_FORMAT_RGBA_INT32 || dstFormat == MESA_FORMAT_RGBA_INT32 ||
dstFormat == MESA_FORMAT_ALPHA_INT32 || dstFormat == MESA_FORMAT_A_SINT32 ||
dstFormat == MESA_FORMAT_INTENSITY_INT32 || dstFormat == MESA_FORMAT_I_SINT32 ||
dstFormat == MESA_FORMAT_LUMINANCE_INT32 || dstFormat == MESA_FORMAT_L_SINT32 ||
dstFormat == MESA_FORMAT_LUMINANCE_ALPHA_INT32 || dstFormat == MESA_FORMAT_LA_SINT32 ||
dstFormat == MESA_FORMAT_RGBX_SINT32); dstFormat == MESA_FORMAT_RGBX_SINT32);
ASSERT(baseInternalFormat == GL_RGBA || ASSERT(baseInternalFormat == GL_RGBA ||
baseInternalFormat == GL_RGB || baseInternalFormat == GL_RGB ||
@ -3045,10 +3045,10 @@ _mesa_texstore_rgba_uint8(TEXSTORE_PARAMS)
dstFormat == MESA_FORMAT_RG_UINT8 || dstFormat == MESA_FORMAT_RG_UINT8 ||
dstFormat == MESA_FORMAT_RGB_UINT8 || dstFormat == MESA_FORMAT_RGB_UINT8 ||
dstFormat == MESA_FORMAT_RGBA_UINT8 || dstFormat == MESA_FORMAT_RGBA_UINT8 ||
dstFormat == MESA_FORMAT_ALPHA_UINT8 || dstFormat == MESA_FORMAT_A_UINT8 ||
dstFormat == MESA_FORMAT_INTENSITY_UINT8 || dstFormat == MESA_FORMAT_I_UINT8 ||
dstFormat == MESA_FORMAT_LUMINANCE_UINT8 || dstFormat == MESA_FORMAT_L_UINT8 ||
dstFormat == MESA_FORMAT_LUMINANCE_ALPHA_UINT8 || dstFormat == MESA_FORMAT_LA_UINT8 ||
dstFormat == MESA_FORMAT_RGBX_UINT8); dstFormat == MESA_FORMAT_RGBX_UINT8);
ASSERT(baseInternalFormat == GL_RGBA || ASSERT(baseInternalFormat == GL_RGBA ||
baseInternalFormat == GL_RGB || baseInternalFormat == GL_RGB ||
@ -3113,10 +3113,10 @@ _mesa_texstore_rgba_uint16(TEXSTORE_PARAMS)
dstFormat == MESA_FORMAT_RG_UINT16 || dstFormat == MESA_FORMAT_RG_UINT16 ||
dstFormat == MESA_FORMAT_RGB_UINT16 || dstFormat == MESA_FORMAT_RGB_UINT16 ||
dstFormat == MESA_FORMAT_RGBA_UINT16 || dstFormat == MESA_FORMAT_RGBA_UINT16 ||
dstFormat == MESA_FORMAT_ALPHA_UINT16 || dstFormat == MESA_FORMAT_A_UINT16 ||
dstFormat == MESA_FORMAT_INTENSITY_UINT16 || dstFormat == MESA_FORMAT_I_UINT16 ||
dstFormat == MESA_FORMAT_LUMINANCE_UINT16 || dstFormat == MESA_FORMAT_L_UINT16 ||
dstFormat == MESA_FORMAT_LUMINANCE_ALPHA_UINT16 || dstFormat == MESA_FORMAT_LA_UINT16 ||
dstFormat == MESA_FORMAT_RGBX_UINT16); dstFormat == MESA_FORMAT_RGBX_UINT16);
ASSERT(baseInternalFormat == GL_RGBA || ASSERT(baseInternalFormat == GL_RGBA ||
baseInternalFormat == GL_RGB || baseInternalFormat == GL_RGB ||
@ -3181,10 +3181,10 @@ _mesa_texstore_rgba_uint32(TEXSTORE_PARAMS)
dstFormat == MESA_FORMAT_RG_UINT32 || dstFormat == MESA_FORMAT_RG_UINT32 ||
dstFormat == MESA_FORMAT_RGB_UINT32 || dstFormat == MESA_FORMAT_RGB_UINT32 ||
dstFormat == MESA_FORMAT_RGBA_UINT32 || dstFormat == MESA_FORMAT_RGBA_UINT32 ||
dstFormat == MESA_FORMAT_ALPHA_UINT32 || dstFormat == MESA_FORMAT_A_UINT32 ||
dstFormat == MESA_FORMAT_INTENSITY_UINT32 || dstFormat == MESA_FORMAT_I_UINT32 ||
dstFormat == MESA_FORMAT_LUMINANCE_UINT32 || dstFormat == MESA_FORMAT_L_UINT32 ||
dstFormat == MESA_FORMAT_LUMINANCE_ALPHA_UINT32 || dstFormat == MESA_FORMAT_LA_UINT32 ||
dstFormat == MESA_FORMAT_RGBX_UINT32); dstFormat == MESA_FORMAT_RGBX_UINT32);
ASSERT(baseInternalFormat == GL_RGBA || ASSERT(baseInternalFormat == GL_RGBA ||
baseInternalFormat == GL_RGB || baseInternalFormat == GL_RGB ||
@ -3724,14 +3724,14 @@ _mesa_get_texstore_func(mesa_format format)
table[MESA_FORMAT_RGBA_FLOAT16] = _mesa_texstore_rgba_float16; table[MESA_FORMAT_RGBA_FLOAT16] = _mesa_texstore_rgba_float16;
table[MESA_FORMAT_RGB_FLOAT32] = _mesa_texstore_rgba_float32; table[MESA_FORMAT_RGB_FLOAT32] = _mesa_texstore_rgba_float32;
table[MESA_FORMAT_RGB_FLOAT16] = _mesa_texstore_rgba_float16; table[MESA_FORMAT_RGB_FLOAT16] = _mesa_texstore_rgba_float16;
table[MESA_FORMAT_ALPHA_FLOAT32] = _mesa_texstore_rgba_float32; table[MESA_FORMAT_A_FLOAT32] = _mesa_texstore_rgba_float32;
table[MESA_FORMAT_ALPHA_FLOAT16] = _mesa_texstore_rgba_float16; table[MESA_FORMAT_A_FLOAT16] = _mesa_texstore_rgba_float16;
table[MESA_FORMAT_LUMINANCE_FLOAT32] = _mesa_texstore_rgba_float32; table[MESA_FORMAT_L_FLOAT32] = _mesa_texstore_rgba_float32;
table[MESA_FORMAT_LUMINANCE_FLOAT16] = _mesa_texstore_rgba_float16; table[MESA_FORMAT_L_FLOAT16] = _mesa_texstore_rgba_float16;
table[MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32] = _mesa_texstore_rgba_float32; table[MESA_FORMAT_LA_FLOAT32] = _mesa_texstore_rgba_float32;
table[MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16] = _mesa_texstore_rgba_float16; table[MESA_FORMAT_LA_FLOAT16] = _mesa_texstore_rgba_float16;
table[MESA_FORMAT_INTENSITY_FLOAT32] = _mesa_texstore_rgba_float32; table[MESA_FORMAT_I_FLOAT32] = _mesa_texstore_rgba_float32;
table[MESA_FORMAT_INTENSITY_FLOAT16] = _mesa_texstore_rgba_float16; table[MESA_FORMAT_I_FLOAT16] = _mesa_texstore_rgba_float16;
table[MESA_FORMAT_R_FLOAT32] = _mesa_texstore_rgba_float32; table[MESA_FORMAT_R_FLOAT32] = _mesa_texstore_rgba_float32;
table[MESA_FORMAT_R_FLOAT16] = _mesa_texstore_rgba_float16; table[MESA_FORMAT_R_FLOAT16] = _mesa_texstore_rgba_float16;
table[MESA_FORMAT_RG_FLOAT32] = _mesa_texstore_rgba_float32; table[MESA_FORMAT_RG_FLOAT32] = _mesa_texstore_rgba_float32;
@ -3781,33 +3781,33 @@ _mesa_get_texstore_func(mesa_format format)
table[MESA_FORMAT_Z_FLOAT32] = _mesa_texstore_z32; table[MESA_FORMAT_Z_FLOAT32] = _mesa_texstore_z32;
table[MESA_FORMAT_Z32_FLOAT_S8X24_UINT] = _mesa_texstore_z32f_x24s8; table[MESA_FORMAT_Z32_FLOAT_S8X24_UINT] = _mesa_texstore_z32f_x24s8;
table[MESA_FORMAT_ALPHA_UINT8] = _mesa_texstore_rgba_uint8; table[MESA_FORMAT_A_UINT8] = _mesa_texstore_rgba_uint8;
table[MESA_FORMAT_ALPHA_UINT16] = _mesa_texstore_rgba_uint16; table[MESA_FORMAT_A_UINT16] = _mesa_texstore_rgba_uint16;
table[MESA_FORMAT_ALPHA_UINT32] = _mesa_texstore_rgba_uint32; table[MESA_FORMAT_A_UINT32] = _mesa_texstore_rgba_uint32;
table[MESA_FORMAT_ALPHA_INT8] = _mesa_texstore_rgba_int8; table[MESA_FORMAT_A_SINT8] = _mesa_texstore_rgba_int8;
table[MESA_FORMAT_ALPHA_INT16] = _mesa_texstore_rgba_int16; table[MESA_FORMAT_A_SINT16] = _mesa_texstore_rgba_int16;
table[MESA_FORMAT_ALPHA_INT32] = _mesa_texstore_rgba_int32; table[MESA_FORMAT_A_SINT32] = _mesa_texstore_rgba_int32;
table[MESA_FORMAT_INTENSITY_UINT8] = _mesa_texstore_rgba_uint8; table[MESA_FORMAT_I_UINT8] = _mesa_texstore_rgba_uint8;
table[MESA_FORMAT_INTENSITY_UINT16] = _mesa_texstore_rgba_uint16; table[MESA_FORMAT_I_UINT16] = _mesa_texstore_rgba_uint16;
table[MESA_FORMAT_INTENSITY_UINT32] = _mesa_texstore_rgba_uint32; table[MESA_FORMAT_I_UINT32] = _mesa_texstore_rgba_uint32;
table[MESA_FORMAT_INTENSITY_INT8] = _mesa_texstore_rgba_int8; table[MESA_FORMAT_I_SINT8] = _mesa_texstore_rgba_int8;
table[MESA_FORMAT_INTENSITY_INT16] = _mesa_texstore_rgba_int16; table[MESA_FORMAT_I_SINT16] = _mesa_texstore_rgba_int16;
table[MESA_FORMAT_INTENSITY_INT32] = _mesa_texstore_rgba_int32; table[MESA_FORMAT_I_SINT32] = _mesa_texstore_rgba_int32;
table[MESA_FORMAT_LUMINANCE_UINT8] = _mesa_texstore_rgba_uint8; table[MESA_FORMAT_L_UINT8] = _mesa_texstore_rgba_uint8;
table[MESA_FORMAT_LUMINANCE_UINT16] = _mesa_texstore_rgba_uint16; table[MESA_FORMAT_L_UINT16] = _mesa_texstore_rgba_uint16;
table[MESA_FORMAT_LUMINANCE_UINT32] = _mesa_texstore_rgba_uint32; table[MESA_FORMAT_L_UINT32] = _mesa_texstore_rgba_uint32;
table[MESA_FORMAT_LUMINANCE_INT8] = _mesa_texstore_rgba_int8; table[MESA_FORMAT_L_SINT8] = _mesa_texstore_rgba_int8;
table[MESA_FORMAT_LUMINANCE_INT16] = _mesa_texstore_rgba_int16; table[MESA_FORMAT_L_SINT16] = _mesa_texstore_rgba_int16;
table[MESA_FORMAT_LUMINANCE_INT32] = _mesa_texstore_rgba_int32; table[MESA_FORMAT_L_SINT32] = _mesa_texstore_rgba_int32;
table[MESA_FORMAT_LUMINANCE_ALPHA_UINT8] = _mesa_texstore_rgba_uint8; table[MESA_FORMAT_LA_UINT8] = _mesa_texstore_rgba_uint8;
table[MESA_FORMAT_LUMINANCE_ALPHA_UINT16] = _mesa_texstore_rgba_uint16; table[MESA_FORMAT_LA_UINT16] = _mesa_texstore_rgba_uint16;
table[MESA_FORMAT_LUMINANCE_ALPHA_UINT32] = _mesa_texstore_rgba_uint32; table[MESA_FORMAT_LA_UINT32] = _mesa_texstore_rgba_uint32;
table[MESA_FORMAT_LUMINANCE_ALPHA_INT8] = _mesa_texstore_rgba_int8; table[MESA_FORMAT_LA_SINT8] = _mesa_texstore_rgba_int8;
table[MESA_FORMAT_LUMINANCE_ALPHA_INT16] = _mesa_texstore_rgba_int16; table[MESA_FORMAT_LA_SINT16] = _mesa_texstore_rgba_int16;
table[MESA_FORMAT_LUMINANCE_ALPHA_INT32] = _mesa_texstore_rgba_int32; table[MESA_FORMAT_LA_SINT32] = _mesa_texstore_rgba_int32;
table[MESA_FORMAT_R_INT8] = _mesa_texstore_rgba_int8; table[MESA_FORMAT_R_INT8] = _mesa_texstore_rgba_int8;
table[MESA_FORMAT_RG_INT8] = _mesa_texstore_rgba_int8; table[MESA_FORMAT_RG_INT8] = _mesa_texstore_rgba_int8;

128
src/mesa/state_tracker/st_format.c
View File

@ -155,21 +155,21 @@ st_mesa_format_to_pipe_format(mesa_format mesaFormat)
return PIPE_FORMAT_R32G32B32_FLOAT; return PIPE_FORMAT_R32G32B32_FLOAT;
case MESA_FORMAT_RGB_FLOAT16: case MESA_FORMAT_RGB_FLOAT16:
return PIPE_FORMAT_R16G16B16_FLOAT; return PIPE_FORMAT_R16G16B16_FLOAT;
case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32: case MESA_FORMAT_LA_FLOAT32:
return PIPE_FORMAT_L32A32_FLOAT; return PIPE_FORMAT_L32A32_FLOAT;
case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16: case MESA_FORMAT_LA_FLOAT16:
return PIPE_FORMAT_L16A16_FLOAT; return PIPE_FORMAT_L16A16_FLOAT;
case MESA_FORMAT_LUMINANCE_FLOAT32: case MESA_FORMAT_L_FLOAT32:
return PIPE_FORMAT_L32_FLOAT; return PIPE_FORMAT_L32_FLOAT;
case MESA_FORMAT_LUMINANCE_FLOAT16: case MESA_FORMAT_L_FLOAT16:
return PIPE_FORMAT_L16_FLOAT; return PIPE_FORMAT_L16_FLOAT;
case MESA_FORMAT_ALPHA_FLOAT32: case MESA_FORMAT_A_FLOAT32:
return PIPE_FORMAT_A32_FLOAT; return PIPE_FORMAT_A32_FLOAT;
case MESA_FORMAT_ALPHA_FLOAT16: case MESA_FORMAT_A_FLOAT16:
return PIPE_FORMAT_A16_FLOAT; return PIPE_FORMAT_A16_FLOAT;
case MESA_FORMAT_INTENSITY_FLOAT32: case MESA_FORMAT_I_FLOAT32:
return PIPE_FORMAT_I32_FLOAT; return PIPE_FORMAT_I32_FLOAT;
case MESA_FORMAT_INTENSITY_FLOAT16: case MESA_FORMAT_I_FLOAT16:
return PIPE_FORMAT_I16_FLOAT; return PIPE_FORMAT_I16_FLOAT;
case MESA_FORMAT_R_FLOAT32: case MESA_FORMAT_R_FLOAT32:
return PIPE_FORMAT_R32_FLOAT; return PIPE_FORMAT_R32_FLOAT;
@ -192,60 +192,60 @@ st_mesa_format_to_pipe_format(mesa_format mesaFormat)
return PIPE_FORMAT_R16G16B16A16_UNORM; return PIPE_FORMAT_R16G16B16A16_UNORM;
/* signed int formats */ /* signed int formats */
case MESA_FORMAT_ALPHA_UINT8: case MESA_FORMAT_A_UINT8:
return PIPE_FORMAT_A8_UINT; return PIPE_FORMAT_A8_UINT;
case MESA_FORMAT_ALPHA_UINT16: case MESA_FORMAT_A_UINT16:
return PIPE_FORMAT_A16_UINT; return PIPE_FORMAT_A16_UINT;
case MESA_FORMAT_ALPHA_UINT32: case MESA_FORMAT_A_UINT32:
return PIPE_FORMAT_A32_UINT; return PIPE_FORMAT_A32_UINT;
case MESA_FORMAT_ALPHA_INT8: case MESA_FORMAT_A_SINT8:
return PIPE_FORMAT_A8_SINT; return PIPE_FORMAT_A8_SINT;
case MESA_FORMAT_ALPHA_INT16: case MESA_FORMAT_A_SINT16:
return PIPE_FORMAT_A16_SINT; return PIPE_FORMAT_A16_SINT;
case MESA_FORMAT_ALPHA_INT32: case MESA_FORMAT_A_SINT32:
return PIPE_FORMAT_A32_SINT; return PIPE_FORMAT_A32_SINT;
case MESA_FORMAT_INTENSITY_UINT8: case MESA_FORMAT_I_UINT8:
return PIPE_FORMAT_I8_UINT; return PIPE_FORMAT_I8_UINT;
case MESA_FORMAT_INTENSITY_UINT16: case MESA_FORMAT_I_UINT16:
return PIPE_FORMAT_I16_UINT; return PIPE_FORMAT_I16_UINT;
case MESA_FORMAT_INTENSITY_UINT32: case MESA_FORMAT_I_UINT32:
return PIPE_FORMAT_I32_UINT; return PIPE_FORMAT_I32_UINT;
case MESA_FORMAT_INTENSITY_INT8: case MESA_FORMAT_I_SINT8:
return PIPE_FORMAT_I8_SINT; return PIPE_FORMAT_I8_SINT;
case MESA_FORMAT_INTENSITY_INT16: case MESA_FORMAT_I_SINT16:
return PIPE_FORMAT_I16_SINT; return PIPE_FORMAT_I16_SINT;
case MESA_FORMAT_INTENSITY_INT32: case MESA_FORMAT_I_SINT32:
return PIPE_FORMAT_I32_SINT; return PIPE_FORMAT_I32_SINT;
case MESA_FORMAT_LUMINANCE_UINT8: case MESA_FORMAT_L_UINT8:
return PIPE_FORMAT_L8_UINT; return PIPE_FORMAT_L8_UINT;
case MESA_FORMAT_LUMINANCE_UINT16: case MESA_FORMAT_L_UINT16:
return PIPE_FORMAT_L16_UINT; return PIPE_FORMAT_L16_UINT;
case MESA_FORMAT_LUMINANCE_UINT32: case MESA_FORMAT_L_UINT32:
return PIPE_FORMAT_L32_UINT; return PIPE_FORMAT_L32_UINT;
case MESA_FORMAT_LUMINANCE_INT8: case MESA_FORMAT_L_SINT8:
return PIPE_FORMAT_L8_SINT; return PIPE_FORMAT_L8_SINT;
case MESA_FORMAT_LUMINANCE_INT16: case MESA_FORMAT_L_SINT16:
return PIPE_FORMAT_L16_SINT; return PIPE_FORMAT_L16_SINT;
case MESA_FORMAT_LUMINANCE_INT32: case MESA_FORMAT_L_SINT32:
return PIPE_FORMAT_L32_SINT; return PIPE_FORMAT_L32_SINT;
case MESA_FORMAT_LUMINANCE_ALPHA_UINT8: case MESA_FORMAT_LA_UINT8:
return PIPE_FORMAT_L8A8_UINT; return PIPE_FORMAT_L8A8_UINT;
case MESA_FORMAT_LUMINANCE_ALPHA_UINT16: case MESA_FORMAT_LA_UINT16:
return PIPE_FORMAT_L16A16_UINT; return PIPE_FORMAT_L16A16_UINT;
case MESA_FORMAT_LUMINANCE_ALPHA_UINT32: case MESA_FORMAT_LA_UINT32:
return PIPE_FORMAT_L32A32_UINT; return PIPE_FORMAT_L32A32_UINT;
case MESA_FORMAT_LUMINANCE_ALPHA_INT8: case MESA_FORMAT_LA_SINT8:
return PIPE_FORMAT_L8A8_SINT; return PIPE_FORMAT_L8A8_SINT;
case MESA_FORMAT_LUMINANCE_ALPHA_INT16: case MESA_FORMAT_LA_SINT16:
return PIPE_FORMAT_L16A16_SINT; return PIPE_FORMAT_L16A16_SINT;
case MESA_FORMAT_LUMINANCE_ALPHA_INT32: case MESA_FORMAT_LA_SINT32:
return PIPE_FORMAT_L32A32_SINT; return PIPE_FORMAT_L32A32_SINT;
case MESA_FORMAT_R_INT8: case MESA_FORMAT_R_INT8:
@ -513,21 +513,21 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
case PIPE_FORMAT_R16G16B16_FLOAT: case PIPE_FORMAT_R16G16B16_FLOAT:
return MESA_FORMAT_RGB_FLOAT16; return MESA_FORMAT_RGB_FLOAT16;
case PIPE_FORMAT_L32A32_FLOAT: case PIPE_FORMAT_L32A32_FLOAT:
return MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32; return MESA_FORMAT_LA_FLOAT32;
case PIPE_FORMAT_L16A16_FLOAT: case PIPE_FORMAT_L16A16_FLOAT:
return MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16; return MESA_FORMAT_LA_FLOAT16;
case PIPE_FORMAT_L32_FLOAT: case PIPE_FORMAT_L32_FLOAT:
return MESA_FORMAT_LUMINANCE_FLOAT32; return MESA_FORMAT_L_FLOAT32;
case PIPE_FORMAT_L16_FLOAT: case PIPE_FORMAT_L16_FLOAT:
return MESA_FORMAT_LUMINANCE_FLOAT16; return MESA_FORMAT_L_FLOAT16;
case PIPE_FORMAT_A32_FLOAT: case PIPE_FORMAT_A32_FLOAT:
return MESA_FORMAT_ALPHA_FLOAT32; return MESA_FORMAT_A_FLOAT32;
case PIPE_FORMAT_A16_FLOAT: case PIPE_FORMAT_A16_FLOAT:
return MESA_FORMAT_ALPHA_FLOAT16; return MESA_FORMAT_A_FLOAT16;
case PIPE_FORMAT_I32_FLOAT: case PIPE_FORMAT_I32_FLOAT:
return MESA_FORMAT_INTENSITY_FLOAT32; return MESA_FORMAT_I_FLOAT32;
case PIPE_FORMAT_I16_FLOAT: case PIPE_FORMAT_I16_FLOAT:
return MESA_FORMAT_INTENSITY_FLOAT16; return MESA_FORMAT_I_FLOAT16;
case PIPE_FORMAT_R32_FLOAT: case PIPE_FORMAT_R32_FLOAT:
return MESA_FORMAT_R_FLOAT32; return MESA_FORMAT_R_FLOAT32;
case PIPE_FORMAT_R16_FLOAT: case PIPE_FORMAT_R16_FLOAT:
@ -547,56 +547,56 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
return MESA_FORMAT_R16G16_UNORM; return MESA_FORMAT_R16G16_UNORM;
case PIPE_FORMAT_A8_UINT: case PIPE_FORMAT_A8_UINT:
return MESA_FORMAT_ALPHA_UINT8; return MESA_FORMAT_A_UINT8;
case PIPE_FORMAT_A16_UINT: case PIPE_FORMAT_A16_UINT:
return MESA_FORMAT_ALPHA_UINT16; return MESA_FORMAT_A_UINT16;
case PIPE_FORMAT_A32_UINT: case PIPE_FORMAT_A32_UINT:
return MESA_FORMAT_ALPHA_UINT32; return MESA_FORMAT_A_UINT32;
case PIPE_FORMAT_A8_SINT: case PIPE_FORMAT_A8_SINT:
return MESA_FORMAT_ALPHA_INT8; return MESA_FORMAT_A_SINT8;
case PIPE_FORMAT_A16_SINT: case PIPE_FORMAT_A16_SINT:
return MESA_FORMAT_ALPHA_INT16; return MESA_FORMAT_A_SINT16;
case PIPE_FORMAT_A32_SINT: case PIPE_FORMAT_A32_SINT:
return MESA_FORMAT_ALPHA_INT32; return MESA_FORMAT_A_SINT32;
case PIPE_FORMAT_I8_UINT: case PIPE_FORMAT_I8_UINT:
return MESA_FORMAT_INTENSITY_UINT8; return MESA_FORMAT_I_UINT8;
case PIPE_FORMAT_I16_UINT: case PIPE_FORMAT_I16_UINT:
return MESA_FORMAT_INTENSITY_UINT16; return MESA_FORMAT_I_UINT16;
case PIPE_FORMAT_I32_UINT: case PIPE_FORMAT_I32_UINT:
return MESA_FORMAT_INTENSITY_UINT32; return MESA_FORMAT_I_UINT32;
case PIPE_FORMAT_I8_SINT: case PIPE_FORMAT_I8_SINT:
return MESA_FORMAT_INTENSITY_INT8; return MESA_FORMAT_I_SINT8;
case PIPE_FORMAT_I16_SINT: case PIPE_FORMAT_I16_SINT:
return MESA_FORMAT_INTENSITY_INT16; return MESA_FORMAT_I_SINT16;
case PIPE_FORMAT_I32_SINT: case PIPE_FORMAT_I32_SINT:
return MESA_FORMAT_INTENSITY_INT32; return MESA_FORMAT_I_SINT32;
case PIPE_FORMAT_L8_UINT: case PIPE_FORMAT_L8_UINT:
return MESA_FORMAT_LUMINANCE_UINT8; return MESA_FORMAT_L_UINT8;
case PIPE_FORMAT_L16_UINT: case PIPE_FORMAT_L16_UINT:
return MESA_FORMAT_LUMINANCE_UINT16; return MESA_FORMAT_L_UINT16;
case PIPE_FORMAT_L32_UINT: case PIPE_FORMAT_L32_UINT:
return MESA_FORMAT_LUMINANCE_UINT32; return MESA_FORMAT_L_UINT32;
case PIPE_FORMAT_L8_SINT: case PIPE_FORMAT_L8_SINT:
return MESA_FORMAT_LUMINANCE_INT8; return MESA_FORMAT_L_SINT8;
case PIPE_FORMAT_L16_SINT: case PIPE_FORMAT_L16_SINT:
return MESA_FORMAT_LUMINANCE_INT16; return MESA_FORMAT_L_SINT16;
case PIPE_FORMAT_L32_SINT: case PIPE_FORMAT_L32_SINT:
return MESA_FORMAT_LUMINANCE_INT32; return MESA_FORMAT_L_SINT32;
case PIPE_FORMAT_L8A8_UINT: case PIPE_FORMAT_L8A8_UINT:
return MESA_FORMAT_LUMINANCE_ALPHA_UINT8; return MESA_FORMAT_LA_UINT8;
case PIPE_FORMAT_L16A16_UINT: case PIPE_FORMAT_L16A16_UINT:
return MESA_FORMAT_LUMINANCE_ALPHA_UINT16; return MESA_FORMAT_LA_UINT16;
case PIPE_FORMAT_L32A32_UINT: case PIPE_FORMAT_L32A32_UINT:
return MESA_FORMAT_LUMINANCE_ALPHA_UINT32; return MESA_FORMAT_LA_UINT32;
case PIPE_FORMAT_L8A8_SINT: case PIPE_FORMAT_L8A8_SINT:
return MESA_FORMAT_LUMINANCE_ALPHA_INT8; return MESA_FORMAT_LA_SINT8;
case PIPE_FORMAT_L16A16_SINT: case PIPE_FORMAT_L16A16_SINT:
return MESA_FORMAT_LUMINANCE_ALPHA_INT16; return MESA_FORMAT_LA_SINT16;
case PIPE_FORMAT_L32A32_SINT: case PIPE_FORMAT_L32A32_SINT:
return MESA_FORMAT_LUMINANCE_ALPHA_INT32; return MESA_FORMAT_LA_SINT32;
case PIPE_FORMAT_R8_SINT: case PIPE_FORMAT_R8_SINT:
return MESA_FORMAT_R_INT8; return MESA_FORMAT_R_INT8;

64
src/mesa/swrast/s_texfetch.c
View File

@ -534,49 +534,49 @@ texfetch_funcs[] =
fetch_texel_3d_f_rgb_f16 fetch_texel_3d_f_rgb_f16
}, },
{ {
MESA_FORMAT_ALPHA_FLOAT32, MESA_FORMAT_A_FLOAT32,
fetch_texel_1d_f_alpha_f32, fetch_texel_1d_f_alpha_f32,
fetch_texel_2d_f_alpha_f32, fetch_texel_2d_f_alpha_f32,
fetch_texel_3d_f_alpha_f32 fetch_texel_3d_f_alpha_f32
}, },
{ {
MESA_FORMAT_ALPHA_FLOAT16, MESA_FORMAT_A_FLOAT16,
fetch_texel_1d_f_alpha_f16, fetch_texel_1d_f_alpha_f16,
fetch_texel_2d_f_alpha_f16, fetch_texel_2d_f_alpha_f16,
fetch_texel_3d_f_alpha_f16 fetch_texel_3d_f_alpha_f16
}, },
{ {
MESA_FORMAT_LUMINANCE_FLOAT32, MESA_FORMAT_L_FLOAT32,
fetch_texel_1d_f_luminance_f32, fetch_texel_1d_f_luminance_f32,
fetch_texel_2d_f_luminance_f32, fetch_texel_2d_f_luminance_f32,
fetch_texel_3d_f_luminance_f32 fetch_texel_3d_f_luminance_f32
}, },
{ {
MESA_FORMAT_LUMINANCE_FLOAT16, MESA_FORMAT_L_FLOAT16,
fetch_texel_1d_f_luminance_f16, fetch_texel_1d_f_luminance_f16,
fetch_texel_2d_f_luminance_f16, fetch_texel_2d_f_luminance_f16,
fetch_texel_3d_f_luminance_f16 fetch_texel_3d_f_luminance_f16
}, },
{ {
MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32, MESA_FORMAT_LA_FLOAT32,
fetch_texel_1d_f_luminance_alpha_f32, fetch_texel_1d_f_luminance_alpha_f32,
fetch_texel_2d_f_luminance_alpha_f32, fetch_texel_2d_f_luminance_alpha_f32,
fetch_texel_3d_f_luminance_alpha_f32 fetch_texel_3d_f_luminance_alpha_f32
}, },
{ {
MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16, MESA_FORMAT_LA_FLOAT16,
fetch_texel_1d_f_luminance_alpha_f16, fetch_texel_1d_f_luminance_alpha_f16,
fetch_texel_2d_f_luminance_alpha_f16, fetch_texel_2d_f_luminance_alpha_f16,
fetch_texel_3d_f_luminance_alpha_f16 fetch_texel_3d_f_luminance_alpha_f16
}, },
{ {
MESA_FORMAT_INTENSITY_FLOAT32, MESA_FORMAT_I_FLOAT32,
fetch_texel_1d_f_intensity_f32, fetch_texel_1d_f_intensity_f32,
fetch_texel_2d_f_intensity_f32, fetch_texel_2d_f_intensity_f32,
fetch_texel_3d_f_intensity_f32 fetch_texel_3d_f_intensity_f32
}, },
{ {
MESA_FORMAT_INTENSITY_FLOAT16, MESA_FORMAT_I_FLOAT16,
fetch_texel_1d_f_intensity_f16, fetch_texel_1d_f_intensity_f16,
fetch_texel_2d_f_intensity_f16, fetch_texel_2d_f_intensity_f16,
fetch_texel_3d_f_intensity_f16 fetch_texel_3d_f_intensity_f16
@ -607,42 +607,42 @@ texfetch_funcs[] =
}, },
{ {
MESA_FORMAT_ALPHA_UINT8, MESA_FORMAT_A_UINT8,
NULL, NULL,
NULL, NULL,
NULL NULL
}, },
{ {
MESA_FORMAT_ALPHA_UINT16, MESA_FORMAT_A_UINT16,
NULL, NULL,
NULL, NULL,
NULL NULL
}, },
{ {
MESA_FORMAT_ALPHA_UINT32, MESA_FORMAT_A_UINT32,
NULL, NULL,
NULL, NULL,
NULL NULL
}, },
{ {
MESA_FORMAT_ALPHA_INT8, MESA_FORMAT_A_SINT8,
NULL, NULL,
NULL, NULL,
NULL NULL
}, },
{ {
MESA_FORMAT_ALPHA_INT16, MESA_FORMAT_A_SINT16,
NULL, NULL,
NULL, NULL,
NULL NULL
}, },
{ {
MESA_FORMAT_ALPHA_INT32, MESA_FORMAT_A_SINT32,
NULL, NULL,
NULL, NULL,
NULL NULL
@ -650,42 +650,42 @@ texfetch_funcs[] =
{ {
MESA_FORMAT_INTENSITY_UINT8, MESA_FORMAT_I_UINT8,
NULL, NULL,
NULL, NULL,
NULL NULL
}, },
{ {
MESA_FORMAT_INTENSITY_UINT16, MESA_FORMAT_I_UINT16,
NULL, NULL,
NULL, NULL,
NULL NULL
}, },
{ {
MESA_FORMAT_INTENSITY_UINT32, MESA_FORMAT_I_UINT32,
NULL, NULL,
NULL, NULL,
NULL NULL
}, },
{ {
MESA_FORMAT_INTENSITY_INT8, MESA_FORMAT_I_SINT8,
NULL, NULL,
NULL, NULL,
NULL NULL
}, },
{ {
MESA_FORMAT_INTENSITY_INT16, MESA_FORMAT_I_SINT16,
NULL, NULL,
NULL, NULL,
NULL NULL
}, },
{ {
MESA_FORMAT_INTENSITY_INT32, MESA_FORMAT_I_SINT32,
NULL, NULL,
NULL, NULL,
NULL NULL
@ -693,42 +693,42 @@ texfetch_funcs[] =
{ {
MESA_FORMAT_LUMINANCE_UINT8, MESA_FORMAT_L_UINT8,
NULL, NULL,
NULL, NULL,
NULL NULL
}, },
{ {
MESA_FORMAT_LUMINANCE_UINT16, MESA_FORMAT_L_UINT16,
NULL, NULL,
NULL, NULL,
NULL NULL
}, },
{ {
MESA_FORMAT_LUMINANCE_UINT32, MESA_FORMAT_L_UINT32,
NULL, NULL,
NULL, NULL,
NULL NULL
}, },
{ {
MESA_FORMAT_LUMINANCE_INT8, MESA_FORMAT_L_SINT8,
NULL, NULL,
NULL, NULL,
NULL NULL
}, },
{ {
MESA_FORMAT_LUMINANCE_INT16, MESA_FORMAT_L_SINT16,
NULL, NULL,
NULL, NULL,
NULL NULL
}, },
{ {
MESA_FORMAT_LUMINANCE_INT32, MESA_FORMAT_L_SINT32,
NULL, NULL,
NULL, NULL,
NULL NULL
@ -736,42 +736,42 @@ texfetch_funcs[] =
{ {
MESA_FORMAT_LUMINANCE_ALPHA_UINT8, MESA_FORMAT_LA_UINT8,
NULL, NULL,
NULL, NULL,
NULL NULL
}, },
{ {
MESA_FORMAT_LUMINANCE_ALPHA_UINT16, MESA_FORMAT_LA_UINT16,
NULL, NULL,
NULL, NULL,
NULL NULL
}, },
{ {
MESA_FORMAT_LUMINANCE_ALPHA_UINT32, MESA_FORMAT_LA_UINT32,
NULL, NULL,
NULL, NULL,
NULL NULL
}, },
{ {
MESA_FORMAT_LUMINANCE_ALPHA_INT8, MESA_FORMAT_LA_SINT8,
NULL, NULL,
NULL, NULL,
NULL NULL
}, },
{ {
MESA_FORMAT_LUMINANCE_ALPHA_INT16, MESA_FORMAT_LA_SINT16,
NULL, NULL,
NULL, NULL,
NULL NULL
}, },
{ {
MESA_FORMAT_LUMINANCE_ALPHA_INT32, MESA_FORMAT_LA_SINT32,
NULL, NULL,
NULL, NULL,
NULL NULL