summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2009-09-22 11:58:09 +0100
committerKeith Whitwell <[email protected]>2009-09-22 11:58:09 +0100
commit89f2799daca94ffb46d7b305df92d0c1876ad83d (patch)
tree08853141f80fd65e2fd47b79457d6ede52f06428
parentbf014d03fe56394c8fd11862fe60c92464ae5b8b (diff)
progs/perf: reset row_length after subimage test
Also test fewer sizes in teximage generally.
-rw-r--r--progs/perf/teximage.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/progs/perf/teximage.c b/progs/perf/teximage.c
index 86f0ef87366..9e032ad0c9b 100644
--- 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;