fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-05 12:20:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

r600g: simplify r600_set_occlusion_query_state

Browse source 
The caller does the same checking.

Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák 2016-04-08 20:23:51 +02:00
parent b82893f93a
commit 5248676f87
4 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/r600/evergreen_state.c
View file

@ -1802,7 +1802,7 @@ static void evergreen_emit_db_misc_state(struct r600_context *rctx, struct r600_
S_02800C_FORCE_HIS_ENABLE0(V_02800C_FORCE_DISABLE) |
S_02800C_FORCE_HIS_ENABLE1(V_02800C_FORCE_DISABLE);
if (a->occlusion_query_enabled) {
if (rctx->b.num_occlusion_queries > 0) {
db_count_control |= S_028004_PERFECT_ZPASS_COUNTS(1);
if (rctx->b.chip_class == CAYMAN) {
db_count_control |= S_028004_SAMPLE_RATE(a->log_samples);

1
src/gallium/drivers/r600/r600_pipe.h
View file

@ -120,7 +120,6 @@ struct r600_db_state {
struct r600_db_misc_state {
struct r600_atom atom;
bool occlusion_query_enabled;
bool flush_depthstencil_through_cb;
bool flush_depth_inplace;
bool flush_stencil_inplace;

2
src/gallium/drivers/r600/r600_state.c
View file

@ -1644,7 +1644,7 @@ static void r600_emit_db_misc_state(struct r600_context *rctx, struct r600_atom
}
}
if (a->occlusion_query_enabled) {
if (rctx->b.num_occlusion_queries > 0) {
if (rctx->b.chip_class >= R700) {
db_render_control |= S_028D0C_R700_PERFECT_ZPASS_COUNTS(1);
}

5
src/gallium/drivers/r600/r600_state_common.c
View file

@ -2864,10 +2864,7 @@ static void r600_set_occlusion_query_state(struct pipe_context *ctx, bool enable
{
struct r600_context *rctx = (struct r600_context*)ctx;
if (rctx->db_misc_state.occlusion_query_enabled != enable) {
rctx->db_misc_state.occlusion_query_enabled = enable;
r600_mark_atom_dirty(rctx, &rctx->db_misc_state.atom);
}
r600_mark_atom_dirty(rctx, &rctx->db_misc_state.atom);
}
static void r600_need_gfx_cs_space(struct pipe_context *ctx, unsigned num_dw,