diff options
| author | Marek Olšák <[email protected]> | 2019-11-11 17:04:15 -0500 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2019-11-11 19:23:37 -0500 |
| commit | e00791c5525000652472cdcfe55d59f43ec3d85e (patch) | |
| tree | be1b30ea9ea57e3c9f926cc78d12fe45d363fc0c /src/gallium | |
| parent | 34f32a6d6648073e2fda3fb78377124fb32bb288 (diff) | |
st/mesa: fix Sanctuary and Tropics by disabling ARB_gpu_shader5 for them
They use the "sample" keyword as a variable name.
Cc: 19.2 19.3 <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/auxiliary/pipe-loader/driinfo_gallium.h | 1 | ||||
| -rw-r--r-- | src/gallium/include/state_tracker/st_api.h | 1 | ||||
| -rw-r--r-- | src/gallium/state_trackers/dri/dri_screen.c | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h b/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h index fee8fca6420..69967d916f2 100644 --- a/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h +++ b/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h @@ -20,6 +20,7 @@ DRI_CONF_SECTION_DEBUG DRI_CONF_FORCE_GLSL_EXTENSIONS_WARN("false") DRI_CONF_DISABLE_GLSL_LINE_CONTINUATIONS("false") DRI_CONF_DISABLE_BLEND_FUNC_EXTENDED("false") + DRI_CONF_DISABLE_ARB_GPU_SHADER5("false") DRI_CONF_FORCE_GLSL_VERSION(0) DRI_CONF_ALLOW_GLSL_EXTENSION_DIRECTIVE_MIDSHADER("false") DRI_CONF_ALLOW_GLSL_BUILTIN_CONST_EXPRESSION("false") diff --git a/src/gallium/include/state_tracker/st_api.h b/src/gallium/include/state_tracker/st_api.h index 516408c77c7..297954d70bf 100644 --- a/src/gallium/include/state_tracker/st_api.h +++ b/src/gallium/include/state_tracker/st_api.h @@ -219,6 +219,7 @@ struct st_config_options { bool disable_blend_func_extended; bool disable_glsl_line_continuations; + bool disable_arb_gpu_shader5; bool force_glsl_extensions_warn; unsigned force_glsl_version; bool allow_glsl_extension_directive_midshader; diff --git a/src/gallium/state_trackers/dri/dri_screen.c b/src/gallium/state_trackers/dri/dri_screen.c index 7898b088fc8..8e4d5ca52df 100644 --- a/src/gallium/state_trackers/dri/dri_screen.c +++ b/src/gallium/state_trackers/dri/dri_screen.c @@ -65,6 +65,8 @@ dri_fill_st_options(struct dri_screen *screen) options->disable_blend_func_extended = driQueryOptionb(optionCache, "disable_blend_func_extended"); + options->disable_arb_gpu_shader5 = + driQueryOptionb(optionCache, "disable_arb_gpu_shader5"); options->disable_glsl_line_continuations = driQueryOptionb(optionCache, "disable_glsl_line_continuations"); options->force_glsl_extensions_warn = |