From da274ba5f88ca76bb2e4369967cea381b9f219e4 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Fri, 9 Sep 2016 00:12:58 -0700 Subject: [PATCH] i965: Drop pointless stage == MESA_SHADER_FRAGMENT checks. There's an assert right above this. Signed-off-by: Kenneth Graunke Reviewed-by: Jason Ekstrand --- src/mesa/drivers/dri/i965/brw_fs.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index 1483f41..dc000d9 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -5434,10 +5434,6 @@ fs_visitor::setup_fs_payload_gen6() assert(stage == MESA_SHADER_FRAGMENT); brw_wm_prog_data *prog_data = (brw_wm_prog_data*) this->prog_data; - unsigned barycentric_interp_modes = - (stage == MESA_SHADER_FRAGMENT) ? - ((brw_wm_prog_data*) this->prog_data)->barycentric_interp_modes : 0; - assert(devinfo->gen >= 6); /* R0-1: masks, pixel X/Y coordinates. */ @@ -5452,7 +5448,7 @@ fs_visitor::setup_fs_payload_gen6() * Mode" bits in WM_STATE. */ for (int i = 0; i < BRW_BARYCENTRIC_MODE_COUNT; ++i) { - if (barycentric_interp_modes & (1 << i)) { + if (prog_data->barycentric_interp_modes & (1 << i)) { payload.barycentric_coord_reg[i] = payload.num_regs; payload.num_regs += 2; if (dispatch_width == 16) { -- 2.7.4