This patch is Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
On 02/03/2015 05:41 PM, Martin Peres wrote: > v2: > - rename mesa_extension-override to extension_override > - improve the comment by telling we disable GL_ARB_gpu_shader5 > - fix the name ARB_GL_gpu_shader5 to GL_ARB_gpu_shader5 (Ilia) > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82897 > Signed-off-by: Martin Peres <martin.pe...@linux.intel.com> > --- > src/mesa/drivers/dri/common/drirc | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/src/mesa/drivers/dri/common/drirc > b/src/mesa/drivers/dri/common/drirc > index cecd6a9..10c60d5 100644 > --- a/src/mesa/drivers/dri/common/drirc > +++ b/src/mesa/drivers/dri/common/drirc > @@ -10,6 +10,12 @@ Application bugs worked around in this file: > Enabling all extensions for Unigine fixes most issues, but the GLSL version > is still 1.10. > > +* Unigine Tropics 1.3 makes use of the "sample" keyword which is reserved > + with GL_ARB_gpu_shader5 which got enabled by force_glsl_extensions_warn. > + Disable this extension using extension_override. > + It also makes use of bitwise manipulation (when adding anistropic > filtering) > + which is illegal in GLSL 1.10. Adding "#version 130" fixes this. > + > * Unigine Heaven 3.0 with ARB_texture_multisample uses a "ivec4 * vec4" > expression, which is illegal in GLSL 1.10. > Adding "#version 130" fixes this. > @@ -41,6 +47,8 @@ TODO: document the other workarounds. > > <application name="Unigine Tropics" executable="Tropics"> > <option name="force_glsl_extensions_warn" value="true" /> > + <option name="extension_override" value="-GL_ARB_gpu_shader5" /> > + <option name="force_glsl_version" value="130" /> > <option name="disable_blend_func_extended" value="true" /> > </application> > > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
