From: Brian <brian.paul@tungstengraphics.com>
Date: Tue, 1 Apr 2008 22:20:29 +0000 (-0600)
Subject: mesa: added a cast to avoid int overflow, plus rename texels->pixels
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7f40115a52ce8f9b5883bd9241707b9e603db0e3;p=mesa.git

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 dd25de2360f..8fe636c364b 100644
--- 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);