summaryrefslogtreecommitdiff
path: root/src/mesa/main/get.c
diff options
context:
space:
mode:
authorKarl Schultz <kschultz@freedesktop.org>2001-09-18 16:16:21 +0000
committerKarl Schultz <kschultz@freedesktop.org>2001-09-18 16:16:21 +0000
commit94a6ec8f0c8a25aeeb5880e2285ae6042cfb99db (patch)
tree475772172f59b11a31afdc1871abda7f8ba11d65 /src/mesa/main/get.c
parent57c946096eecbc07b385e4473e04e5a0cafdc12d (diff)
compiler warnings
Diffstat (limited to 'src/mesa/main/get.c')
-rw-r--r--src/mesa/main/get.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 8199ce2b97..f466107fdc 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1,4 +1,4 @@
-/* $Id: get.c,v 1.67 2001/08/28 22:46:22 brianp Exp $ */
+/* $Id: get.c,v 1.68 2001/09/18 16:16:21 kschultz Exp $ */
/*
* Mesa 3-D graphics library
@@ -3398,13 +3398,13 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
*params = (GLfloat) ctx->Const.SubPixelBits;
break;
case GL_TEXTURE_1D:
- *params = _mesa_IsEnabled(GL_TEXTURE_1D) ? 1.0 : 0.0;
+ *params = _mesa_IsEnabled(GL_TEXTURE_1D) ? 1.0F : 0.0F;
break;
case GL_TEXTURE_2D:
- *params = _mesa_IsEnabled(GL_TEXTURE_2D) ? 1.0 : 0.0;
+ *params = _mesa_IsEnabled(GL_TEXTURE_2D) ? 1.0F : 0.0F;
break;
case GL_TEXTURE_3D:
- *params = _mesa_IsEnabled(GL_TEXTURE_3D) ? 1.0 : 0.0;
+ *params = _mesa_IsEnabled(GL_TEXTURE_3D) ? 1.0F : 0.0F;
break;
case GL_TEXTURE_BINDING_1D:
*params = (GLfloat) textureUnit->Current1D->Name;
@@ -3425,16 +3425,16 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
*params = ENUM_TO_FLOAT(textureUnit->EnvMode);
break;
case GL_TEXTURE_GEN_S:
- *params = (textureUnit->TexGenEnabled & S_BIT) ? 1.0 : 0.0;
+ *params = (textureUnit->TexGenEnabled & S_BIT) ? 1.0F : 0.0F;
break;
case GL_TEXTURE_GEN_T:
- *params = (textureUnit->TexGenEnabled & T_BIT) ? 1.0 : 0.0;
+ *params = (textureUnit->TexGenEnabled & T_BIT) ? 1.0F : 0.0F;
break;
case GL_TEXTURE_GEN_R:
- *params = (textureUnit->TexGenEnabled & R_BIT) ? 1.0 : 0.0;
+ *params = (textureUnit->TexGenEnabled & R_BIT) ? 1.0F : 0.0F;
break;
case GL_TEXTURE_GEN_Q:
- *params = (textureUnit->TexGenEnabled & Q_BIT) ? 1.0 : 0.0;
+ *params = (textureUnit->TexGenEnabled & Q_BIT) ? 1.0F : 0.0F;
break;
case GL_TEXTURE_MATRIX:
for (i=0;i<16;i++) {