From 4ea2e5a4e7467def0f2eacb5ab5a73bd8bfaa183 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sat, 21 Sep 2013 20:07:18 +0200 Subject: [PATCH] r600g: get rid of r600_texture::is_rat It's always 0. --- src/gallium/drivers/r600/evergreen_state.c | 8 +------- src/gallium/drivers/r600/r600_resource.h | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index cba1dcd..ca835e3 100644 --- a/src/gallium/drivers/r600/evergreen_state.c +++ b/src/gallium/drivers/r600/evergreen_state.c @@ -1533,12 +1533,6 @@ void evergreen_init_color_surface(struct r600_context *rctx, S_028C70_NUMBER_TYPE(ntype) | S_028C70_ENDIAN(endian); - if (rtex->is_rat) { - color_info |= S_028C70_RAT(1); - color_dim = S_028C78_WIDTH_MAX(pipe_tex->width0 & 0xffff) - | S_028C78_HEIGHT_MAX((pipe_tex->width0 >> 16) & 0xffff); - } - /* EXPORT_NORM is an optimzation that can be enabled for better * performance in certain cases. * EXPORT_NORM can be enabled if: @@ -2228,7 +2222,7 @@ static void evergreen_emit_framebuffer_state(struct r600_context *rctx, struct r radeon_emit(cs, reloc); } /* set CB_COLOR1_INFO for possible dual-src blending */ - if (i == 1 && !((struct r600_texture*)state->cbufs[0]->texture)->is_rat) { + if (i == 1) { r600_write_context_reg(cs, R_028C70_CB_COLOR0_INFO + 1 * 0x3C, ((struct r600_surface*)state->cbufs[0])->cb_color_info); diff --git a/src/gallium/drivers/r600/r600_resource.h b/src/gallium/drivers/r600/r600_resource.h index 3c0e74a..0c569b3 100644 --- a/src/gallium/drivers/r600/r600_resource.h +++ b/src/gallium/drivers/r600/r600_resource.h @@ -41,7 +41,6 @@ struct r600_texture { unsigned size; bool non_disp_tiling; bool is_depth; - bool is_rat; unsigned dirty_level_mask; /* each bit says if that mipmap is compressed */ struct r600_texture *flushed_depth_texture; boolean is_flushing_texture; -- 2.7.4