-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 01/27/2014 03:34 PM, Carl Worth wrote: > Matt Turner <matts...@gmail.com> writes: >> The check was in the wrong place, such that if a shader >> incorrectly put a preprocessor token before the #version >> declaration, the version would be resolved twice, leading to a >> segmentation fault when attempting to redefine the __VERSION__ >> macro. > > This fix looks good. And the renamed does help, so thanks! > > While you're at it, you might fix the typo in the comment above > that function: > > /* GLSL version is no version is explicitly specified. */ #define > IMPLICIT_GLSL_VERSION 110 > > (The first "is" should be "if").
That's in patch #2. :) > And the fact that this segmentation-fault has been there with a > late #version suggestions that we haven't had any piglit test for > this case. Presumably we should emit a warning that the late > #version is being ignored? > > Regardless, > > Reviewed-by: Carl Worth <cwo...@cworth.org> > > -Carl _______________________________________________ mesa-dev > mailing list mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iEYEARECAAYFAlLm6S8ACgkQX1gOwKyEAw+jGQCfQdNXo9XKURHbjXLGOIiyTzOk V6wAn08O+q4XtrY2gURT3EyVSL9m0GhZ =P2gX -----END PGP SIGNATURE----- _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev