From c33308248357c40896872336258a66190e3c7048 Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Thu, 18 May 2017 11:43:55 +0200 Subject: [PATCH] mesa/main: Add conversion from double to uint64/int64 in GetUniform*i64v() v2: - need unsigned rounding for double->uint64 conversion (Nicolai) - use round() instead of IROUND() macros (Iago) Reviewed-by: Matt Turner --- src/mesa/main/uniform_query.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp index aca54163bff..b53f60bc456 100644 --- a/src/mesa/main/uniform_query.cpp +++ b/src/mesa/main/uniform_query.cpp @@ -580,6 +580,13 @@ _mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location, memcpy(&dst[didx].u, &tmp, sizeof(tmp)); break; } + case GLSL_TYPE_DOUBLE: { + double d; + memcpy(&d, &src[sidx].f, sizeof(d)); + int64_t tmp = (int64_t) round(d); + memcpy(&dst[didx].u, &tmp, sizeof(tmp)); + break; + } default: assert(!"Should not get here."); break; @@ -618,6 +625,13 @@ _mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location, memcpy(&dst[didx].u, &tmp, sizeof(tmp)); break; } + case GLSL_TYPE_DOUBLE: { + double d; + memcpy(&d, &src[sidx].f, sizeof(d)); + uint64_t tmp = (d < 0.0) ? 0ull : (uint64_t) round(d); + memcpy(&dst[didx].u, &tmp, sizeof(tmp)); + break; + } default: assert(!"Should not get here."); break; -- 2.30.2