diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-28 12:47:32 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-28 12:47:32 +0000 |
| commit | 717b1a4e21b372e1343e33ae9348fbe5c6f8d7ed (patch) | |
| tree | 1512dddc255b89d5d3ec35bfc541a357184a7d7f /mesalib/src/mesa/main/texfetch.c | |
| parent | 46ff5affddfec90a099d55945ab2f857a5a75e57 (diff) | |
| parent | feee2b5ceb37101bd1c4162e49805e6ad63e28ae (diff) | |
| download | vcxsrv-717b1a4e21b372e1343e33ae9348fbe5c6f8d7ed.tar.gz vcxsrv-717b1a4e21b372e1343e33ae9348fbe5c6f8d7ed.tar.bz2 vcxsrv-717b1a4e21b372e1343e33ae9348fbe5c6f8d7ed.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main/texfetch.c')
| -rw-r--r-- | mesalib/src/mesa/main/texfetch.c | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/texfetch.c b/mesalib/src/mesa/main/texfetch.c index 1e7ea9480..8666076ab 100644 --- a/mesalib/src/mesa/main/texfetch.c +++ b/mesalib/src/mesa/main/texfetch.c @@ -38,6 +38,7 @@ #include "texcompress.h"
#include "texcompress_fxt1.h"
#include "texcompress_s3tc.h"
+#include "texcompress_rgtc.h"
#include "texfetch.h"
#include "teximage.h"
@@ -756,7 +757,35 @@ texfetch_funcs[MESA_FORMAT_COUNT] = fetch_texel_2d_rgba_16,
fetch_texel_3d_rgba_16,
store_texel_rgba_16
- }
+ },
+ {
+ MESA_FORMAT_RED_RGTC1,
+ NULL,
+ _mesa_fetch_texel_2d_f_red_rgtc1,
+ NULL,
+ NULL
+ },
+ {
+ MESA_FORMAT_SIGNED_RED_RGTC1,
+ NULL,
+ _mesa_fetch_texel_2d_f_signed_red_rgtc1,
+ NULL,
+ NULL
+ },
+ {
+ MESA_FORMAT_RG_RGTC2,
+ NULL,
+ _mesa_fetch_texel_2d_f_rg_rgtc2,
+ NULL,
+ NULL
+ },
+ {
+ MESA_FORMAT_SIGNED_RG_RGTC2,
+ NULL,
+ _mesa_fetch_texel_2d_f_signed_rg_rgtc2,
+ NULL,
+ NULL
+ },
};
|