diff options
| author | Brian Paul <[email protected]> | 2013-01-26 10:58:37 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2013-01-29 08:59:53 -0700 |
| commit | 89551ae04f4cf994c0f7f2ac3aef7e1c57936a29 (patch) | |
| tree | d3ed59fba963923d1f8e8733b07da1f119669409 | |
| parent | d60da27273d2cdb68bc32cae2ca66718dab15f27 (diff) | |
xlib: use _mesa_generate_mipmap() for mipmap generation, not meta
The swrast fragment program interpreter has trouble computing the
right texture LOD because it doesn't have easy access to input
derivatives. This causes the GLSL-based meta generate mipmap code
to fetch texels from the wrong mipmap level.
One possible fix would be to set the GL_TEXTURE_MIN/MAX_LOD parameters
to limit sampling from the right level. But let's just use the
_mesa_generate_mipmap() fallback since it's a lot faster than using
the fragment shader interpreter.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=54240
Note: This is a candidate for the 9.0 branch.
Reviewed-by: José Fonseca <[email protected]>
| -rw-r--r-- | src/mesa/drivers/x11/xm_dd.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c index cdf06aa347c..cfbdeb5a827 100644 --- a/src/mesa/drivers/x11/xm_dd.c +++ b/src/mesa/drivers/x11/xm_dd.c @@ -34,6 +34,7 @@ #include "main/colormac.h" #include "main/fbobject.h" #include "main/macros.h" +#include "main/mipmap.h" #include "main/image.h" #include "main/imports.h" #include "main/mtypes.h" @@ -869,6 +870,8 @@ xmesa_init_driver_functions( XMesaVisual xmvisual, driver->MapRenderbuffer = xmesa_MapRenderbuffer; driver->UnmapRenderbuffer = xmesa_UnmapRenderbuffer; + driver->GenerateMipmap = _mesa_generate_mipmap; + #if ENABLE_EXT_timer_query driver->NewQueryObject = xmesa_new_query_object; driver->BeginQuery = xmesa_begin_query; |