diff options
| author | Vadim Girlin <[email protected]> | 2013-04-19 01:04:51 +0400 |
|---|---|---|
| committer | Vadim Girlin <[email protected]> | 2013-04-19 01:05:03 +0400 |
| commit | f732036f12d67a96f546c11236fa635b3eda6e9c (patch) | |
| tree | 42c7cfbc1f9d5902b9650b418aa25bae6e97cfdd /src/gallium/state_trackers | |
| parent | b72ff373fb105fbf75603369afe4897b4de06892 (diff) | |
gallium: handle drirc disable_glsl_line_continuations option
NOTE: This is a candidate for the 9.1 branch
Signed-off-by: Vadim Girlin <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Reviewed-by: Alex Deucher <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers')
| -rw-r--r-- | src/gallium/state_trackers/dri/common/dri_context.c | 2 | ||||
| -rw-r--r-- | src/gallium/state_trackers/dri/common/dri_screen.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/dri/common/dri_context.c b/src/gallium/state_trackers/dri/common/dri_context.c index 49cd794c661..58a710d0d14 100644 --- a/src/gallium/state_trackers/dri/common/dri_context.c +++ b/src/gallium/state_trackers/dri/common/dri_context.c @@ -54,6 +54,8 @@ static void dri_fill_st_options(struct st_config_options *options, { options->force_glsl_extensions_warn = driQueryOptionb(optionCache, "force_glsl_extensions_warn"); + options->disable_glsl_line_continuations = + driQueryOptionb(optionCache, "disable_glsl_line_continuations"); } GLboolean diff --git a/src/gallium/state_trackers/dri/common/dri_screen.c b/src/gallium/state_trackers/dri/common/dri_screen.c index 2f525a24c3c..fd2971c29a0 100644 --- a/src/gallium/state_trackers/dri/common/dri_screen.c +++ b/src/gallium/state_trackers/dri/common/dri_screen.c @@ -66,6 +66,7 @@ PUBLIC const char __driConfigOptions[] = DRI_CONF_SECTION_DEBUG DRI_CONF_FORCE_GLSL_EXTENSIONS_WARN(false) + DRI_CONF_DISABLE_GLSL_LINE_CONTINUATIONS(false) DRI_CONF_SECTION_END DRI_CONF_SECTION_MISCELLANEOUS @@ -75,7 +76,7 @@ PUBLIC const char __driConfigOptions[] = #define false 0 -static const uint __driNConfigOptions = 11; +static const uint __driNConfigOptions = 12; static const __DRIconfig ** dri_fill_in_modes(struct dri_screen *screen) |