fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-14 14:28:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

radeonsi: remove cb0_is_integer handling

Browse source 
st/mesa does this for us.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák 2016-09-16 22:42:54 +02:00
parent 54f8efeb02
commit a2ea653a49
3 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/drivers/radeonsi/si_pipe.h
View file

@ -165,7 +165,6 @@ struct si_framebuffer {
struct pipe_framebuffer_state state; struct pipe_framebuffer_state state;
unsigned nr_samples; unsigned nr_samples;
unsigned log_samples; unsigned log_samples;
unsigned cb0_is_integer;
unsigned compressed_cb_mask; unsigned compressed_cb_mask;
unsigned spi_shader_col_format; unsigned spi_shader_col_format;
unsigned spi_shader_col_format_alpha; unsigned spi_shader_col_format_alpha;

9
src/gallium/drivers/radeonsi/si_state.c
View file

@ -1144,8 +1144,7 @@ static void si_emit_db_render_state(struct si_context *sctx, struct r600_atom *s
S_028010_DISABLE_SMEM_EXPCLEAR_OPTIMIZATION(sctx->db_stencil_disable_expclear) | S_028010_DISABLE_SMEM_EXPCLEAR_OPTIMIZATION(sctx->db_stencil_disable_expclear) |
S_028010_DECOMPRESS_Z_ON_FLUSH(sctx->framebuffer.nr_samples >= 4)); S_028010_DECOMPRESS_Z_ON_FLUSH(sctx->framebuffer.nr_samples >= 4));
db_shader_control = S_02880C_ALPHA_TO_MASK_DISABLE(sctx->framebuffer.cb0_is_integer) | db_shader_control = sctx->ps_db_shader_control;
sctx->ps_db_shader_control;
/* Bug workaround for smoothing (overrasterization) on SI. */ /* Bug workaround for smoothing (overrasterization) on SI. */
if (sctx->b.chip_class == SI && sctx->smoothing_enabled) { if (sctx->b.chip_class == SI && sctx->smoothing_enabled) {
@ -2288,7 +2287,6 @@ static void si_set_framebuffer_state(struct pipe_context *ctx,
struct pipe_constant_buffer constbuf = {0}; struct pipe_constant_buffer constbuf = {0};
struct r600_surface *surf = NULL; struct r600_surface *surf = NULL;
struct r600_texture *rtex; struct r600_texture *rtex;
bool old_cb0_is_integer = sctx->framebuffer.cb0_is_integer;
bool old_any_dst_linear = sctx->framebuffer.any_dst_linear; bool old_any_dst_linear = sctx->framebuffer.any_dst_linear;
unsigned old_nr_samples = sctx->framebuffer.nr_samples; unsigned old_nr_samples = sctx->framebuffer.nr_samples;
int i; int i;
@ -2333,13 +2331,8 @@ static void si_set_framebuffer_state(struct pipe_context *ctx,
sctx->framebuffer.compressed_cb_mask = 0; sctx->framebuffer.compressed_cb_mask = 0;
sctx->framebuffer.nr_samples = util_framebuffer_get_num_samples(state); sctx->framebuffer.nr_samples = util_framebuffer_get_num_samples(state);
sctx->framebuffer.log_samples = util_logbase2(sctx->framebuffer.nr_samples); sctx->framebuffer.log_samples = util_logbase2(sctx->framebuffer.nr_samples);
sctx->framebuffer.cb0_is_integer = state->nr_cbufs && state->cbufs[0] &&
util_format_is_pure_integer(state->cbufs[0]->format);
sctx->framebuffer.any_dst_linear = false; sctx->framebuffer.any_dst_linear = false;
if (sctx->framebuffer.cb0_is_integer != old_cb0_is_integer)
si_mark_atom_dirty(sctx, &sctx->db_render_state);
for (i = 0; i < state->nr_cbufs; i++) { for (i = 0; i < state->nr_cbufs; i++) {
if (!state->cbufs[i]) if (!state->cbufs[i])
continue; continue;

6
src/gallium/drivers/radeonsi/si_state_shaders.c
View file

@ -845,8 +845,7 @@ static void si_shader_init_pm4_state(struct si_screen *sscreen,
static unsigned si_get_alpha_test_func(struct si_context *sctx) static unsigned si_get_alpha_test_func(struct si_context *sctx)
{ {
/* Alpha-test should be disabled if colorbuffer 0 is integer. */ /* Alpha-test should be disabled if colorbuffer 0 is integer. */
if (sctx->queued.named.dsa && if (sctx->queued.named.dsa)
!sctx->framebuffer.cb0_is_integer)
return sctx->queued.named.dsa->alpha_func; return sctx->queued.named.dsa->alpha_func;
return PIPE_FUNC_ALWAYS; return PIPE_FUNC_ALWAYS;
@ -957,8 +956,7 @@ static inline void si_shader_selector_key(struct pipe_context *ctx,
if (sctx->queued.named.blend) { if (sctx->queued.named.blend) {
key->ps.epilog.alpha_to_one = sctx->queued.named.blend->alpha_to_one && key->ps.epilog.alpha_to_one = sctx->queued.named.blend->alpha_to_one &&
rs->multisample_enable && rs->multisample_enable;
!sctx->framebuffer.cb0_is_integer;
} }
key->ps.prolog.poly_stipple = rs->poly_stipple_enable && is_poly; key->ps.prolog.poly_stipple = rs->poly_stipple_enable && is_poly;