[Mesa-dev] [PATCH 4/8] mesa: use correct return statement for a void function
Emil Velikov
emil.l.velikov at gmail.com
Thu Jan 26 13:18:39 UTC 2017
From: Emil Velikov <emil.velikov at collabora.com>
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 at collabora.com>
---
src/mesa/main/teximage.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index bc3b76a926..2dc657bcc3 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);
--
2.11.0
More information about the mesa-dev
mailing list