summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2017-01-26 13:18:39 +0000
committerEmil Velikov <[email protected]>2017-01-27 17:56:56 +0000
commitc1960e23ffb10f782cbcd09caabdd573d440c012 (patch)
treebca3667cd6515845520194b754ac7b3623474c64
parentbe3b5e015c5cdbe28ab366b18f35a49690960353 (diff)
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 <[email protected]> Reviewed-by: Nicolai Hähnle <[email protected]>
-rw-r--r--src/mesa/main/teximage.c7
1 files changed, 4 insertions, 3 deletions
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);