aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/texcompress_cpal.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-10-10 13:31:35 +0200
committermarha <marha@users.sourceforge.net>2012-10-10 13:31:35 +0200
commitac799961eb382e48c68ffda1e1a89b346eb97f81 (patch)
tree96ab9494b7313d30b9b3d37480937fa07136b27b /mesalib/src/mesa/main/texcompress_cpal.h
parente957ce706e896f5ed802d81f26a2663578f8153f (diff)
parent8c5587d9be904856f7e449a144c2819a8e310599 (diff)
downloadvcxsrv-ac799961eb382e48c68ffda1e1a89b346eb97f81.tar.gz
vcxsrv-ac799961eb382e48c68ffda1e1a89b346eb97f81.tar.bz2
vcxsrv-ac799961eb382e48c68ffda1e1a89b346eb97f81.zip
Merge remote-tracking branch 'origin/released'
* origin/released: xserver mesa git update 10 oct 2012
Diffstat (limited to 'mesalib/src/mesa/main/texcompress_cpal.h')
-rw-r--r--mesalib/src/mesa/main/texcompress_cpal.h3
1 files changed, 0 insertions, 3 deletions
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 */