Merge remote-tracking branch 'origin/released'

* origin/released:
  xserver mesa git update 10 oct 2012

4 files changed, 0 insertions, 24 deletions

diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_send.py b/mesalib/src/mapi/glapi/gen/glX_proto_send.py
index 0e4b420fd..2cb0cf4ef 100644
--- a/mesalib/src/mapi/glapi/gen/glX_proto_send.py
+++ b/mesalib/src/mapi/glapi/gen/glX_proto_send.py
@@ -169,11 +169,9 @@ class PrintGlxProtoStubs(glX_proto_common.glx_print_proto):
 		print '#include "glapi.h"'
 		print '#include "glthread.h"'
 		print '#include <GL/glxproto.h>'
-		print '#ifdef USE_XCB'
 		print '#include <X11/Xlib-xcb.h>'
 		print '#include <xcb/xcb.h>'
 		print '#include <xcb/glx.h>'
-		print '#endif /* USE_XCB */'
 
 		print ''
 		print '#define __GLX_PAD(n) (((n) + 3) & ~3)'
diff --git a/mesalib/src/mesa/main/texcompress_cpal.c b/mesalib/src/mesa/main/texcompress_cpal.c
index 4aa1f610e..75389a437 100644
--- a/mesalib/src/mesa/main/texcompress_cpal.c
+++ b/mesalib/src/mesa/main/texcompress_cpal.c
@@ -140,21 +140,6 @@ _mesa_cpal_compressed_size(int level, GLenum internalFormat,
    return expect_size;
 }
 
-void
-_mesa_cpal_compressed_format_type(GLenum internalFormat, GLenum *format,
-				  GLenum *type)
-{
-   const struct cpal_format_info *info;
-
-   if (internalFormat < GL_PALETTE4_RGB8_OES
-       || internalFormat > GL_PALETTE8_RGB5_A1_OES) {
-      return;
-   }
-
-   info = &formats[internalFormat - GL_PALETTE4_RGB8_OES];
-   *format = info->format;
-   *type = info->type;
-}
 
 /**
  * Convert a call to glCompressedTexImage2D() where internalFormat is a
diff --git a/mesalib/src/mesa/main/texcompress_cpal.h b/mesalib/src/mesa/main/texcompress_cpal.h
index 7507d5c1b..7d28fd866 100644
--- a/mesalib/src/mesa/main/texcompress_cpal.h
+++ b/mesalib/src/mesa/main/texcompress_cpal.h
@@ -38,8 +38,5 @@ extern unsigned
 _mesa_cpal_compressed_size(int level, GLenum internalFormat,
 			   unsigned width, unsigned height);
 
-extern void
-_mesa_cpal_compressed_format_type(GLenum internalFormat, GLenum *format,
-				  GLenum *type);
 
 #endif /* TEXCOMPRESS_CPAL_H */
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index d7156e670..6c8bb85b8 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -1977,10 +1977,6 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions,
    case GL_PALETTE8_R5_G6_B5_OES:
    case GL_PALETTE8_RGBA4_OES:
    case GL_PALETTE8_RGB5_A1_OES:
-      _mesa_cpal_compressed_format_type(internalFormat, &choose_format,
-					&choose_type);
-      proxy_format = choose_format;
-
       /* check level (note that level should be zero or less!) */
       if (level > 0 || level < -maxLevels) {
 	 reason = "level";