diff options
| author | Brian Paul <[email protected]> | 2009-12-21 18:23:53 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-12-21 18:23:53 -0700 |
| commit | b57abd3bea29e95e5dee2524c3f1be4b26017c0f (patch) | |
| tree | 8da85ef6e5ef40a4a7bd328fc574a27c2b8c0849 /progs/tests/packedpixels.c | |
| parent | bf064ce0c31abb036fc035c59fdc1134705a5e3f (diff) | |
| parent | e46ad402f1fecf0fc8d2538eb5abbdde97484799 (diff) | |
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
configure.ac
progs/demos/morph3d.c
progs/demos/textures.c
progs/glsl/shtest.c
progs/glsl/texaaline.c
progs/tests/packedpixels.c
progs/xdemos/corender.c
src/mesa/main/version.h
Diffstat (limited to 'progs/tests/packedpixels.c')
| -rw-r--r-- | progs/tests/packedpixels.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/progs/tests/packedpixels.c b/progs/tests/packedpixels.c index c8884bb79f1..1e70a31151a 100644 --- a/progs/tests/packedpixels.c +++ b/progs/tests/packedpixels.c @@ -274,6 +274,7 @@ Draw(void) glRasterPos2i(8, 6); sprintf(s, "Internal Texture Format [f/F]: %s (%d of %lu)", IntFormats[CurFormat].name, CurFormat + 1, NUM_INT_FORMATS); + IntFormats[CurFormat].name, CurFormat + 1, (unsigned long) NUM_INT_FORMATS); PrintString(s); glPopMatrix(); |