diff options
| author | Karl Schultz <kschultz@freedesktop.org> | 2003-08-30 14:45:04 +0000 |
|---|---|---|
| committer | Karl Schultz <kschultz@freedesktop.org> | 2003-08-30 14:45:04 +0000 |
| commit | dc24230de7f913969b52dee3579bb8fa3d50a8c0 (patch) | |
| tree | 721e30477f9c529d562fa4bd2b71e465b4ed7fd0 /src/mesa/main/arbvertparse.c | |
| parent | d12a871b21adee531661f4cf6561d2ffda685359 (diff) | |
Silence compiler warnings about implicit casts or conversions by supplying explicit casts and/or tweaking constant and variable definitions.
Diffstat (limited to 'src/mesa/main/arbvertparse.c')
| -rw-r--r-- | src/mesa/main/arbvertparse.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/arbvertparse.c b/src/mesa/main/arbvertparse.c index 6706f55b39..7492269231 100644 --- a/src/mesa/main/arbvertparse.c +++ b/src/mesa/main/arbvertparse.c @@ -5528,7 +5528,7 @@ parse_tree_fold_bindings(parse_state * s, parse_tree_node * ptn) eat_children = 0; bind_row = 0; bind_nrows = 1; - bind_vals[0] = bind_vals[1] = bind_vals[2] = bind_vals[3]; + bind_vals[0] = bind_vals[1] = bind_vals[2] = bind_vals[3] = 0.0f; switch (ptn->prod_applied) { /* vertex */ case 121: @@ -6123,7 +6123,7 @@ parse_tree_fold_bindings(parse_state * s, parse_tree_node * ptn) #define FOLD_FLOAT_CONSTANT(float_ptr, bind_vals_idx, sign) \ if (float_ptr->tok == 49) /* GLfloat */ {\ - bind_vals[bind_vals_idx] = sign * s->floats.data[float_ptr->tok_attr];\ + bind_vals[bind_vals_idx] = sign * (GLfloat) s->floats.data[float_ptr->tok_attr];\ }\ else /* GLint */ {\ bind_vals[bind_vals_idx] = sign * s->ints.data[float_ptr->tok_attr];\ @@ -6131,9 +6131,9 @@ parse_tree_fold_bindings(parse_state * s, parse_tree_node * ptn) #define FOLD_SIGNED_FLOAT_CONSTANT(sf_ptr, bind_vals_idx) \ {\ - GLfloat __mul = 1.;\ + GLfloat __mul = 1.0F;\ if (sf_ptr->children[0]->prod_applied == 282) \ - __mul = -1.;\ + __mul = -1.0F;\ FOLD_FLOAT_CONSTANT(sf_ptr->children[1], bind_vals_idx, __mul);\ } |