From 3d37cf99c80839326baa0f14bf04f9fd88b4c215 Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Thu, 18 May 2017 11:43:57 +0200 Subject: [PATCH] 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 --- 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 2fdbc83be24..e6c78bf69c3 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: { -- 2.30.2