fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 02:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: use correct return statement for a void function

Browse source 
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>
This commit is contained in:
Emil Velikov 2017-01-26 13:18:39 +00:00 • committed by Emil Velikov
parent be3b5e015c
commit c1960e23ff
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/mesa/main/teximage.c
View file

@ -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);