Assorted casts to silence g++ warnings.

[mesa.git] / src / mesa / main / nvvertexec.c

diff --git a/src/mesa/main/nvvertexec.c b/src/mesa/main/nvvertexec.c
index 73d5440c79aa85f54abfe1ac90681bef6bf9071f..580d04abca599a1c233eec0484a4320718ce6521 100644 (file)
--- a/src/mesa/main/nvvertexec.c
+++ b/src/mesa/main/nvvertexec.c
@@ -35,6 +35,7 @@
 #include "mtypes.h"
 #include "nvvertexec.h"
 #include "nvvertprog.h"
+#include "program.h"
 #include "math/m_matrix.h"
 
 
@@ -689,7 +690,7 @@ _mesa_exec_vertex_program(GLcontext *ctx, const struct vertex_program *program)
             {
                GLfloat t[4];
                fetch_vector1( &inst->SrcReg[0], state, t );
-               t[0] = t[1] = t[2] = t[3] = _mesa_pow(2.0, t[0]);
+               t[0] = t[1] = t[2] = t[3] = (GLfloat)_mesa_pow(2.0, t[0]);
                store_vector4( &inst->DstReg, state, t );
             }
             break;
@@ -706,7 +707,7 @@ _mesa_exec_vertex_program(GLcontext *ctx, const struct vertex_program *program)
                GLfloat t[4], u[4];
                fetch_vector1( &inst->SrcReg[0], state, t );
                fetch_vector1( &inst->SrcReg[1], state, u );
-               t[0] = t[1] = t[2] = t[3] = _mesa_pow(t[0], u[0]);
+               t[0] = t[1] = t[2] = t[3] = (GLfloat)_mesa_pow(t[0], u[0]);
                store_vector4( &inst->DstReg, state, t );
             }
             break;