diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2014-07-08 20:24:55 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2014-07-18 01:58:58 +0200 |
| commit | 3a86ca54dfcd8a6cff8eaa1dbdaa76ced1073a56 (patch) | |
| tree | b82d5b440868a914283ac672f4d119dd693f6c13 /src/mesa/drivers/dri/common | |
| parent | b0ff18bd3441ce7f28354686934440a92826eaf8 (diff) | |
| download | external_mesa3d-3a86ca54dfcd8a6cff8eaa1dbdaa76ced1073a56.zip external_mesa3d-3a86ca54dfcd8a6cff8eaa1dbdaa76ced1073a56.tar.gz external_mesa3d-3a86ca54dfcd8a6cff8eaa1dbdaa76ced1073a56.tar.bz2 | |
st/mesa,gallium: add a workaround for Unigine Heaven 4.0 and Valley 1.0
Most (all?) Unigine shaders fail to compile without this if sample shading
is advertised. This is, of course, Unigine developers' fault.
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/drivers/dri/common')
| -rw-r--r-- | src/mesa/drivers/dri/common/drirc | 20 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/common/xmlpool/t_options.h | 5 |
2 files changed, 22 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/common/drirc b/src/mesa/drivers/dri/common/drirc index ebc04cd..4b9841b 100644 --- a/src/mesa/drivers/dri/common/drirc +++ b/src/mesa/drivers/dri/common/drirc @@ -11,17 +11,21 @@ Application bugs worked around in this file: is still 1.10. * Unigine Heaven 3.0 with ARB_texture_multisample uses a "ivec4 * vec4" - expression, which fails to compile with GLSL 1.10. + expression, which is illegal in GLSL 1.10. Adding "#version 130" fixes this. * Unigine Heaven 3.0 with ARB_shader_bit_encoding uses the uint keyword, which - fails to compile with GLSL 1.10. + is illegal in GLSL 1.10. Adding "#version 130" fixes this. * Unigine Heaven 3.0 with ARB_shader_bit_encoding uses a "uint & int" - expression, which fails (and should fail) to compile with any GLSL version. + expression, which is illegal in any GLSL version. Disabling ARB_shader_bit_encoding fixes this. +* If ARB_sample_shading is supported, Unigine Heaven 4.0 and Valley 1.0 uses + an #extension directive in the middle of its shaders, which is illegal + in GLSL. + TODO: document the other workarounds. --> @@ -45,6 +49,7 @@ TODO: document the other workarounds. <option name="disable_blend_func_extended" value="true" /> <option name="force_glsl_version" value="130" /> <option name="disable_shader_bit_encoding" value="true" /> + <option name="allow_glsl_extension_directive_midshader" value="true" /> </application> <application name="Unigine Heaven (64-bit)" executable="heaven_x64"> @@ -52,6 +57,15 @@ TODO: document the other workarounds. <option name="disable_blend_func_extended" value="true" /> <option name="force_glsl_version" value="130" /> <option name="disable_shader_bit_encoding" value="true" /> + <option name="allow_glsl_extension_directive_midshader" value="true" /> + </application> + + <application name="Unigine Valley (32-bit)" executable="valley_x86"> + <option name="allow_glsl_extension_directive_midshader" value="true" /> + </application> + + <application name="Unigine Valley (64-bit)" executable="valley_x64"> + <option name="allow_glsl_extension_directive_midshader" value="true" /> </application> <application name="Unigine OilRush (32-bit)" executable="OilRush_x86"> diff --git a/src/mesa/drivers/dri/common/xmlpool/t_options.h b/src/mesa/drivers/dri/common/xmlpool/t_options.h index fc9e104..b73a662 100644 --- a/src/mesa/drivers/dri/common/xmlpool/t_options.h +++ b/src/mesa/drivers/dri/common/xmlpool/t_options.h @@ -105,6 +105,11 @@ DRI_CONF_OPT_BEGIN_V(force_glsl_version, int, def, "0:999") \ DRI_CONF_DESC(en,gettext("Force a default GLSL version for shaders that lack an explicit #version line")) \ DRI_CONF_OPT_END +#define DRI_CONF_ALLOW_GLSL_EXTENSION_DIRECTIVE_MIDSHADER(def) \ +DRI_CONF_OPT_BEGIN_B(allow_glsl_extension_directive_midshader, def) \ + DRI_CONF_DESC(en,gettext("Allow GLSL #extension directives in the middle of shaders")) \ +DRI_CONF_OPT_END + /** |