meta/copy_image: Use the correct texture level when creating views
authorJason Ekstrand <jason.ekstrand@intel.com>
Tue, 2 Sep 2014 21:08:31 +0000 (14:08 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Wed, 3 Sep 2014 19:27:19 +0000 (12:27 -0700)
Previously, we were accidentally assuming that the level of both textures
was 0.  Now we actually use the correct level in our hacked texture view.
This doesn't 100% fix the meta path because the texture type is getting
lost somewhere in the pipeline.  However, it actually copies to/from the
correct layer now.

Signed-off-by: Jason Ekstrand <jason.ekstrand@intel.com>
Cc: "10.3" <mesa-stable@lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82804
Tested-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
src/mesa/drivers/common/meta_copy_image.c

index c40c2f0119076d6a29b686c1c1509dcd49d6f173..0c204b87d656eab362dab1dfaf3df8c6150c59bc 100644 (file)
@@ -74,7 +74,7 @@ make_view(struct gl_context *ctx, struct gl_texture_image *tex_image,
                               tex_image->Depth,
                               0, internal_format, tex_format);
 
-   view_tex_obj->MinLevel = 0;
+   view_tex_obj->MinLevel = tex_image->Level;
    view_tex_obj->NumLevels = 1;
    view_tex_obj->MinLayer = tex_obj->MinLayer;
    view_tex_obj->NumLayers = tex_obj->NumLayers;