[Mesa-stable] [Mesa-dev] [PATCH] glsl: Disallow return with a void argument from void functions.

[Carl Worth]

Carl Worth <cworth at cworth.org> writes:
> From: Matt Turner <mattst88 at gmail.com>
>
> Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
> (cherry picked from commit fcaa48d9cc8937e0ceb59dfd22ef5b6e6fd1a273)
>
> Conflicts (resolved by Carl Worth <cworth at cworth.org>):
> 	src/glsl/ast_to_hir.cpp

[Oops. I meant to pass the --compose option to "git send-email" to add a
bit of explanation before sending this patch out. Adding that
explanation here as a reply instead.]

Hi Matt,

Here's a version of your patch as I updated it to apply to the stable
branch.

It didn't cherry-pick cleanly in the first place since master has since
added code based on ARB_shading_language_420pack to coerce some return
types.

The stable branch doesn't add that code, so the context got confused
when applying this patch. Below is my resolution of the conflict.

My reading is that even without support for shading_language_420pack on
the stable branch, adding this additional error case makes sense,
(though perhaps the comment here, which references 420pack looks a
little out of place, but I'm not concerned about that.)

Please review what I did here, and let me know if you approve or if
something different should be done, (cherry-picking additional dependent
patches or dropping this from stable or other).

-Carl
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/mesa-stable/attachments/20130712/d97790a7/attachment.pgp>