[Mesa-dev] [PATCH] mesa: add missing TYPE_DOUBLEN_2 cases in get.c

[Ian Romanick]

On 01/21/2014 08:25 AM, Brian Paul wrote:
> The new TYPE_DOUBLEN_2 type was added in 0e60d850 but the code to
> return values of that type wasn't completed.
> 
> Fixes conform's default state test.  glGetFloatv(GL_DEPTH_RANGE)
> wasn't returning anything.
> 
> v2: remove stray 'break' statements.

ugh.  It would be nice if we could unify the glGet*v and glGet*i_v
paths. :(  I didn't even notice this in reviewing Courtney's original
patches.

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

> ---
>  src/mesa/main/get.c |   12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
> index 2b1538d..16dce5b 100644
> --- a/src/mesa/main/get.c
> +++ b/src/mesa/main/get.c
> @@ -1247,6 +1247,8 @@ _mesa_GetBooleanv(GLenum pname, GLboolean *params)
>        params[0] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[0]);
>        break;
>  
> +   case TYPE_DOUBLEN_2:
> +      params[1] = FLOAT_TO_BOOLEAN(((GLdouble *) p)[1]);
>     case TYPE_DOUBLEN:
>        params[0] = FLOAT_TO_BOOLEAN(((GLdouble *) p)[0]);
>        break;
> @@ -1333,6 +1335,8 @@ _mesa_GetFloatv(GLenum pname, GLfloat *params)
>        params[0] = ((GLfloat *) p)[0];
>        break;
>  
> +   case TYPE_DOUBLEN_2:
> +      params[1] = (GLfloat) (((GLdouble *) p)[1]);
>     case TYPE_DOUBLEN:
>        params[0] = (GLfloat) (((GLdouble *) p)[0]);
>        break;
> @@ -1425,6 +1429,8 @@ _mesa_GetIntegerv(GLenum pname, GLint *params)
>        params[0] = FLOAT_TO_INT(((GLfloat *) p)[0]);
>        break;
>  
> +   case TYPE_DOUBLEN_2:
> +      params[1] = FLOAT_TO_INT(((GLdouble *) p)[1]);
>     case TYPE_DOUBLEN:
>        params[0] = FLOAT_TO_INT(((GLdouble *) p)[0]);
>        break;
> @@ -1517,6 +1523,8 @@ _mesa_GetInteger64v(GLenum pname, GLint64 *params)
>        params[0] = FLOAT_TO_INT64(((GLfloat *) p)[0]);
>        break;
>  
> +   case TYPE_DOUBLEN_2:
> +      params[1] = FLOAT_TO_INT64(((GLdouble *) p)[1]);
>     case TYPE_DOUBLEN:
>        params[0] = FLOAT_TO_INT64(((GLdouble *) p)[0]);
>        break;
> @@ -1603,6 +1611,8 @@ _mesa_GetDoublev(GLenum pname, GLdouble *params)
>        params[0] = ((GLfloat *) p)[0];
>        break;
>  
> +   case TYPE_DOUBLEN_2:
> +      params[1] = ((GLdouble *) p)[1];
>     case TYPE_DOUBLEN:
>        params[0] = ((GLdouble *) p)[0];
>        break;
> @@ -2201,6 +2211,8 @@ _mesa_GetFixedv(GLenum pname, GLfixed *params)
>        params[0] = FLOAT_TO_FIXED(((GLfloat *) p)[0]);
>        break;
>  
> +   case TYPE_DOUBLEN_2:
> +      params[1] = FLOAT_TO_FIXED(((GLdouble *) p)[1]);
>     case TYPE_DOUBLEN:
>        params[0] = FLOAT_TO_FIXED(((GLdouble *) p)[0]);
>        break;
>