diff options
author | marha <marha@users.sourceforge.net> | 2011-09-08 11:05:14 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-09-08 11:05:14 +0200 |
commit | 32071a97fb69e2cb5a5dc86016b181a5afd2a87b (patch) | |
tree | 23a05e63a91e56c1c97a3c7b991e3acf46893e2f /mesalib/src/mesa/main/framebuffer.c | |
parent | 553aee48675d816bf041a61ab01bb73f8602d365 (diff) | |
parent | 23a7aebae0a742d94ffe2304357dcc1234a99155 (diff) | |
download | vcxsrv-32071a97fb69e2cb5a5dc86016b181a5afd2a87b.tar.gz vcxsrv-32071a97fb69e2cb5a5dc86016b181a5afd2a87b.tar.bz2 vcxsrv-32071a97fb69e2cb5a5dc86016b181a5afd2a87b.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/docs/relnotes.html
mesalib/scons/gallium.py
mesalib/src/mesa/drivers/common/driverfuncs.c
mesalib/src/mesa/main/colortab.c
mesalib/src/mesa/main/dd.h
mesalib/src/mesa/main/enable.c
mesalib/src/mesa/main/formats.c
mesalib/src/mesa/main/framebuffer.c
mesalib/src/mesa/main/get.c
mesalib/src/mesa/main/mtypes.h
mesalib/src/mesa/main/pack.c
mesalib/src/mesa/main/texgetimage.c
mesalib/src/mesa/main/teximage.c
mesalib/src/mesa/main/texobj.c
mesalib/src/mesa/main/texparam.c
mesalib/src/mesa/main/texstate.c
mesalib/src/mesa/swrast/s_drawpix.c
mesalib/src/mesa/vbo/vbo_attrib_tmp.h
Diffstat (limited to 'mesalib/src/mesa/main/framebuffer.c')
-rw-r--r-- | mesalib/src/mesa/main/framebuffer.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/framebuffer.c b/mesalib/src/mesa/main/framebuffer.c index fd499ab2b..6c8608a09 100644 --- a/mesalib/src/mesa/main/framebuffer.c +++ b/mesalib/src/mesa/main/framebuffer.c @@ -888,7 +888,6 @@ _mesa_source_buffer_exists(struct gl_context *ctx, GLenum format) case GL_RGBA:
case GL_BGRA:
case GL_ABGR_EXT:
- case GL_COLOR_INDEX:
case GL_RED_INTEGER_EXT:
case GL_GREEN_INTEGER_EXT:
case GL_BLUE_INTEGER_EXT:
@@ -976,7 +975,6 @@ _mesa_dest_buffer_exists(struct gl_context *ctx, GLenum format) case GL_RGBA:
case GL_BGRA:
case GL_ABGR_EXT:
- case GL_COLOR_INDEX:
case GL_RED_INTEGER_EXT:
case GL_GREEN_INTEGER_EXT:
case GL_BLUE_INTEGER_EXT:
|