diff options
author | marha <marha@users.sourceforge.net> | 2013-01-17 09:25:28 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-01-17 09:25:28 +0100 |
commit | 50c07563e17397daf040a32d8fdd3ab397e72371 (patch) | |
tree | ae9c109e16ba86a498c43ab62830bca3641a78aa /mesalib/src/mesa/drivers | |
parent | dc163f625ef006c8550791122bda28fb3eb67e3d (diff) | |
parent | 4fc6b34d1c14cc61f553ca59264d0909656933f3 (diff) | |
download | vcxsrv-50c07563e17397daf040a32d8fdd3ab397e72371.tar.gz vcxsrv-50c07563e17397daf040a32d8fdd3ab397e72371.tar.bz2 vcxsrv-50c07563e17397daf040a32d8fdd3ab397e72371.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libxcb mesa xkbcomp git update 17 jan 2013
Diffstat (limited to 'mesalib/src/mesa/drivers')
-rw-r--r-- | mesalib/src/mesa/drivers/common/meta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c index e25481e1a..4e32b5066 100644 --- a/mesalib/src/mesa/drivers/common/meta.c +++ b/mesalib/src/mesa/drivers/common/meta.c @@ -4126,7 +4126,7 @@ _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, const GLfloat x1 = x + width; const GLfloat y1 = y + height; - z = CLAMP(z, 0.0, 1.0); + z = CLAMP(z, 0.0f, 1.0f); z = invert_z(z); verts[0].x = x; |