Merge branch 'master' into drm-gem

[mesa.git] / src / mesa / drivers / dri / intel / intel_tex_subimage.c

diff --git a/src/mesa/drivers/dri/intel/intel_tex_subimage.c b/src/mesa/drivers/dri/intel/intel_tex_subimage.c
index 688e3870df7e2d215af8207a6294659a841b9b47..5428a1d06890281d9c7847ed612e3ffad49949f8 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_tex_subimage.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_subimage.c
@@ -29,6 +29,7 @@
 #include "mtypes.h"
 #include "texobj.h"
 #include "texstore.h"
+#include "texcompress.h"
 #include "enums.h"
 
 #include "intel_context.h"
@@ -102,9 +103,7 @@ intelTexSubimage(GLcontext * ctx,
 
    /* GL_SGIS_generate_mipmap */
    if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
-      intel_generate_mipmap(ctx, target,
-                            &ctx->Texture.Unit[ctx->Texture.CurrentUnit],
-                            texObj);
+      intel_generate_mipmap(ctx, target, texObj);
    }
 
    _mesa_unmap_teximage_pbo(ctx, packing);