aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/teximage.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-02-07 10:45:44 +0100
committermarha <marha@users.sourceforge.net>2013-02-07 10:45:44 +0100
commitcbcf519f983c24f5d315b4abc194e5d147dc0ab7 (patch)
tree3f9cafad0ae5ba278eb444c4ec85f53155e7050d /mesalib/src/mesa/main/teximage.c
parent012567f7279756f1fcc4aee30e5e72f0938fe3da (diff)
parent956c20498738c242726b5a42ed28db8572a90bed (diff)
downloadvcxsrv-cbcf519f983c24f5d315b4abc194e5d147dc0ab7.tar.gz
vcxsrv-cbcf519f983c24f5d315b4abc194e5d147dc0ab7.tar.bz2
vcxsrv-cbcf519f983c24f5d315b4abc194e5d147dc0ab7.zip
Merge remote-tracking branch 'origin/released'
* origin/released: mesa fontconfig git update 7 Feb 2013
Diffstat (limited to 'mesalib/src/mesa/main/teximage.c')
-rw-r--r--mesalib/src/mesa/main/teximage.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index ff3c92c5e..9283ece8a 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -3917,7 +3917,7 @@ get_texbuffer_format(const struct gl_context *ctx, GLenum internalFormat)
case GL_RG8:
return MESA_FORMAT_GR88;
case GL_RG16:
- return MESA_FORMAT_RG1616;
+ return MESA_FORMAT_GR1616;
case GL_RG16F:
return MESA_FORMAT_RG_FLOAT16;
case GL_RG32F: