mesa: added a cast to avoid int overflow, plus rename texels->pixels

diff --git a/progs/tests/fillrate.c b/progs/tests/fillrate.c
index dd25de2360fb70745bc245aad7ad5770a59a52f4..8fe636c364be9ce9ec68f4387369c99bbc717887 100644 (file)
--- a/progs/tests/fillrate.c
+++ b/progs/tests/fillrate.c
@@ -61,7 +61,7 @@ RunTest(GLenum shading, GLuint numTextures, GLenum texFilter)
 {
    const GLdouble minPeriod = 2.0;
    GLdouble t0, t1;
-   GLdouble texels, rate;
+   GLdouble pixels, rate;
    GLint i, iters;
 
    glActiveTexture(GL_TEXTURE0);
@@ -104,9 +104,9 @@ RunTest(GLenum shading, GLuint numTextures, GLenum texFilter)
 
    glutSwapBuffers();
 
-   texels = iters * (Width - 10) * (Height - 10);
-   rate = texels / (t1 - t0);
-   rate /= 1000000.0;  /* megatexels/second */
+   pixels = (double) iters * (Width - 10) * (Height - 10);
+   rate = pixels / (t1 - t0);
+   rate /= 1000000.0;  /* megapixels/second */
 
    printf("%s ", shading == GL_FLAT ? "GL_FLAT" : "GL_SMOOTH");
    printf("Textures=%u ", numTextures);