tnl: fix double->float and int/uint conversion warnings
Reported by Karl Schultz.
This commit is contained in:
@@ -399,7 +399,7 @@ void _tnl_draw_prims( GLcontext *ctx,
|
|||||||
TNLcontext *tnl = TNL_CONTEXT(ctx);
|
TNLcontext *tnl = TNL_CONTEXT(ctx);
|
||||||
const GLuint TEST_SPLIT = 0;
|
const GLuint TEST_SPLIT = 0;
|
||||||
const GLint max = TEST_SPLIT ? 8 : tnl->vb.Size - MAX_CLIPPED_VERTICES;
|
const GLint max = TEST_SPLIT ? 8 : tnl->vb.Size - MAX_CLIPPED_VERTICES;
|
||||||
GLuint max_basevertex = prim->basevertex;
|
GLint max_basevertex = prim->basevertex;
|
||||||
GLuint i;
|
GLuint i;
|
||||||
|
|
||||||
if (!_mesa_check_conditional_render(ctx))
|
if (!_mesa_check_conditional_render(ctx))
|
||||||
|
@@ -64,7 +64,7 @@ run_point_stage(GLcontext *ctx, struct tnl_pipeline_stage *stage)
|
|||||||
for (i = 0; i < VB->Count; i++) {
|
for (i = 0; i < VB->Count; i++) {
|
||||||
const GLfloat dist = FABSF(*eyeCoord);
|
const GLfloat dist = FABSF(*eyeCoord);
|
||||||
const GLfloat q = p0 + dist * (p1 + dist * p2);
|
const GLfloat q = p0 + dist * (p1 + dist * p2);
|
||||||
const GLfloat atten = (q != 0.0) ? SQRTF(1.0 / q) : 1.0;
|
const GLfloat atten = (q != 0.0F) ? SQRTF(1.0F / q) : 1.0F;
|
||||||
size[i][0] = pointSize * atten; /* clamping done in rasterization */
|
size[i][0] = pointSize * atten; /* clamping done in rasterization */
|
||||||
eyeCoord += eyeCoordStride;
|
eyeCoord += eyeCoordStride;
|
||||||
}
|
}
|
||||||
|
@@ -383,7 +383,7 @@ static void adjust_input_ptrs( GLcontext *ctx, GLint diff)
|
|||||||
struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
|
struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
|
||||||
struct tnl_clipspace_attr *a = vtx->attr;
|
struct tnl_clipspace_attr *a = vtx->attr;
|
||||||
const GLuint count = vtx->attr_count;
|
const GLuint count = vtx->attr_count;
|
||||||
int j;
|
GLuint j;
|
||||||
|
|
||||||
diff -= 1;
|
diff -= 1;
|
||||||
for (j=0; j<count; ++j) {
|
for (j=0; j<count; ++j) {
|
||||||
|
Reference in New Issue
Block a user