diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-09 22:56:02 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-09 22:56:02 +0100 |
| commit | 2112b7dec49833ba872bd3ebcd7288930fec0796 (patch) | |
| tree | 407c80c9a70f590af2d4c3e5c14678827e189331 /mesalib/src/mesa/swrast/s_texfetch.c | |
| parent | 8badbdef38ce843dc443ddee219eda4040ef2cd5 (diff) | |
| parent | 3dd4b6420f686b0147d5b8136268cc63196e253b (diff) | |
| download | vcxsrv-2112b7dec49833ba872bd3ebcd7288930fec0796.tar.gz vcxsrv-2112b7dec49833ba872bd3ebcd7288930fec0796.tar.bz2 vcxsrv-2112b7dec49833ba872bd3ebcd7288930fec0796.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver git update 9 Mar 2014
Conflicts:
mesalib/src/mapi/glapi/glapi.h
xorg-server/hw/kdrive/ephyr/hostx.c
Diffstat (limited to 'mesalib/src/mesa/swrast/s_texfetch.c')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_texfetch.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mesalib/src/mesa/swrast/s_texfetch.c b/mesalib/src/mesa/swrast/s_texfetch.c index b620748c9..8ba75348f 100644 --- a/mesalib/src/mesa/swrast/s_texfetch.c +++ b/mesalib/src/mesa/swrast/s_texfetch.c @@ -437,6 +437,12 @@ texfetch_funcs[] = fetch_texel_3d_sargb8 }, { + MESA_FORMAT_R8G8B8A8_SRGB, + fetch_texel_1d_sabgr8, + fetch_texel_2d_sabgr8, + fetch_texel_3d_sabgr8 + }, + { MESA_FORMAT_L_SRGB8, fetch_texel_1d_sl8, fetch_texel_2d_sl8, @@ -1304,6 +1310,12 @@ texfetch_funcs[] = NULL, NULL }, + { + MESA_FORMAT_B8G8R8X8_SRGB, + NULL, + NULL, + NULL + }, }; |