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

Kenneth Graunke kwg at kemper.freedesktop.org
Sat Mar 8 06:45:34 UTC 2014


Module: Mesa
Branch: master
Commit: 158a7440c37c27783e2968408c74c03858520ec2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=158a7440c37c27783e2968408c74c03858520ec2

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Thu Mar  6 01:47:15 2014 -0800

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 at whitecape.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/mesa/drivers/common/meta_generate_mipmap.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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;
       }




More information about the mesa-commit mailing list