From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 6 Mar 2014 09:47:15 +0000 (-0800)
Subject: meta: Use srcWidth/Height/Depth rather than srcImage->Width and such.
X-Git-Tag: upstream/10.3~3208
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=158a7440c37c27783e2968408c74c03858520ec2;p=platform%2Fupstream%2Fmesa.git

meta: Use srcWidth/Height/Depth rather than srcImage->Width and such.

This is equivalent for now, and will differ once we add 1DArray support.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/mesa/drivers/common/meta_generate_mipmap.c b/src/mesa/drivers/common/meta_generate_mipmap.c
index d9535d9..9d352e9 100644
--- a/src/mesa/drivers/common/meta_generate_mipmap.c
+++ b/src/mesa/drivers/common/meta_generate_mipmap.c
@@ -284,9 +284,9 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
       dstHeight = minify(srcHeight, 1);
       dstDepth = target == GL_TEXTURE_3D ? minify(srcDepth, 1) : srcDepth;
 
-      if (dstWidth == srcImage->Width &&
-          dstHeight == srcImage->Height &&
-          dstDepth == srcImage->Depth) {
+      if (dstWidth == srcWidth &&
+          dstHeight == srcHeight &&
+          dstDepth == srcDepth) {
          /* all done */
          break;
       }