diff options
| author | Keith Whitwell <[email protected]> | 2010-03-13 15:06:35 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2010-03-13 15:06:35 +0000 |
| commit | 47bfbd452c93e6a8db013fb90d9f42210cf24889 (patch) | |
| tree | e3cebba97261f567f461769d891aa77707b57bd7 /src/mesa/drivers/dri/r128/r128_tex.c | |
| parent | faa14818856e1e9a4ee624c2bc04d7aecabd07ab (diff) | |
| parent | a80e33f40731f07e8a39896bfdcd1b1504aedc1f (diff) | |
Merge commit 'origin/master' into gallium-sampler-view
Conflicts:
src/gallium/auxiliary/util/u_tile.c
src/gallium/auxiliary/util/u_tile.h
src/gallium/drivers/identity/id_context.c
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/llvmpipe/lp_setup.h
src/gallium/drivers/softpipe/sp_tex_tile_cache.c
src/gallium/include/pipe/p_context.h
src/mesa/state_tracker/st_cb_bitmap.c
src/mesa/state_tracker/st_cb_drawpixels.c
Diffstat (limited to 'src/mesa/drivers/dri/r128/r128_tex.c')
| -rw-r--r-- | src/mesa/drivers/dri/r128/r128_tex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r128/r128_tex.c b/src/mesa/drivers/dri/r128/r128_tex.c index 24fbf8f5194..4ec4be9a47b 100644 --- a/src/mesa/drivers/dri/r128/r128_tex.c +++ b/src/mesa/drivers/dri/r128/r128_tex.c @@ -468,7 +468,7 @@ static void r128TexEnv( GLcontext *ctx, GLenum target, * certain point. It is better than completely ignoring the LOD * bias. Unfortunately there isn't much range in the bias, the * spec mentions strides that vary between 0.5 and 2.0 but these - * numbers don't seem to relate the the GL LOD bias value at all. + * numbers don't seem to relate to the GL LOD bias value at all. */ if ( param[0] >= 1.0 ) { bias = -128; |