diff options
| author | Marek Olšák <[email protected]> | 2014-07-08 20:24:55 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2014-07-18 01:58:58 +0200 |
| commit | 3a86ca54dfcd8a6cff8eaa1dbdaa76ced1073a56 (patch) | |
| tree | b82d5b440868a914283ac672f4d119dd693f6c13 /src/gallium | |
| parent | b0ff18bd3441ce7f28354686934440a92826eaf8 (diff) | |
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 <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/include/state_tracker/st_api.h | 1 | ||||
| -rw-r--r-- | src/gallium/state_trackers/dri/dri_context.c | 2 | ||||
| -rw-r--r-- | src/gallium/state_trackers/dri/dri_screen.c | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/include/state_tracker/st_api.h b/src/gallium/include/state_tracker/st_api.h index 9dcb76fadec..46f0436c043 100644 --- a/src/gallium/include/state_tracker/st_api.h +++ b/src/gallium/include/state_tracker/st_api.h @@ -245,6 +245,7 @@ struct st_config_options boolean force_glsl_extensions_warn; unsigned force_glsl_version; boolean force_s3tc_enable; + boolean allow_glsl_extension_directive_midshader; }; /** diff --git a/src/gallium/state_trackers/dri/dri_context.c b/src/gallium/state_trackers/dri/dri_context.c index f6979a7c2d0..827f847ea07 100644 --- a/src/gallium/state_trackers/dri/dri_context.c +++ b/src/gallium/state_trackers/dri/dri_context.c @@ -55,6 +55,8 @@ dri_fill_st_options(struct st_config_options *options, driQueryOptioni(optionCache, "force_glsl_version"); options->force_s3tc_enable = driQueryOptionb(optionCache, "force_s3tc_enable"); + options->allow_glsl_extension_directive_midshader = + driQueryOptionb(optionCache, "allow_glsl_extension_directive_midshader"); } GLboolean diff --git a/src/gallium/state_trackers/dri/dri_screen.c b/src/gallium/state_trackers/dri/dri_screen.c index 650dcb7b49a..b639f9ffd8b 100644 --- a/src/gallium/state_trackers/dri/dri_screen.c +++ b/src/gallium/state_trackers/dri/dri_screen.c @@ -69,6 +69,7 @@ const __DRIconfigOptionsExtension gallium_config_options = { DRI_CONF_DISABLE_BLEND_FUNC_EXTENDED("false") DRI_CONF_DISABLE_SHADER_BIT_ENCODING("false") DRI_CONF_FORCE_GLSL_VERSION(0) + DRI_CONF_ALLOW_GLSL_EXTENSION_DIRECTIVE_MIDSHADER("false") DRI_CONF_SECTION_END DRI_CONF_SECTION_MISCELLANEOUS |