diff options
| author | Michal Krol <michal@tungstengraphics.com> | 2007-10-29 16:20:45 +0000 |
|---|---|---|
| committer | Michal Krol <michal@tungstengraphics.com> | 2007-10-29 17:05:38 +0000 |
| commit | ee295fccdd0c94cb6b8af4dfb30283e39f548223 (patch) | |
| tree | fe8f5064ad57c5dc12163efb5a91206b1e068141 /src/mesa/pipe/softpipe/sp_tex_sample.c | |
| parent | d37eb130c090abc413a54e57e0d3800ac4cd59f4 (diff) | |
Make gallium compile in win32.
Use FREE, MALLOC, CALLOC, GETENV wrappers.
Silence compiler warnings.
Add proper copyrights.
Diffstat (limited to 'src/mesa/pipe/softpipe/sp_tex_sample.c')
| -rw-r--r-- | src/mesa/pipe/softpipe/sp_tex_sample.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/pipe/softpipe/sp_tex_sample.c b/src/mesa/pipe/softpipe/sp_tex_sample.c index 385b8042c3..0b91ef0e37 100644 --- a/src/mesa/pipe/softpipe/sp_tex_sample.c +++ b/src/mesa/pipe/softpipe/sp_tex_sample.c @@ -39,7 +39,6 @@ #include "sp_tile_cache.h" #include "pipe/p_context.h" #include "pipe/p_defines.h" -#include "pipe/p_util.h" #include "pipe/tgsi/exec/tgsi_exec.h" @@ -580,7 +579,7 @@ sp_get_samples_2d_common(struct tgsi_sampler *sampler, height = sampler->texture->level[level0].height; } else { - width = height = 1.0; + width = height = 1; } assert(width > 0); @@ -697,7 +696,7 @@ sp_get_samples_3d(struct tgsi_sampler *sampler, depth = sampler->texture->level[level0].depth; } else { - width = height = depth = 1.0; + width = height = depth = 1; } assert(width > 0); |