diff options
| author | Brian Paul <brianp@vmware.com> | 2009-12-21 18:35:54 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-12-21 18:35:54 -0700 |
| commit | 9eb7fc6661a1d46c06cec8584b898e3e690af6fa (patch) | |
| tree | 78ed4336c613303ef02691baf4d89e7330a0f6cf /progs/tests/packedpixels.c | |
| parent | ae1c0a06e81b8c6f015a3b64616a5d3a989f9373 (diff) | |
| parent | b57abd3bea29e95e5dee2524c3f1be4b26017c0f (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/mesa/main/version.h
src/mesa/state_tracker/st_atom_shader.c
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 c8884bb79f..1e70a31151 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(); |