progs/perf: reset row_length after subimage test

Also test fewer sizes in teximage generally.

diff --git a/progs/perf/teximage.c b/progs/perf/teximage.c
index 86f0ef873665beafcd35db9ba24d0bf5d81157c8..9e032ad0c9b43f58e51abc93d5772e576a5ed9b9 100644 (file)
--- a/progs/perf/teximage.c
+++ b/progs/perf/teximage.c
@@ -131,6 +131,8 @@ UploadTexSubImage2D(unsigned count)
          glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
          glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
          glPixelStorei(GL_UNPACK_SKIP_ROWS, 0);
+         glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+
       }
       else {
          /* replace whole texture image at once */
@@ -180,7 +182,7 @@ PerfDraw(void)
       for (subImage = 0; subImage < 2; subImage++) {
 
          /* loop over texture sizes */
-         for (TexSize = 16; TexSize <= maxSize; TexSize *= 2) {
+         for (TexSize = 16; TexSize <= maxSize; TexSize *= 4) {
             GLint bytesPerImage;
             double mbPerSec;