aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/math/m_translate.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2015-02-22 21:39:56 +0100
committermarha <marha@users.sourceforge.net>2015-02-22 21:39:56 +0100
commit462f18c7b25fe3e467f837647d07ab0a78aa8d2b (patch)
treefc8013c0a1bac05a1945846c1697e973f4c35013 /mesalib/src/mesa/math/m_translate.c
parent36f711ee12b6dd5184198abed3aa551efb585587 (diff)
downloadvcxsrv-462f18c7b25fe3e467f837647d07ab0a78aa8d2b.tar.gz
vcxsrv-462f18c7b25fe3e467f837647d07ab0a78aa8d2b.tar.bz2
vcxsrv-462f18c7b25fe3e467f837647d07ab0a78aa8d2b.zip
Merged origin/release (checked in because wanted to merge new stuff)
Diffstat (limited to 'mesalib/src/mesa/math/m_translate.c')
-rw-r--r--mesalib/src/mesa/math/m_translate.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/mesalib/src/mesa/math/m_translate.c b/mesalib/src/mesa/math/m_translate.c
index 0b8c858d7..3a8ca74f6 100644
--- a/mesalib/src/mesa/math/m_translate.c
+++ b/mesalib/src/mesa/math/m_translate.c
@@ -30,7 +30,6 @@
#include "main/glheader.h"
#include "main/macros.h"
-#include "main/mtypes.h" /* GLchan hack */
#include "m_translate.h"
@@ -676,26 +675,6 @@ void _math_trans_4ub(GLubyte (*to)[4],
}
/**
- * Translate vector of values to GLchan [4].
- */
-void _math_trans_4chan( GLchan (*to)[4],
- const void *ptr,
- GLuint stride,
- GLenum type,
- GLuint size,
- GLuint start,
- GLuint n )
-{
-#if CHAN_TYPE == GL_UNSIGNED_BYTE
- _math_trans_4ub( to, ptr, stride, type, size, start, n );
-#elif CHAN_TYPE == GL_UNSIGNED_SHORT
- _math_trans_4us( to, ptr, stride, type, size, start, n );
-#elif CHAN_TYPE == GL_FLOAT
- _math_trans_4fn( to, ptr, stride, type, size, start, n );
-#endif
-}
-
-/**
* Translate vector of values to GLushort [4].
*/
void _math_trans_4us(GLushort (*to)[4],