diff --git a/src/compiler/glsl/ir_print_visitor.cpp b/src/compiler/glsl/ir_print_visitor.cpp index f86ce806776..90bff8e7be9 100644 --- a/src/compiler/glsl/ir_print_visitor.cpp +++ b/src/compiler/glsl/ir_print_visitor.cpp @@ -213,7 +213,7 @@ void ir_print_visitor::visit(ir_variable *ir) "in ", "out ", "inout ", "const_in ", "sys ", "temporary " }; STATIC_ASSERT(ARRAY_SIZE(mode) == ir_var_mode_count); - const char *const interp[] = { "", "smooth", "flat", "noperspective", "explicit", "color" }; + const char *const interp[] = { "", "smooth", "flat", "noperspective", "explicit" }; STATIC_ASSERT(ARRAY_SIZE(interp) == INTERP_MODE_COUNT); const char *const precision[] = { "", "highp ", "mediump ", "lowp "}; diff --git a/src/compiler/shader_enums.c b/src/compiler/shader_enums.c index c1c1b6a3580..91e60cfecd1 100644 --- a/src/compiler/shader_enums.c +++ b/src/compiler/shader_enums.c @@ -411,7 +411,6 @@ glsl_interp_mode_name(enum glsl_interp_mode qual) ENUM(INTERP_MODE_FLAT), ENUM(INTERP_MODE_NOPERSPECTIVE), ENUM(INTERP_MODE_EXPLICIT), - ENUM(INTERP_MODE_COLOR), }; STATIC_ASSERT(ARRAY_SIZE(names) == INTERP_MODE_COUNT); return NAME(qual); diff --git a/src/compiler/shader_enums.h b/src/compiler/shader_enums.h index 32b346de651..be498783fb6 100644 --- a/src/compiler/shader_enums.h +++ b/src/compiler/shader_enums.h @@ -952,7 +952,6 @@ enum glsl_interp_mode INTERP_MODE_FLAT, INTERP_MODE_NOPERSPECTIVE, INTERP_MODE_EXPLICIT, - INTERP_MODE_COLOR, /**< glShadeModel determines the interp mode */ INTERP_MODE_COUNT /**< Number of interpolation qualifiers */ }; diff --git a/src/gallium/drivers/r600/sfn/sfn_shader_fs.cpp b/src/gallium/drivers/r600/sfn/sfn_shader_fs.cpp index 19fae346eb6..d4371a839b7 100644 --- a/src/gallium/drivers/r600/sfn/sfn_shader_fs.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_shader_fs.cpp @@ -135,7 +135,6 @@ barycentric_ij_index(nir_intrinsic_instr *intr) switch (nir_intrinsic_interp_mode(intr)) { case INTERP_MODE_NONE: case INTERP_MODE_SMOOTH: - case INTERP_MODE_COLOR: return index; case INTERP_MODE_NOPERSPECTIVE: return index + 3; @@ -419,9 +418,6 @@ FragmentShader::scan_input(nir_intrinsic_instr *intr, int index_src_id) break; case INTERP_MODE_FLAT: break; - case INTERP_MODE_COLOR: - tgsi_interpolate = TGSI_INTERPOLATE_COLOR; - break; case INTERP_MODE_EXPLICIT: default: assert(0); diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h index 2e058791827..df64fc01d44 100644 --- a/src/gallium/drivers/radeonsi/si_shader.h +++ b/src/gallium/drivers/radeonsi/si_shader.h @@ -133,6 +133,8 @@ struct nir_lower_subgroups_options; #define SI_MAX_VS_OUTPUTS 40 #define SI_USER_CLIP_PLANE_MASK 0x3F +#define INTERP_MODE_COLOR INTERP_MODE_COUNT + #define SI_PS_INPUT_CNTL_0000 (S_028644_OFFSET(0x20) | S_028644_DEFAULT_VAL(0)) #define SI_PS_INPUT_CNTL_0001 (S_028644_OFFSET(0x20) | S_028644_DEFAULT_VAL(3)) #define SI_PS_INPUT_CNTL_UNUSED SI_PS_INPUT_CNTL_0000