diff options
| author | Michal Krol <michal@vmware.com> | 2009-09-17 12:44:24 +0200 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2009-09-17 12:44:24 +0200 |
| commit | 2a661c383fee65bc4413541e706925fa3e9b9cf5 (patch) | |
| tree | dbea0c9d65d17b81720fe2f161604dfc91eb0546 /src/mesa/drivers/dri/unichrome | |
| parent | 90daefd1c474a6e0502df5053b581987c12b8673 (diff) | |
| parent | 21caa29fbd332a2ee05a58df91e1664fbbc4e61f (diff) | |
Merge commit 'origin/master' into glsl-pp-rework-2
Conflicts:
src/gallium/winsys/gdi/SConscript
Diffstat (limited to 'src/mesa/drivers/dri/unichrome')
| -rw-r--r-- | src/mesa/drivers/dri/unichrome/via_tex.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/unichrome/via_tex.c b/src/mesa/drivers/dri/unichrome/via_tex.c index d2010f0907..54073e7691 100644 --- a/src/mesa/drivers/dri/unichrome/via_tex.c +++ b/src/mesa/drivers/dri/unichrome/via_tex.c @@ -818,11 +818,6 @@ static void viaTexImage(GLcontext *ctx, } } - /* GL_SGIS_generate_mipmap */ - if (level == texObj->BaseLevel && texObj->GenerateMipmap) { - _mesa_generate_mipmap(ctx, target, texObj); - } - _mesa_unmap_teximage_pbo(ctx, packing); } |