Attachment 135659 Details for Bug 97852 – workaround

[patch] workaround

0001-mesa-add-AllowGLSLCrossStageInterpolationMismatch-wo.patch (text/plain), 11.79 KB, created by Tapani Pälli on 2017-11-22 06:16:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tapani Pälli

Created: 2017-11-22 06:16:16 UTC

Size: 11.79 KB

patch

obsolete

>From 18b71e4ab69f9b590d1e0b4d64ecea63e413f89b Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Tapani=20P=C3=A4lli?= <tapani.palli@intel.com>
>Date: Tue, 21 Nov 2017 09:17:01 +0200
>Subject: [PATCH] mesa: add AllowGLSLCrossStageInterpolationMismatch workaround
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>This fixes issues seen with certain versions of Unreal Engine 4 editor
>and games using GLSL 4.30.
>
>Signed-off-by: Tapani PÃ¤lli <tapani.palli@intel.com>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97852
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103801
>---
> src/compiler/glsl/link_varyings.cpp         | 51 +++++++++++++++++++----------
> src/gallium/include/state_tracker/st_api.h  |  1 +
> src/gallium/state_trackers/dri/dri_screen.c |  2 ++
> src/mesa/drivers/dri/i965/brw_context.c     |  3 ++
> src/mesa/drivers/dri/i965/intel_screen.c    |  1 +
> src/mesa/main/mtypes.h                      |  5 +++
> src/mesa/state_tracker/st_extensions.c      |  2 ++
> src/util/drirc                              |  8 +++++
> src/util/xmlpool/t_options.h                |  4 +++
> 9 files changed, 59 insertions(+), 18 deletions(-)
>
>diff --git a/src/compiler/glsl/link_varyings.cpp b/src/compiler/glsl/link_varyings.cpp
>index 72309365a0..0f53cd4aa9 100644
>--- a/src/compiler/glsl/link_varyings.cpp
>+++ b/src/compiler/glsl/link_varyings.cpp
>@@ -189,7 +189,8 @@ process_xfb_layout_qualifiers(void *mem_ctx, const gl_linked_shader *sh,
>  * matching input to another stage.
>  */
> static void
>-cross_validate_types_and_qualifiers(struct gl_shader_program *prog,
>+cross_validate_types_and_qualifiers(struct gl_context *ctx,
>+                                    struct gl_shader_program *prog,
>                                     const ir_variable *input,
>                                     const ir_variable *output,
>                                     gl_shader_stage consumer_stage,
>@@ -343,17 +344,30 @@ cross_validate_types_and_qualifiers(struct gl_shader_program *prog,
>    }
>    if (input_interpolation != output_interpolation &&
>        prog->data->Version < 440) {
>-      linker_error(prog,
>-                   "%s shader output `%s' specifies %s "
>-                   "interpolation qualifier, "
>-                   "but %s shader input specifies %s "
>-                   "interpolation qualifier\n",
>-                   _mesa_shader_stage_to_string(producer_stage),
>-                   output->name,
>-                   interpolation_string(output->data.interpolation),
>-                   _mesa_shader_stage_to_string(consumer_stage),
>-                   interpolation_string(input->data.interpolation));
>-      return;
>+      if (!ctx->Const.AllowGLSLCrossStageInterpolationMismatch) {
>+         linker_error(prog,
>+                      "%s shader output `%s' specifies %s "
>+                      "interpolation qualifier, "
>+                      "but %s shader input specifies %s "
>+                      "interpolation qualifier\n",
>+                      _mesa_shader_stage_to_string(producer_stage),
>+                      output->name,
>+                      interpolation_string(output->data.interpolation),
>+                      _mesa_shader_stage_to_string(consumer_stage),
>+                      interpolation_string(input->data.interpolation));
>+         return;
>+      } else {
>+         linker_warning(prog,
>+                        "%s shader output `%s' specifies %s "
>+                        "interpolation qualifier, "
>+                        "but %s shader input specifies %s "
>+                        "interpolation qualifier\n",
>+                        _mesa_shader_stage_to_string(producer_stage),
>+                        output->name,
>+                        interpolation_string(output->data.interpolation),
>+                        _mesa_shader_stage_to_string(consumer_stage),
>+                        interpolation_string(input->data.interpolation));
>+      }
>    }
> }
> 
>@@ -361,7 +375,8 @@ cross_validate_types_and_qualifiers(struct gl_shader_program *prog,
>  * Validate front and back color outputs against single color input
>  */
> static void
>-cross_validate_front_and_back_color(struct gl_shader_program *prog,
>+cross_validate_front_and_back_color(struct gl_context *ctx,
>+                                    struct gl_shader_program *prog,
>                                     const ir_variable *input,
>                                     const ir_variable *front_color,
>                                     const ir_variable *back_color,
>@@ -369,11 +384,11 @@ cross_validate_front_and_back_color(struct gl_shader_program *prog,
>                                     gl_shader_stage producer_stage)
> {
>    if (front_color != NULL && front_color->data.assigned)
>-      cross_validate_types_and_qualifiers(prog, input, front_color,
>+      cross_validate_types_and_qualifiers(ctx, prog, input, front_color,
>                                           consumer_stage, producer_stage);
> 
>    if (back_color != NULL && back_color->data.assigned)
>-      cross_validate_types_and_qualifiers(prog, input, back_color,
>+      cross_validate_types_and_qualifiers(ctx, prog, input, back_color,
>                                           consumer_stage, producer_stage);
> }
> 
>@@ -710,7 +725,7 @@ cross_validate_outputs_to_inputs(struct gl_context *ctx,
>          const ir_variable *const back_color =
>             parameters.get_variable("gl_BackColor");
> 
>-         cross_validate_front_and_back_color(prog, input,
>+         cross_validate_front_and_back_color(ctx, prog, input,
>                                              front_color, back_color,
>                                              consumer->Stage, producer->Stage);
>       } else if (strcmp(input->name, "gl_SecondaryColor") == 0 && input->data.used) {
>@@ -720,7 +735,7 @@ cross_validate_outputs_to_inputs(struct gl_context *ctx,
>          const ir_variable *const back_color =
>             parameters.get_variable("gl_BackSecondaryColor");
> 
>-         cross_validate_front_and_back_color(prog, input,
>+         cross_validate_front_and_back_color(ctx, prog, input,
>                                              front_color, back_color,
>                                              consumer->Stage, producer->Stage);
>       } else {
>@@ -770,7 +785,7 @@ cross_validate_outputs_to_inputs(struct gl_context *ctx,
>              */
>             if (!(input->get_interface_type() &&
>                   output->get_interface_type()))
>-               cross_validate_types_and_qualifiers(prog, input, output,
>+               cross_validate_types_and_qualifiers(ctx, prog, input, output,
>                                                    consumer->Stage,
>                                                    producer->Stage);
>          } else {
>diff --git a/src/gallium/include/state_tracker/st_api.h b/src/gallium/include/state_tracker/st_api.h
>index a407b980d9..44d6b474f8 100644
>--- a/src/gallium/include/state_tracker/st_api.h
>+++ b/src/gallium/include/state_tracker/st_api.h
>@@ -224,6 +224,7 @@ struct st_config_options
>    boolean allow_higher_compat_version;
>    boolean glsl_zero_init;
>    boolean force_glsl_abs_sqrt;
>+   boolean allow_glsl_cross_stage_interpolation_mismatch;
>    unsigned char config_options_sha1[20];
> };
> 
>diff --git a/src/gallium/state_trackers/dri/dri_screen.c b/src/gallium/state_trackers/dri/dri_screen.c
>index 91f50fe8e3..ddef97a7a8 100644
>--- a/src/gallium/state_trackers/dri/dri_screen.c
>+++ b/src/gallium/state_trackers/dri/dri_screen.c
>@@ -81,6 +81,8 @@ dri_fill_st_options(struct dri_screen *screen)
>    options->glsl_zero_init = driQueryOptionb(optionCache, "glsl_zero_init");
>    options->force_glsl_abs_sqrt =
>       driQueryOptionb(optionCache, "force_glsl_abs_sqrt");
>+   options->allow_glsl_cross_stage_interpolation_mismatch =
>+      driQueryOptionb(optionCache, "allow_glsl_cross_stage_interpolation_mismatch");
> 
>    driComputeOptionsSha1(optionCache, options->config_options_sha1);
> }
>diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
>index dd55b43669..b62852d90c 100644
>--- a/src/mesa/drivers/dri/i965/brw_context.c
>+++ b/src/mesa/drivers/dri/i965/brw_context.c
>@@ -816,6 +816,9 @@ brw_process_driconf_options(struct brw_context *brw)
>    brw->dual_color_blend_by_location =
>       driQueryOptionb(options, "dual_color_blend_by_location");
> 
>+   ctx->Const.AllowGLSLCrossStageInterpolationMismatch =
>+      driQueryOptionb(options, "allow_glsl_cross_stage_interpolation_mismatch");
>+
>    ctx->Const.dri_config_options_sha1 = ralloc_array(brw, unsigned char, 20);
>    driComputeOptionsSha1(&brw->screen->optionCache,
>                          ctx->Const.dri_config_options_sha1);
>diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
>index 38769babf0..db1552c188 100644
>--- a/src/mesa/drivers/dri/i965/intel_screen.c
>+++ b/src/mesa/drivers/dri/i965/intel_screen.c
>@@ -81,6 +81,7 @@ DRI_CONF_BEGIN
>       DRI_CONF_DUAL_COLOR_BLEND_BY_LOCATION("false")
>       DRI_CONF_ALLOW_GLSL_EXTENSION_DIRECTIVE_MIDSHADER("false")
>       DRI_CONF_ALLOW_GLSL_BUILTIN_VARIABLE_REDECLARATION("false")
>+      DRI_CONF_ALLOW_GLSL_CROSS_STAGE_INTERPOLATION_MISMATCH("false")
>       DRI_CONF_ALLOW_HIGHER_COMPAT_VERSION("false")
>       DRI_CONF_FORCE_GLSL_ABS_SQRT("false")
> 
>diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
>index 4682e02fc8..455811a3ac 100644
>--- a/src/mesa/main/mtypes.h
>+++ b/src/mesa/main/mtypes.h
>@@ -3715,6 +3715,11 @@ struct gl_constants
>    GLboolean AllowGLSLBuiltinVariableRedeclaration;
> 
>    /**
>+    * Allow GLSL interpolation qualifier mismatch across shader stages.
>+    */
>+   GLboolean AllowGLSLCrossStageInterpolationMismatch;
>+
>+   /**
>     * Allow creating a higher compat profile (version 3.1+) for apps that
>     * request it. Be careful when adding that driconf option because some
>     * features are unimplemented and might not work correctly.
>diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
>index de3d1ef4e9..9ef0df1e92 100644
>--- a/src/mesa/state_tracker/st_extensions.c
>+++ b/src/mesa/state_tracker/st_extensions.c
>@@ -941,6 +941,8 @@ void st_init_extensions(struct pipe_screen *screen,
> 
>    consts->dri_config_options_sha1 = options->config_options_sha1;
> 
>+   consts->AllowGLSLCrossStageInterpolationMismatch = options->allow_glsl_cross_stage_interpolation_mismatch;
>+
>    if (consts->GLSLVersion >= 400)
>       extensions->ARB_gpu_shader5 = GL_TRUE;
>    if (consts->GLSLVersion >= 410)
>diff --git a/src/util/drirc b/src/util/drirc
>index 05630eb1a9..9d27330036 100644
>--- a/src/util/drirc
>+++ b/src/util/drirc
>@@ -160,6 +160,14 @@ TODO: document the other workarounds.
>             <option name="glsl_correct_derivatives_after_discard" value="true"/>
>         </application>
> 
>+        <application name="Unreal 4 Editor" executable="UE4Editor">
>+            <option name="allow_glsl_cross_stage_interpolation_mismatch" value="true"/>
>+        </application>
>+
>+        <application name="Observer" executable="TheObserver-Linux-Shipping">
>+            <option name="allow_glsl_cross_stage_interpolation_mismatch" value="true"/>
>+        </application>
>+
>         
> 
>diff --git a/src/util/xmlpool/t_options.h b/src/util/xmlpool/t_options.h
>index 41f6ebd62d..bd553085c8 100644
>--- a/src/util/xmlpool/t_options.h
>+++ b/src/util/xmlpool/t_options.h
>@@ -135,6 +135,10 @@ 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
> 
>+#define DRI_CONF_ALLOW_GLSL_CROSS_STAGE_INTERPOLATION_MISMATCH(def) \
>+DRI_CONF_OPT_BEGIN_B(allow_glsl_cross_stage_interpolation_mismatch, def) \
>+        DRI_CONF_DESC(en,gettext("Allow interpolation qualifier mismatch across shader stages")) \
>+DRI_CONF_OPT_END
> 
> /**
>  * \brief Image quality-related options
>-- 
>2.13.6
>

Actions: View | Splinter Review

Attachments on bug 97852: 126603 | 127627 | 135622 | 135659

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.