diff options
| author | Brian <brian@nostromo.localnet.net> | 2007-01-23 16:37:51 -0700 |
|---|---|---|
| committer | Brian <brian@nostromo.localnet.net> | 2007-01-23 16:37:51 -0700 |
| commit | 223d7cb3c785ad58c869a3ee0fbf2f1d42c3310d (patch) | |
| tree | 85ae41eea6ed9b915e14603fc19ce2ef53765bb8 /src/mesa/swrast | |
| parent | bc5d480e2ca83855a343f1ad979e05f0ee59d2fb (diff) | |
fix g++ warnings/errors
Diffstat (limited to 'src/mesa/swrast')
| -rw-r--r-- | src/mesa/swrast/s_fragprog.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c index 813345f4cd..ed82460669 100644 --- a/src/mesa/swrast/s_fragprog.c +++ b/src/mesa/swrast/s_fragprog.c @@ -200,8 +200,7 @@ fetch_vector4( GLcontext *ctx, const GLfloat *src = get_register_pointer(ctx, source, machine, program); ASSERT(src); - if (source->Swizzle == MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, - SWIZZLE_Z, SWIZZLE_W)) { + if (source->Swizzle == SWIZZLE_NOOP) { /* no swizzling */ COPY_4V(result, src); } @@ -1263,8 +1262,8 @@ execute_program( GLcontext *ctx, { GLfloat a[4], result[4]; fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a ); - result[0] = (GLfloat)_mesa_cos(a[0]); - result[1] = (GLfloat)_mesa_sin(a[0]); + result[0] = (GLfloat) _mesa_cos(a[0]); + result[1] = (GLfloat) _mesa_sin(a[0]); result[2] = 0.0; /* undefined! */ result[3] = 0.0; /* undefined! */ store_vector4( inst, machine, result ); |