[Mesa-dev] [PATCH 08/13] vbo: Avoid double promotion.

Iago Toral itoral at igalia.com
Tue Jul 14 02:58:17 PDT 2015


Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>

On Mon, 2015-07-13 at 16:22 -0700, Matt Turner wrote:
> ---
>  src/mesa/vbo/vbo_context.c    | 6 +++---
>  src/mesa/vbo/vbo_exec_array.c | 4 ++--
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/src/mesa/vbo/vbo_context.c b/src/mesa/vbo/vbo_context.c
> index fd1ffe2..e3eb286 100644
> --- a/src/mesa/vbo/vbo_context.c
> +++ b/src/mesa/vbo/vbo_context.c
> @@ -37,9 +37,9 @@
>  
>  static GLuint check_size( const GLfloat *attr )
>  {
> -   if (attr[3] != 1.0) return 4;
> -   if (attr[2] != 0.0) return 3;
> -   if (attr[1] != 0.0) return 2;
> +   if (attr[3] != 1.0F) return 4;
> +   if (attr[2] != 0.0F) return 3;
> +   if (attr[1] != 0.0F) return 2;
>     return 1;		
>  }
>  
> diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
> index 72b8206..b73aa97 100644
> --- a/src/mesa/vbo/vbo_exec_array.c
> +++ b/src/mesa/vbo/vbo_exec_array.c
> @@ -255,7 +255,7 @@ check_array_data(struct gl_context *ctx, struct gl_client_array *array,
>              GLint k;
>              for (k = 0; k < array->Size; k++) {
>                 if (IS_INF_OR_NAN(f[k]) ||
> -                   f[k] >= 1.0e20 || f[k] <= -1.0e10) {
> +                   f[k] >= 1.0e20F || f[k] <= -1.0e10F) {
>                    printf("Bad array data:\n");
>                    printf("  Element[%u].%u = %f\n", j, k, f[k]);
>                    printf("  Array %u at %p\n", attrib, (void* ) array);
> @@ -263,7 +263,7 @@ check_array_data(struct gl_context *ctx, struct gl_client_array *array,
>  			 array->Type, array->Size, array->Stride);
>                    printf("  Address/offset %p in Buffer Object %u\n",
>  			 array->Ptr, array->BufferObj->Name);
> -                  f[k] = 1.0; /* XXX replace the bad value! */
> +                  f[k] = 1.0F; /* XXX replace the bad value! */
>                 }
>                 /*assert(!IS_INF_OR_NAN(f[k]));*/
>              }




More information about the mesa-dev mailing list