Re: [Mesa-dev] [PATCH 02/15] glsl: Do not allow undefining the built-in macros

2014-06-23 Thread Carl Worth
Anuj Phogat writes: > Fixes piglit tests in spec/glsl-es-3.00/compile: ... > Cc: For this change, (and other similar changes in the series, as well as subsequent pre-processor changes that I am writing), I'm deciding to generally not pick these over to the stable branch. For one, my series is g

Re: [Mesa-dev] [PATCH 02/15] glsl: Do not allow undefining the built-in macros

2014-06-11 Thread Carl Worth
Anuj Phogat writes: > Following changes in above code will also fix the GL_ES macro case: > - || strcmp("__VERSION__", $3) == 0) > + || strcmp("__VERSION__", $3) == 0 > + || (parser->is_gles && strcmp("GL_ES", $3) == 0)) Great. > Do you want

Re: [Mesa-dev] [PATCH 02/15] glsl: Do not allow undefining the built-in macros

2014-06-11 Thread Anuj Phogat
On Wed, Jun 11, 2014 at 5:32 PM, Carl Worth wrote: > Anuj Phogat writes: >> Fixes piglit tests in spec/glsl-es-3.00/compile: >> undef-__FILE__.vert >> undef-GL_ES.vert >> undef-__LINE__.vert >> undef-__VERSION__.vert > > I see the code that will fix __FILE__, __LINE__, and __VERSION__, but > not

Re: [Mesa-dev] [PATCH 02/15] glsl: Do not allow undefining the built-in macros

2014-06-11 Thread Carl Worth
Anuj Phogat writes: > Fixes piglit tests in spec/glsl-es-3.00/compile: > undef-__FILE__.vert > undef-GL_ES.vert > undef-__LINE__.vert > undef-__VERSION__.vert I see the code that will fix __FILE__, __LINE__, and __VERSION__, but not GL_ES. Should that line be dropped from the commit message? > +

[Mesa-dev] [PATCH 02/15] glsl: Do not allow undefining the built-in macros

2014-06-06 Thread Anuj Phogat
Fixes piglit tests in spec/glsl-es-3.00/compile: undef-__FILE__.vert undef-GL_ES.vert undef-__LINE__.vert undef-__VERSION__.vert Also, fixes Khronos GLES3 CTS tests: undefine_invalid_object_1_vertex undefine_invalid_object_1_fragment undefine_invalid_object_2_vertex undefine_invalid_object_2_fragm