diff options
author | Anuj Phogat <[email protected]> | 2012-11-05 17:45:18 -0800 |
---|---|---|
committer | Ian Romanick <[email protected]> | 2012-12-07 16:29:47 -0800 |
commit | e519b8a9af0f994d6b33e748ada463ff19df7ab8 (patch) | |
tree | 93b8fcc4d178b33bf82e69fb1c4e3febb15d22ae /src/mesa/swrast/s_texfetch.c | |
parent | 23b7103ceec5d16efaa3a04813a093217c717688 (diff) |
mesa: Add new MESA_FORMATs for ETC2 compressed textures
It is required by OpenGL ES 3.0 to support ETC2 textures.
This patch adds new MESA_FORMATs for following etc2 texture
formats:
GL_COMPRESSED_RGB8_ETC2
GL_COMPRESSED_SRGB8_ETC2
GL_COMPRESSED_RGBA8_ETC2_EAC
GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC
GL_COMPRESSED_R11_EAC
GL_COMPRESSED_RG11_EAC
GL_COMPRESSED_SIGNED_R11_EAC
GL_COMPRESSED_SIGNED_RG11_EAC
MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1
MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1
Above formats are currently available in only gles 3.0.
v2: Add entries in texfetch_funcs[] array.
Signed-off-by: Anuj Phogat <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
v3 (Paul Berry <[email protected]>): comment out symbols that
are not implemented yet, so that this commit compiles on its own;
future commits will uncomment the symbols as they become available.
Diffstat (limited to 'src/mesa/swrast/s_texfetch.c')
-rw-r--r-- | src/mesa/swrast/s_texfetch.c | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c index 7bfe3b941a3..8f0f9b754ef 100644 --- a/src/mesa/swrast/s_texfetch.c +++ b/src/mesa/swrast/s_texfetch.c @@ -1029,6 +1029,66 @@ texfetch_funcs[] = NULL }, { + MESA_FORMAT_ETC2_RGB8, + NULL, + NULL /* _mesa_fetch_texel_2d_f_etc2_rgb8 -- not implemented yet */, + NULL + }, + { + MESA_FORMAT_ETC2_SRGB8, + NULL, + NULL /* _mesa_fetch_texel_2d_f_etc2_srgb8 -- not implemented yet */, + NULL + }, + { + MESA_FORMAT_ETC2_RGBA8_EAC, + NULL, + NULL /* _mesa_fetch_texel_2d_f_etc2_rgba8_eac -- not implemented yet */, + NULL + }, + { + MESA_FORMAT_ETC2_SRGB8_ALPHA8_EAC, + NULL, + NULL /* _mesa_fetch_texel_2d_f_etc2_srgb8_alpha8_eac -- not implemented yet */, + NULL + }, + { + MESA_FORMAT_ETC2_R11_EAC, + NULL, + NULL /* _mesa_fetch_texel_2d_f_etc2_r11_eac -- not implemented yet */, + NULL + }, + { + MESA_FORMAT_ETC2_RG11_EAC, + NULL, + NULL /* _mesa_fetch_texel_2d_f_etc2_rg11_eac -- not implemented yet */, + NULL + }, + { + MESA_FORMAT_ETC2_SIGNED_R11_EAC, + NULL, + NULL /* _mesa_fetch_texel_2d_f_etc2_signed_r11_eac -- not implemented yet */, + NULL + }, + { + MESA_FORMAT_ETC2_SIGNED_RG11_EAC, + NULL, + NULL /* _mesa_fetch_texel_2d_f_etc2_signed_rg11_eac -- not implemented yet */, + NULL + }, + { + MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1, + NULL, + NULL /* _mesa_fetch_texel_2d_f_etc2_rgb8_punchthrough_alpha1 -- not implemented yet */, + NULL + }, + { + MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1, + NULL, + NULL /* _mesa_fetch_texel_2d_f_etc2_srgb8_punchthrough_alpha1 -- not implemented yet */, + NULL + }, + { MESA_FORMAT_SIGNED_A8, fetch_texel_1d_signed_a8, fetch_texel_2d_signed_a8, |