diff options
| author | marha <marha@users.sourceforge.net> | 2012-12-10 08:55:36 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-12-10 08:55:36 +0100 |
| commit | a0124a5e8e70979d2c24ef55285da989fdad766a (patch) | |
| tree | 5cea5c9804a8edf67bc7260e0851a20d21324547 /mesalib/src/mesa/swrast/s_texfetch.c | |
| parent | 514b4afb64ccbf8e954270105ed5064272a2be68 (diff) | |
| parent | 0328076efb5ff6e62152c09e38d0d11f7931d07b (diff) | |
| download | vcxsrv-a0124a5e8e70979d2c24ef55285da989fdad766a.tar.gz vcxsrv-a0124a5e8e70979d2c24ef55285da989fdad766a.tar.bz2 vcxsrv-a0124a5e8e70979d2c24ef55285da989fdad766a.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 mesa pixman git update 10 dec 2012
Conflicts:
fontconfig/src/fcxml.c
Diffstat (limited to 'mesalib/src/mesa/swrast/s_texfetch.c')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_texfetch.c | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/mesalib/src/mesa/swrast/s_texfetch.c b/mesalib/src/mesa/swrast/s_texfetch.c index 7bfe3b941..86b01a0b3 100644 --- a/mesalib/src/mesa/swrast/s_texfetch.c +++ b/mesalib/src/mesa/swrast/s_texfetch.c @@ -1029,6 +1029,66 @@ texfetch_funcs[] = NULL }, { + MESA_FORMAT_ETC2_RGB8, + NULL, + _mesa_fetch_texel_2d_f_etc2_rgb8, + NULL + }, + { + MESA_FORMAT_ETC2_SRGB8, + NULL, + _mesa_fetch_texel_2d_f_etc2_srgb8, + NULL + }, + { + MESA_FORMAT_ETC2_RGBA8_EAC, + NULL, + _mesa_fetch_texel_2d_f_etc2_rgba8_eac, + NULL + }, + { + MESA_FORMAT_ETC2_SRGB8_ALPHA8_EAC, + NULL, + _mesa_fetch_texel_2d_f_etc2_srgb8_alpha8_eac, + NULL + }, + { + MESA_FORMAT_ETC2_R11_EAC, + NULL, + _mesa_fetch_texel_2d_f_etc2_r11_eac, + NULL + }, + { + MESA_FORMAT_ETC2_RG11_EAC, + NULL, + _mesa_fetch_texel_2d_f_etc2_rg11_eac, + NULL + }, + { + MESA_FORMAT_ETC2_SIGNED_R11_EAC, + NULL, + _mesa_fetch_texel_2d_f_etc2_signed_r11_eac, + NULL + }, + { + MESA_FORMAT_ETC2_SIGNED_RG11_EAC, + NULL, + _mesa_fetch_texel_2d_f_etc2_signed_rg11_eac, + NULL + }, + { + MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1, + NULL, + _mesa_fetch_texel_2d_f_etc2_rgb8_punchthrough_alpha1, + NULL + }, + { + MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1, + NULL, + _mesa_fetch_texel_2d_f_etc2_srgb8_punchthrough_alpha1, + NULL + }, + { MESA_FORMAT_SIGNED_A8, fetch_texel_1d_signed_a8, fetch_texel_2d_signed_a8, |