diff options
| author | Marek Olšák <[email protected]> | 2017-06-20 22:44:53 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-06-23 19:50:20 +0200 |
| commit | 118b2008ba18d6cf5d511e0a0bacbb846aad6982 (patch) | |
| tree | fa55539ece957d80882b4a814a4e77e6983bb8e6 | |
| parent | 6b0f6e693ba4b682679e31cc528974bbf0291e45 (diff) | |
st/dri: add a drirc workaround for Rocket League
This needs to be passed to gallium drivers.
No game fix is planned at this time.
The addition of glsl_correct_derivatives_after_discard is
generally a good thing for mesa compatibility with the broader GL
driver ecosystem.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100070
Reviewed-by: Nicolai Hähnle <[email protected]>
| -rw-r--r-- | src/gallium/include/pipe/p_defines.h | 6 | ||||
| -rw-r--r-- | src/gallium/state_trackers/dri/dri_screen.c | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/common/drirc | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/common/xmlpool/t_options.h | 4 |
4 files changed, 19 insertions, 0 deletions
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index b195af44399..2ccdf44bfe2 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -390,6 +390,12 @@ enum pipe_flush_flags */ #define PIPE_CONTEXT_PREFER_THREADED (1 << 3) +/** + * Implicit and explicit derivatives after KILL behave as if KILL didn't + * happen. + */ +#define PIPE_SCREEN_ENABLE_CORRECT_TGSI_DERIVATIVES_AFTER_KILL (1 << 0) + /** * Flags for pipe_context::memory_barrier. diff --git a/src/gallium/state_trackers/dri/dri_screen.c b/src/gallium/state_trackers/dri/dri_screen.c index 1b414b28d1a..aa215b09a2d 100644 --- a/src/gallium/state_trackers/dri/dri_screen.c +++ b/src/gallium/state_trackers/dri/dri_screen.c @@ -80,6 +80,7 @@ const __DRIconfigOptionsExtension gallium_config_options = { DRI_CONF_ALLOW_GLSL_BUILTIN_VARIABLE_REDECLARATION("false") DRI_CONF_ALLOW_HIGHER_COMPAT_VERSION("false") DRI_CONF_FORCE_GLSL_ABS_SQRT("false") + DRI_CONF_GLSL_CORRECT_DERIVATIVES_AFTER_DISCARD("false") DRI_CONF_SECTION_END DRI_CONF_SECTION_MISCELLANEOUS @@ -473,6 +474,10 @@ dri_init_options_get_screen_flags(struct dri_screen *screen, driver_name); dri_fill_st_options(screen); + if (driQueryOptionb(&screen->optionCache, + "glsl_correct_derivatives_after_discard")) + flags |= PIPE_SCREEN_ENABLE_CORRECT_TGSI_DERIVATIVES_AFTER_KILL; + return flags; } diff --git a/src/mesa/drivers/dri/common/drirc b/src/mesa/drivers/dri/common/drirc index 5152b207ebe..7d73b1218b5 100644 --- a/src/mesa/drivers/dri/common/drirc +++ b/src/mesa/drivers/dri/common/drirc @@ -151,6 +151,10 @@ TODO: document the other workarounds. <application name="Kerbal Space Program (64-bit)" executable="KSP.x86_64"> <option name="glsl_zero_init" value="true"/> </application> + + <application name="Rocket League" executable="RocketLeague"> + <option name="glsl_correct_derivatives_after_discard" value="true"/> + </application> </device> <!-- vmwgfx doesn't like full buffer swaps and can't sync to vertical retraces.--> <device driver="vmwgfx"> diff --git a/src/mesa/drivers/dri/common/xmlpool/t_options.h b/src/mesa/drivers/dri/common/xmlpool/t_options.h index 8a7d04f00ff..9aa1798b9d9 100644 --- a/src/mesa/drivers/dri/common/xmlpool/t_options.h +++ b/src/mesa/drivers/dri/common/xmlpool/t_options.h @@ -130,6 +130,10 @@ DRI_CONF_OPT_BEGIN_B(force_glsl_abs_sqrt, def) \ DRI_CONF_DESC(en,gettext("Force computing the absolute value for sqrt() and inversesqrt()")) \ DRI_CONF_OPT_END +#define DRI_CONF_GLSL_CORRECT_DERIVATIVES_AFTER_DISCARD(def) \ +DRI_CONF_OPT_BEGIN_B(glsl_correct_derivatives_after_discard, def) \ + DRI_CONF_DESC(en,gettext("Implicit and explicit derivatives after a discard behave as if the discard didn't happen")) \ +DRI_CONF_OPT_END /** |