diff options
| author | marha <marha@users.sourceforge.net> | 2011-08-30 08:11:58 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-08-30 08:11:58 +0200 |
| commit | ccddacee74b1f043b146265297c8abbde6317df7 (patch) | |
| tree | d6ddca10b5d19de1f14e56d7013a8591f4bfe658 /mesalib/src/mesa/drivers/dri/common | |
| parent | 52a690f156b6388c2219610d4e9cd88b79d24203 (diff) | |
| parent | 82ce0534a7bc89f1ed93b4b952b30ceb3d94210d (diff) | |
| download | vcxsrv-ccddacee74b1f043b146265297c8abbde6317df7.tar.gz vcxsrv-ccddacee74b1f043b146265297c8abbde6317df7.tar.bz2 vcxsrv-ccddacee74b1f043b146265297c8abbde6317df7.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/SConscript
mesalib/src/mesa/drivers/common/driverfuncs.c
mesalib/src/mesa/drivers/dri/common/texmem.c
mesalib/src/mesa/main/context.c
mesalib/src/mesa/main/dd.h
mesalib/src/mesa/main/debug.h
mesalib/src/mesa/main/fbobject.c
mesalib/src/mesa/main/formats.c
mesalib/src/mesa/main/formats.h
mesalib/src/mesa/main/teximage.c
mesalib/src/mesa/sources.mak
mesalib/src/mesa/state_tracker/st_cb_texture.c
Diffstat (limited to 'mesalib/src/mesa/drivers/dri/common')
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/common/texmem.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mesalib/src/mesa/drivers/dri/common/texmem.c b/mesalib/src/mesa/drivers/dri/common/texmem.c index 03c15c895..1ba66133f 100644 --- a/mesalib/src/mesa/drivers/dri/common/texmem.c +++ b/mesalib/src/mesa/drivers/dri/common/texmem.c @@ -1310,7 +1310,6 @@ gl_format _dri_texformat_argb4444 = MESA_FORMAT_NONE; gl_format _dri_texformat_argb1555 = MESA_FORMAT_NONE;
gl_format _dri_texformat_al88 = MESA_FORMAT_NONE;
gl_format _dri_texformat_a8 = MESA_FORMAT_A8;
-gl_format _dri_texformat_ci8 = MESA_FORMAT_CI8;
gl_format _dri_texformat_i8 = MESA_FORMAT_I8;
gl_format _dri_texformat_l8 = MESA_FORMAT_L8;
/*@}*/
|