Re: [Mesa-dev] [PATCH] glsl/glcpp: allow undefining __VERSION__ and GL_

2015-08-26 Thread Kenneth Graunke
On Wednesday, August 26, 2015 04:55:32 PM Dave Airlie wrote: > On 26 August 2015 at 16:48, Ilia Mirkin wrote: > > On Wed, Aug 26, 2015 at 2:38 AM, Dave Airlie wrote: > >> From: Dave Airlie > >> > >> GL33-CTS.shaders.preprocessor.definitions.* > >> has 4 tests the undefine these, > >> > >> I can'

Re: [Mesa-dev] [PATCH] glsl/glcpp: allow undefining __VERSION__ and GL_

2015-08-26 Thread Ilia Mirkin
Looks like the change happened as of 4.40. I checked as far back as GLSL 1.50, and it was the older "you can do whatever" wording everywhere there: """ All macro names containing two consecutive underscores ( __ ) are reserved for future use as predefined macro names. All macro names prefixed with

Re: [Mesa-dev] [PATCH] glsl/glcpp: allow undefining __VERSION__ and GL_

2015-08-26 Thread Dave Airlie
On 26 August 2015 at 16:55, Dave Airlie wrote: > On 26 August 2015 at 16:48, Ilia Mirkin wrote: >> On Wed, Aug 26, 2015 at 2:38 AM, Dave Airlie wrote: >>> From: Dave Airlie >>> >>> GL33-CTS.shaders.preprocessor.definitions.* >>> has 4 tests the undefine these, >>> >>> I can't find anything in t

Re: [Mesa-dev] [PATCH] glsl/glcpp: allow undefining __VERSION__ and GL_

2015-08-25 Thread Dave Airlie
On 26 August 2015 at 16:48, Ilia Mirkin wrote: > On Wed, Aug 26, 2015 at 2:38 AM, Dave Airlie wrote: >> From: Dave Airlie >> >> GL33-CTS.shaders.preprocessor.definitions.* >> has 4 tests the undefine these, >> >> I can't find anything in the spec saying that isn't correct. >> >> Signed-off-by: D

Re: [Mesa-dev] [PATCH] glsl/glcpp: allow undefining __VERSION__ and GL_

2015-08-25 Thread Ilia Mirkin
On Wed, Aug 26, 2015 at 2:38 AM, Dave Airlie wrote: > From: Dave Airlie > > GL33-CTS.shaders.preprocessor.definitions.* > has 4 tests the undefine these, > > I can't find anything in the spec saying that isn't correct. > > Signed-off-by: Dave Airlie > --- > src/glsl/glcpp/glcpp-parse.y | 4 +---

[Mesa-dev] [PATCH] glsl/glcpp: allow undefining __VERSION__ and GL_ (v2)

2015-08-25 Thread Dave Airlie
From: Dave Airlie GL33-CTS.shaders.preprocessor.definitions.* has 4 tests the undefine these, It appears GLES doesn't allow this, but desktop GL does, yay specs. Signed-off-by: Dave Airlie --- src/glsl/glcpp/glcpp-parse.y | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --

[Mesa-dev] [PATCH] glsl/glcpp: allow undefining __VERSION__ and GL_

2015-08-25 Thread Dave Airlie
From: Dave Airlie GL33-CTS.shaders.preprocessor.definitions.* has 4 tests the undefine these, I can't find anything in the spec saying that isn't correct. Signed-off-by: Dave Airlie --- src/glsl/glcpp/glcpp-parse.y | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/gls