Mesa (master): mesa/main: replace remaining uses of IROUND() in GetUniform*() by round()
Iago Toral Quiroga
itoral at kemper.freedesktop.org
Thu Jun 1 07:02:24 UTC 2017
Module: Mesa
Branch: master
Commit: 3d37cf99c80839326baa0f14bf04f9fd88b4c215
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3d37cf99c80839326baa0f14bf04f9fd88b4c215
Author: Iago Toral Quiroga <itoral at igalia.com>
Date: Thu May 18 11:43:57 2017 +0200
mesa/main: replace remaining uses of IROUND() in GetUniform*() by round()
These were correct since they were used only in conversions to signed integers,
however this makes the implementation a bit more is more consistent and reduces
chances of propagating use of these macros to unsigned cases in the future, which
would not be correct.
Reviewed-by: Matt Turner <mattst88 at gmail.com>
---
src/mesa/main/uniform_query.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index 2fdbc83be2..e6c78bf69c 100644
--- a/src/mesa/main/uniform_query.cpp
+++ b/src/mesa/main/uniform_query.cpp
@@ -471,7 +471,7 @@ _mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location,
* a floating-point value is rounded to the
* nearest integer..."
*/
- dst[didx].i = IROUND(src[sidx].f);
+ dst[didx].i = (int64_t) roundf(src[sidx].f);
break;
case GLSL_TYPE_BOOL:
dst[didx].i = src[sidx].i ? 1 : 0;
@@ -482,7 +482,7 @@ _mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location,
case GLSL_TYPE_DOUBLE: {
double tmp;
memcpy(&tmp, &src[sidx].f, sizeof(tmp));
- dst[didx].i = IROUNDD(tmp);
+ dst[didx].i = (int64_t) round(tmp);
break;
}
case GLSL_TYPE_UINT64: {
More information about the mesa-commit
mailing list