diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-05 08:05:28 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-05 08:05:28 +0100 |
| commit | fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf (patch) | |
| tree | c59c3e084f79bd1f6060f9a5cedb5c48d4da14ee /mesalib/src/mesa/swrast/s_texfetch.c | |
| parent | 5d6e342b3c2d0d3607b184b1472b816228839e3f (diff) | |
| parent | 528f5bd58a139174170c4130c67dca30193c9057 (diff) | |
| download | vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.tar.gz vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.tar.bz2 vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
Diffstat (limited to 'mesalib/src/mesa/swrast/s_texfetch.c')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_texfetch.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/mesalib/src/mesa/swrast/s_texfetch.c b/mesalib/src/mesa/swrast/s_texfetch.c index bcd63b602..7cb6e68b1 100644 --- a/mesalib/src/mesa/swrast/s_texfetch.c +++ b/mesalib/src/mesa/swrast/s_texfetch.c @@ -39,6 +39,7 @@ #include "main/texcompress_fxt1.h" #include "main/texcompress_s3tc.h" #include "main/texcompress_rgtc.h" +#include "main/texcompress_etc.h" #include "main/teximage.h" #include "s_context.h" #include "s_texfetch.h" @@ -361,6 +362,13 @@ texfetch_funcs[MESA_FORMAT_COUNT] = store_texel_r8, }, { + MESA_FORMAT_GR88, + fetch_texel_1d_f_gr88, + fetch_texel_2d_f_gr88, + fetch_texel_3d_f_gr88, + store_texel_gr88, + }, + { MESA_FORMAT_RG88, fetch_texel_1d_f_rg88, fetch_texel_2d_f_rg88, @@ -368,13 +376,6 @@ texfetch_funcs[MESA_FORMAT_COUNT] = store_texel_rg88, }, { - MESA_FORMAT_RG88_REV, - fetch_texel_1d_f_rg88_rev, - fetch_texel_2d_f_rg88_rev, - fetch_texel_3d_f_rg88_rev, - store_texel_rg88_rev, - }, - { MESA_FORMAT_R16, fetch_texel_1d_f_r16, fetch_texel_2d_f_r16, @@ -1178,6 +1179,13 @@ texfetch_funcs[MESA_FORMAT_COUNT] = NULL }, { + MESA_FORMAT_ETC1_RGB8, + NULL, + _mesa_fetch_texel_2d_f_etc1_rgb8, + NULL, + NULL + }, + { MESA_FORMAT_SIGNED_A8, fetch_texel_1d_signed_a8, fetch_texel_2d_signed_a8, @@ -1282,7 +1290,8 @@ _mesa_get_texel_fetch_func(gl_format format, GLuint dims) } #endif - assert(Elements(texfetch_funcs) == MESA_FORMAT_COUNT); + STATIC_ASSERT(Elements(texfetch_funcs) == MESA_FORMAT_COUNT); + assert(format < MESA_FORMAT_COUNT); switch (dims) { |