diff options
Diffstat (limited to 'src/mesa/main/rastpos.c')
-rw-r--r-- | src/mesa/main/rastpos.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c index fac7dbd070f..5e7ef50b46b 100644 --- a/src/mesa/main/rastpos.c +++ b/src/mesa/main/rastpos.c @@ -129,7 +129,7 @@ shade_rastpos(GLcontext *ctx, const GLfloat normal[3], GLfloat Rcolor[4], GLfloat Rspec[4], - GLuint *Rindex) + GLfloat *Rindex) { GLfloat (*base)[3] = ctx->Light._BaseColor; struct gl_light *light; @@ -274,7 +274,7 @@ shade_rastpos(GLcontext *ctx, if (i > ind[MAT_INDEX_SPECULAR]) { i = ind[MAT_INDEX_SPECULAR]; } - *Rindex = (GLuint) (GLint) i; + *Rindex = i; } } @@ -345,7 +345,7 @@ raster_pos4f(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z, GLfloat w) ctx->Current.Attrib[VERT_ATTRIB_COLOR1]); } else { - ctx->Current.RasterIndex = (GLuint) ctx->Current.Index; + ctx->Current.RasterIndex = ctx->Current.Index; } } @@ -636,7 +636,7 @@ window_pos3f(GLfloat x, GLfloat y, GLfloat z) = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][3], 0.0F, 1.0F); } else { - ctx->Current.RasterIndex = (GLuint) ctx->Current.Index; + ctx->Current.RasterIndex = ctx->Current.Index; } /* raster texcoord = current texcoord */ @@ -872,7 +872,7 @@ void _mesa_init_rastpos( GLcontext * ctx ) ASSIGN_4V( ctx->Current.RasterPos, 0.0, 0.0, 0.0, 1.0 ); ctx->Current.RasterDistance = 0.0; ASSIGN_4V( ctx->Current.RasterColor, 1.0, 1.0, 1.0, 1.0 ); - ctx->Current.RasterIndex = 1; + ctx->Current.RasterIndex = 1.0; for (i=0; i<MAX_TEXTURE_UNITS; i++) ASSIGN_4V( ctx->Current.RasterTexCoords[i], 0.0, 0.0, 0.0, 1.0 ); ctx->Current.RasterPosValid = GL_TRUE; |