From 880411c72aee7c0ec81366bdf6ab8cf25bebb9d5 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 27 Jan 2010 17:00:32 -0700 Subject: swrast: silence double->float assignment warnings Reported by Karl Schultz. --- src/mesa/swrast/s_fragprog.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mesa/swrast/s_fragprog.c') diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c index 1c6492cc8f..d31da4c402 100644 --- a/src/mesa/swrast/s_fragprog.c +++ b/src/mesa/swrast/s_fragprog.c @@ -156,8 +156,8 @@ init_machine(GLcontext *ctx, struct gl_program_machine *machine, if (program->OriginUpperLeft) wpos[1] = ctx->DrawBuffer->Height - 1 - wpos[1]; if (!program->PixelCenterInteger) { - wpos[0] += 0.5; - wpos[1] += 0.5; + wpos[0] += 0.5F; + wpos[1] += 0.5F; } /* Setup pointer to input attributes */ @@ -172,7 +172,7 @@ init_machine(GLcontext *ctx, struct gl_program_machine *machine, /* if running a GLSL program (not ARB_fragment_program) */ if (ctx->Shader.CurrentProgram) { /* Store front/back facing value */ - machine->Attribs[FRAG_ATTRIB_FACE][col][0] = 1.0 - span->facing; + machine->Attribs[FRAG_ATTRIB_FACE][col][0] = 1.0F - span->facing; } machine->CurElement = col; -- cgit v1.2.3