fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 02:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

mesa: simplify _mesa_get_compressed_formats()

Browse source 
Instead of testing for formats==NULL everywhere, just point formats at
a dummy array which will be discarded.

Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
This commit is contained in:
Brian Paul 2018-02-06 09:55:13 -07:00
parent d919ff0f27
commit b38196b452
1 changed files with 83 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

200
src/mesa/main/texcompress.c
View file

@ -263,27 +263,23 @@ _mesa_gl_compressed_format_base_format(GLenum format)
GLuint
_mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats)
{
GLint discard_formats[100];
GLuint n = 0;
if (!formats) {
formats = discard_formats;
}
if (_mesa_is_desktop_gl(ctx) &&
ctx->Extensions.TDFX_texture_compression_FXT1) {
if (formats) {
formats[n++] = GL_COMPRESSED_RGB_FXT1_3DFX;
formats[n++] = GL_COMPRESSED_RGBA_FXT1_3DFX;
}
else {
n += 2;
}
formats[n++] = GL_COMPRESSED_RGB_FXT1_3DFX;
formats[n++] = GL_COMPRESSED_RGBA_FXT1_3DFX;
}
if (ctx->Extensions.EXT_texture_compression_s3tc) {
if (formats) {
formats[n++] = GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
}
else {
n += 3;
}
formats[n++] = GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
/* The ES and desktop GL specs diverge here.
*
@ -315,11 +311,7 @@ _mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats)
* Note that the addition is only to the OpenGL ES specification!
*/
if (_mesa_is_gles(ctx)) {
if (formats) {
formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
} else {
n += 1;
}
formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
}
}
@ -332,54 +324,36 @@ _mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats)
*/
if (_mesa_is_gles(ctx)
&& ctx->Extensions.OES_compressed_ETC1_RGB8_texture) {
if (formats) {
formats[n++] = GL_ETC1_RGB8_OES;
}
else {
n += 1;
}
formats[n++] = GL_ETC1_RGB8_OES;
}
if (ctx->API == API_OPENGLES) {
if (formats) {
formats[n++] = GL_PALETTE4_RGB8_OES;
formats[n++] = GL_PALETTE4_RGBA8_OES;
formats[n++] = GL_PALETTE4_R5_G6_B5_OES;
formats[n++] = GL_PALETTE4_RGBA4_OES;
formats[n++] = GL_PALETTE4_RGB5_A1_OES;
formats[n++] = GL_PALETTE8_RGB8_OES;
formats[n++] = GL_PALETTE8_RGBA8_OES;
formats[n++] = GL_PALETTE8_R5_G6_B5_OES;
formats[n++] = GL_PALETTE8_RGBA4_OES;
formats[n++] = GL_PALETTE8_RGB5_A1_OES;
}
else {
n += 10;
}
formats[n++] = GL_PALETTE4_RGB8_OES;
formats[n++] = GL_PALETTE4_RGBA8_OES;
formats[n++] = GL_PALETTE4_R5_G6_B5_OES;
formats[n++] = GL_PALETTE4_RGBA4_OES;
formats[n++] = GL_PALETTE4_RGB5_A1_OES;
formats[n++] = GL_PALETTE8_RGB8_OES;
formats[n++] = GL_PALETTE8_RGBA8_OES;
formats[n++] = GL_PALETTE8_R5_G6_B5_OES;
formats[n++] = GL_PALETTE8_RGBA4_OES;
formats[n++] = GL_PALETTE8_RGB5_A1_OES;
}
if (_mesa_is_gles3(ctx) || ctx->Extensions.ARB_ES3_compatibility) {
if (formats) {
formats[n++] = GL_COMPRESSED_RGB8_ETC2;
formats[n++] = GL_COMPRESSED_RGBA8_ETC2_EAC;
formats[n++] = GL_COMPRESSED_R11_EAC;
formats[n++] = GL_COMPRESSED_RG11_EAC;
formats[n++] = GL_COMPRESSED_SIGNED_R11_EAC;
formats[n++] = GL_COMPRESSED_SIGNED_RG11_EAC;
formats[n++] = GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2;
} else {
n += 7;
}
formats[n++] = GL_COMPRESSED_RGB8_ETC2;
formats[n++] = GL_COMPRESSED_RGBA8_ETC2_EAC;
formats[n++] = GL_COMPRESSED_R11_EAC;
formats[n++] = GL_COMPRESSED_RG11_EAC;
formats[n++] = GL_COMPRESSED_SIGNED_R11_EAC;
formats[n++] = GL_COMPRESSED_SIGNED_RG11_EAC;
formats[n++] = GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2;
}
if (_mesa_is_gles3(ctx)) {
if (formats) {
formats[n++] = GL_COMPRESSED_SRGB8_ETC2;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC;
formats[n++] = GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2;
} else {
n += 3;
}
formats[n++] = GL_COMPRESSED_SRGB8_ETC2;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC;
formats[n++] = GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2;
}
/* The KHR_texture_compression_astc_hdr spec says:
@ -409,70 +383,62 @@ _mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats)
*/
if (ctx->API == API_OPENGLES2 &&
ctx->Extensions.KHR_texture_compression_astc_ldr) {
if (formats) {
formats[n++] = GL_COMPRESSED_RGBA_ASTC_4x4_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_5x4_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_5x5_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_6x5_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_6x6_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_8x5_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_8x6_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_8x8_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_10x5_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_10x6_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_10x8_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_10x10_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_12x10_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_12x12_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR;
}
else {
n += 28;
}
formats[n++] = GL_COMPRESSED_RGBA_ASTC_4x4_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_5x4_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_5x5_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_6x5_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_6x6_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_8x5_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_8x6_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_8x8_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_10x5_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_10x6_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_10x8_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_10x10_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_12x10_KHR;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_12x12_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR;
}
if (_mesa_is_gles3(ctx) &&
ctx->Extensions.OES_texture_compression_astc) {
if (formats) {
formats[n++] = GL_COMPRESSED_RGBA_ASTC_3x3x3_OES;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_4x3x3_OES;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_4x4x3_OES;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_4x4x4_OES;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_5x4x4_OES;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_5x5x4_OES;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_5x5x5_OES;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_6x5x5_OES;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_6x6x5_OES;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_6x6x6_OES;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_3x3x3_OES;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x3x3_OES;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x3_OES;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x4_OES;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4x4_OES;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x4_OES;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x5_OES;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5x5_OES;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x5_OES;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x6_OES;
}
else {
n += 20;
}
formats[n++] = GL_COMPRESSED_RGBA_ASTC_3x3x3_OES;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_4x3x3_OES;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_4x4x3_OES;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_4x4x4_OES;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_5x4x4_OES;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_5x5x4_OES;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_5x5x5_OES;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_6x5x5_OES;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_6x6x5_OES;
formats[n++] = GL_COMPRESSED_RGBA_ASTC_6x6x6_OES;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_3x3x3_OES;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x3x3_OES;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x3_OES;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x4_OES;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4x4_OES;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x4_OES;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x5_OES;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5x5_OES;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x5_OES;
formats[n++] = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x6_OES;
}
assert(n <= ARRAY_SIZE(discard_formats));
return n;
}