diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-06-25 04:05:11 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-06-25 04:05:11 +1000 |
| commit | b40ed6a0b54d1ba74799aeb3f529c4d298625aa1 (patch) | |
| tree | da1ae04dcd8c1db1294f3caab9ba28760ccb3f8e /src/mesa/state_tracker/st_atom_sampler.c | |
| parent | 95fe122f67024f55d555e2816a95409a8b53a49e (diff) | |
| parent | 0561a293b6596641c0200df7e6580599ecb8b111 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/state_tracker/st_atom_sampler.c')
| -rw-r--r-- | src/mesa/state_tracker/st_atom_sampler.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c index 9abd0b3531..1e182eef1c 100644 --- a/src/mesa/state_tracker/st_atom_sampler.c +++ b/src/mesa/state_tracker/st_atom_sampler.c @@ -67,7 +67,7 @@ gl_wrap_to_sp(GLenum wrap) case GL_MIRROR_CLAMP_TO_BORDER_EXT: return PIPE_TEX_WRAP_MIRROR_CLAMP_TO_BORDER; default: - abort(); + assert(0); return 0; } } |