diff options
author | marha <marha@users.sourceforge.net> | 2011-04-30 16:21:56 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-04-30 16:21:56 +0000 |
commit | e4dd9264ee8d4a20eef0eec8c8bf8cff2473b46f (patch) | |
tree | 1804d7456ba8f200c7e329d4e6aa67ce4fb1649f /mesalib/src/mesa/main/texfetch.c | |
parent | 88a78ebea08af461224f815a8380ea5c54186f43 (diff) | |
parent | 0402d388cb9803652c0f9a52ba7dcb6029fdd0b9 (diff) | |
download | vcxsrv-e4dd9264ee8d4a20eef0eec8c8bf8cff2473b46f.tar.gz vcxsrv-e4dd9264ee8d4a20eef0eec8c8bf8cff2473b46f.tar.bz2 vcxsrv-e4dd9264ee8d4a20eef0eec8c8bf8cff2473b46f.zip |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main/texfetch.c')
-rw-r--r-- | mesalib/src/mesa/main/texfetch.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/texfetch.c b/mesalib/src/mesa/main/texfetch.c index cb2716619..ab3abf657 100644 --- a/mesalib/src/mesa/main/texfetch.c +++ b/mesalib/src/mesa/main/texfetch.c @@ -41,6 +41,8 @@ #include "texcompress_rgtc.h"
#include "texfetch.h"
#include "teximage.h"
+#include "../../gallium/auxiliary/util/u_format_rgb9e5.h"
+#include "../../gallium/auxiliary/util/u_format_r11g11b10f.h"
/**
@@ -898,6 +900,20 @@ texfetch_funcs[MESA_FORMAT_COUNT] = fetch_texel_3d_signed_i16,
store_texel_signed_i16
},
+ {
+ MESA_FORMAT_RGB9_E5_FLOAT,
+ fetch_texel_1d_rgb9_e5,
+ fetch_texel_2d_rgb9_e5,
+ fetch_texel_3d_rgb9_e5,
+ store_texel_rgb9_e5
+ },
+ {
+ MESA_FORMAT_R11_G11_B10_FLOAT,
+ fetch_texel_1d_r11_g11_b10f,
+ fetch_texel_2d_r11_g11_b10f,
+ fetch_texel_3d_r11_g11_b10f,
+ store_texel_r11_g11_b10f
+ }
};
|