Re: [Mesa-dev] [PATCH] glsl: allow ForceGLSLVersion to override #version directives

2015-04-26 Thread Marek Olšák
I thought Heaven only used 3.2 Core. Weird. Marek On Sun, Apr 26, 2015 at 10:57 PM, Ilia Mirkin wrote: > With force_glsl_version=150, I get: > > heaven_x64: main/ff_fragment_shader.cpp:532: ir_rvalue* > get_gl_Color(texenv_fragment_program*): Assertion `var' failed. > > Might be because it'll en

Re: [Mesa-dev] [PATCH] glsl: allow ForceGLSLVersion to override #version directives

2015-04-26 Thread Ilia Mirkin
With force_glsl_version=150, I get: heaven_x64: main/ff_fragment_shader.cpp:532: ir_rvalue* get_gl_Color(texenv_fragment_program*): Assertion `var' failed. Might be because it'll end up affecting compat context as well? On Sun, Apr 26, 2015 at 4:48 PM, Marek Olšák wrote: > There are comments at

Re: [Mesa-dev] [PATCH] glsl: allow ForceGLSLVersion to override #version directives

2015-04-26 Thread Marek Olšák
There are comments at the beginning of the file explaining some of the workarounds. I think some of them predate Heaven 4.0 and might not be needed for 4.0. How about setting version 150? Marek On Sun, Apr 26, 2015 at 9:38 PM, Ilia Mirkin wrote: > Brian, Marek, > > We now have a new fun situa

Re: [Mesa-dev] [PATCH] glsl: allow ForceGLSLVersion to override #version directives

2015-04-26 Thread Ilia Mirkin
Brian, Marek, We now have a new fun situation relating to this, perhaps you have thoughts on how to resolve this. Unigine Heaven 4.0 has, in the drirc, has However some shaders in Heaven have #version 150 (the ones that do tess, at least), which in turn causes issues with the new se

Re: [Mesa-dev] [PATCH] glsl: allow ForceGLSLVersion to override #version directives

2015-03-27 Thread Ilia Mirkin
On Fri, Mar 27, 2015 at 3:00 PM, Brian Paul wrote: > On 03/27/2015 12:49 PM, Ilia Mirkin wrote: >> >> On Fri, Mar 27, 2015 at 2:44 PM, Brian Paul wrote: >>> >>> >>> The Geeks3d GpuTest GiMark test for Windows has several shaders with >>> #version 330 that don't actually use any 3.30 features. Ot

Re: [Mesa-dev] [PATCH] glsl: allow ForceGLSLVersion to override #version directives

2015-03-27 Thread Brian Paul
On 03/27/2015 12:49 PM, Ilia Mirkin wrote: On Fri, Mar 27, 2015 at 2:44 PM, Brian Paul wrote: The Geeks3d GpuTest GiMark test for Windows has several shaders with #version 330 that don't actually use any 3.30 features. Other shaders in the test use #version 130. Furthermore, when a context i

Re: [Mesa-dev] [PATCH] glsl: allow ForceGLSLVersion to override #version directives

2015-03-27 Thread Ilia Mirkin
On Fri, Mar 27, 2015 at 2:44 PM, Brian Paul wrote: > > The Geeks3d GpuTest GiMark test for Windows has several shaders with > #version 330 that don't actually use any 3.30 features. Other shaders in > the test use #version 130. Furthermore, when a context is created, only a > 3.0 context is requ

Re: [Mesa-dev] [PATCH] glsl: allow ForceGLSLVersion to override #version directives

2015-03-27 Thread Brian Paul
The Geeks3d GpuTest GiMark test for Windows has several shaders with #version 330 that don't actually use any 3.30 features. Other shaders in the test use #version 130. Furthermore, when a context is created, only a 3.0 context is requested. We don't support GL 3.0 w/ 3.30 shaders but if I

Re: [Mesa-dev] [PATCH] glsl: allow ForceGLSLVersion to override #version directives

2015-03-27 Thread Ilia Mirkin
What's the use-case for applying a different version to a shader with an explicit #version? On Fri, Mar 27, 2015 at 2:13 PM, Brian Paul wrote: > Previously, the ctx->Const.ForceGLSLVersion setting only worked if > the shader lacked a #version directive. Now, the ForceGLSLVersion > setting will o

[Mesa-dev] [PATCH] glsl: allow ForceGLSLVersion to override #version directives

2015-03-27 Thread Brian Paul
Previously, the ctx->Const.ForceGLSLVersion setting only worked if the shader lacked a #version directive. Now, the ForceGLSLVersion setting will override the #version directive too. This change should be safe since it should be rare to have an app that has a mix of shader versions and we only wa