diff options
author | marha <marha@users.sourceforge.net> | 2012-09-04 15:49:46 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-09-04 15:49:46 +0200 |
commit | f2c10b20ce3f657c1f2013057602bb439816940f (patch) | |
tree | 4f86053b9b636d2d0174e229e79f2bb9d0a6f1a7 /mesalib/src/mesa/swrast/s_texfilter.c | |
parent | b3bc6204173252cae91fd40659c0eb01e4c75c99 (diff) | |
parent | 67c4614f29188e4af86e1d88ee82759c896b70b5 (diff) | |
download | vcxsrv-f2c10b20ce3f657c1f2013057602bb439816940f.tar.gz vcxsrv-f2c10b20ce3f657c1f2013057602bb439816940f.tar.bz2 vcxsrv-f2c10b20ce3f657c1f2013057602bb439816940f.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
libxcb/src/xcb_ext.c
libxcb/src/xcb_xid.c
mesalib/src/mesa/main/.gitignore
mesalib/src/mesa/main/eval.c
mesalib/src/mesa/main/imports.h
mesalib/src/mesa/main/macros.h
Diffstat (limited to 'mesalib/src/mesa/swrast/s_texfilter.c')
-rw-r--r-- | mesalib/src/mesa/swrast/s_texfilter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/swrast/s_texfilter.c b/mesalib/src/mesa/swrast/s_texfilter.c index d116a059d..152b1ff3e 100644 --- a/mesalib/src/mesa/swrast/s_texfilter.c +++ b/mesalib/src/mesa/swrast/s_texfilter.c @@ -1795,12 +1795,12 @@ sample_2d_footprint(struct gl_context *ctx, /* Calculate the per anisotropic sample offsets in s,t space. */ if (Px2 > Py2) { - numSamples = ceil(SQRTF(Px2)); + numSamples = ceil(sqrtf(Px2)); ds = ux / ((GLfloat) img->Width2); dt = vx / ((GLfloat) img->Height2); } else { - numSamples = ceil(SQRTF(Py2)); + numSamples = ceil(sqrtf(Py2)); ds = uy / ((GLfloat) img->Width2); dt = vy / ((GLfloat) img->Height2); } |