diff options
| author | Brian <brian@yutani.localnet.net> | 2007-02-22 08:53:33 -0700 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2007-02-22 08:53:33 -0700 |
| commit | 29c471aafc6a3fef23d553e31a555d1782854a77 (patch) | |
| tree | 335385fd55d510118346136c6feb4daa707988b6 /progs/demos | |
| parent | 6d4cf6be4e79c3a6ab18272577df17389e3834a6 (diff) | |
| parent | a4b344baa2484c65a1618f3cce3a94c91dea8ef7 (diff) | |
Merge branch 'origin' into glsl-compiler-1
Conflicts:
src/mesa/main/state.c
src/mesa/shader/program.c
src/mesa/shader/program.h
src/mesa/shader/programopt.c
src/mesa/shader/slang/slang_execute.c
src/mesa/sources
src/mesa/swrast/s_arbshader.c
src/mesa/swrast/s_context.c
src/mesa/swrast/s_span.c
src/mesa/swrast/s_zoom.c
src/mesa/tnl/t_context.c
src/mesa/tnl/t_save_api.c
src/mesa/tnl/t_vb_arbprogram.c
src/mesa/tnl/t_vp_build.c
src/mesa/tnl/t_vtx_eval.c
Diffstat (limited to 'progs/demos')
| -rw-r--r-- | progs/demos/texdown.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/progs/demos/texdown.c b/progs/demos/texdown.c index fc98fddb31..5fecd9a148 100644 --- a/progs/demos/texdown.c +++ b/progs/demos/texdown.c @@ -149,7 +149,7 @@ TypeStr(GLenum type) */ #define ALIGN (1<<12) -static unsigned align(unsigned value, unsigned a) +static unsigned long align(unsigned long value, unsigned long a) { return (value + a - 1) & ~(a-1); } @@ -186,10 +186,10 @@ MeasureDownloadRate(void) printf("alloc %p %p\n", orig_texImage, orig_getImage); - texImage = (GLubyte *)align((unsigned)orig_texImage, ALIGN); - getImage = (GLubyte *)align((unsigned)orig_getImage, ALIGN); + texImage = (GLubyte *)align((unsigned long)orig_texImage, ALIGN); + getImage = (GLubyte *)align((unsigned long)orig_getImage, ALIGN); - for (i = 1; !(((unsigned)texImage) & i); i<<=1) + for (i = 1; !(((unsigned long)texImage) & i); i<<=1) ; printf("texture image alignment: %d bytes (%p)\n", i, texImage); |