summaryrefslogtreecommitdiff
path: root/src/mesa/shader/prog_execute.c
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-01-27 17:03:04 -0700
committerBrian Paul <brianp@vmware.com>2010-01-27 17:04:30 -0700
commit20fbb24b67dda0679774756e4b6d98c2c66c2c42 (patch)
tree3c6d5bcb88000a59e05ee26472011612be7e8ca1 /src/mesa/shader/prog_execute.c
parent6703fb1917a79889df31777682283556c31e30bd (diff)
mesa: fix double->float assignment warnings, int/uint comparison warnings
Reported by Karl Schultz.
Diffstat (limited to 'src/mesa/shader/prog_execute.c')
-rw-r--r--src/mesa/shader/prog_execute.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/shader/prog_execute.c b/src/mesa/shader/prog_execute.c
index c212790dcd..5641014d2c 100644
--- a/src/mesa/shader/prog_execute.c
+++ b/src/mesa/shader/prog_execute.c
@@ -1017,12 +1017,12 @@ _mesa_execute_program(GLcontext * ctx,
/* XXX we could probably just use pow() here */
if (a[0] > 0.0F) {
if (a[1] == 0.0 && a[3] == 0.0)
- result[2] = 1.0;
+ result[2] = 1.0F;
else
result[2] = (GLfloat) _mesa_pow(a[1], a[3]);
}
else {
- result[2] = 0.0;
+ result[2] = 0.0F;
}
result[3] = 1.0F;
store_vector4(inst, machine, result);