Mesa (master): nir: copy front interpolation when creating fake back color input
Ilia Mirkin
imirkin at kemper.freedesktop.org
Sun Jul 9 01:28:19 UTC 2017
Module: Mesa
Branch: master
Commit: f3958f1644391ed5f6d14373ac74d4978d8598b7
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f3958f1644391ed5f6d14373ac74d4978d8598b7
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Fri Jul 7 20:32:24 2017 -0400
nir: copy front interpolation when creating fake back color input
Fixes a bunch of gl_BackColor interpolation tests that had explicit
interpolation specified on the fragment shader gl_Color.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Rob Clark <robdclark at gmail.com>
---
src/compiler/nir/nir_lower_two_sided_color.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/compiler/nir/nir_lower_two_sided_color.c b/src/compiler/nir/nir_lower_two_sided_color.c
index 7d1a3bd236..90da1013ec 100644
--- a/src/compiler/nir/nir_lower_two_sided_color.c
+++ b/src/compiler/nir/nir_lower_two_sided_color.c
@@ -46,7 +46,8 @@ typedef struct {
*/
static nir_variable *
-create_input(nir_shader *shader, unsigned drvloc, gl_varying_slot slot)
+create_input(nir_shader *shader, unsigned drvloc, gl_varying_slot slot,
+ enum glsl_interp_mode interpolation)
{
nir_variable *var = rzalloc(shader, nir_variable);
@@ -56,6 +57,7 @@ create_input(nir_shader *shader, unsigned drvloc, gl_varying_slot slot)
var->name = ralloc_asprintf(var, "in_%d", drvloc);
var->data.index = 0;
var->data.location = slot;
+ var->data.interpolation = interpolation;
exec_list_push_tail(&shader->inputs, &var->node);
@@ -116,7 +118,9 @@ setup_inputs(lower_2side_state *state)
else
slot = VARYING_SLOT_BFC1;
- state->colors[i].back = create_input(state->shader, ++maxloc, slot);
+ state->colors[i].back = create_input(
+ state->shader, ++maxloc, slot,
+ state->colors[i].front->data.interpolation);
}
return 0;
More information about the mesa-commit
mailing list