From: Emil Velikov <emil.velikov@collabora.com>
Date: Thu, 26 Jan 2017 13:18:39 +0000 (+0000)
Subject: mesa: use correct return statement for a void function
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c1960e23ffb10f782cbcd09caabdd573d440c012;p=mesa.git

mesa: use correct return statement for a void function

Using return foo() is incorrect even if foo itself returns void.
Spotted by AppVeyor, as below:

teximage.c(3653) : warning C4098: 'copyteximage' : 'void' function returning a value

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index bc3b76a926d..2dc657bcc34 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -3648,9 +3648,10 @@ copyteximage(struct gl_context *ctx, GLuint dims,
       if (texImage && can_avoid_reallocation(texImage, internalFormat, texFormat,
                                              x, y, width, height, border)) {
          _mesa_unlock_texture(ctx, texObj);
-         return _mesa_copy_texture_sub_image(ctx, dims, texObj, target, level,
-                                             0, 0, 0, x, y, width, height,
-                                             "CopyTexImage");
+         _mesa_copy_texture_sub_image(ctx, dims, texObj, target, level,
+                                      0, 0, 0, x, y, width, height,
+                                      "CopyTexImage");
+         return;
       }
    }
    _mesa_unlock_texture(ctx, texObj);