From c2c1c902f9793090905667227436442f09983c2d Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 13 Mar 2014 06:35:52 +0000 Subject: [PATCH] mesa: return v.value_int64 when the requested type is TYPE_INT64 Fixes "Operands don't affect result" defect reported by Coverity. Cc: "9.2 10.0 10.1" Signed-off-by: Emil Velikov Reviewed-by: Brian Paul (cherry picked from commit a9cf3aa2087f807b15e0e59ad00dd5bacf362c18) --- src/mesa/main/get.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index 3016f41e42f..6a388c40d53 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -1957,7 +1957,7 @@ _mesa_GetBooleani_v( GLenum pname, GLuint index, GLboolean *params ) params[3] = INT_TO_BOOLEAN(v.value_int_4[3]); break; case TYPE_INT64: - params[0] = INT64_TO_BOOLEAN(v.value_int); + params[0] = INT64_TO_BOOLEAN(v.value_int64); break; default: ; /* nothing - GL error was recorded */ @@ -2002,7 +2002,7 @@ _mesa_GetIntegeri_v( GLenum pname, GLuint index, GLint *params ) params[3] = v.value_int_4[3]; break; case TYPE_INT64: - params[0] = INT64_TO_INT(v.value_int); + params[0] = INT64_TO_INT(v.value_int64); break; default: ; /* nothing - GL error was recorded */ @@ -2027,7 +2027,7 @@ _mesa_GetInteger64i_v( GLenum pname, GLuint index, GLint64 *params ) params[3] = v.value_int_4[3]; break; case TYPE_INT64: - params[0] = v.value_int; + params[0] = v.value_int64; break; default: ; /* nothing - GL error was recorded */