diff options
| author | Nicolai Hähnle <[email protected]> | 2016-06-30 11:26:13 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2016-07-06 10:43:48 +0200 |
| commit | f2eb34f82f074284b691d568d26426a1f633d5f0 (patch) | |
| tree | 10db2d6f4975ebfc08191826ff3fd42a8a5a5869 /src/gallium/drivers/radeon | |
| parent | dd651261530e2d885d150755c9521e8f6e97c851 (diff) | |
gallium/radeon: replace is_flushing_texture with db_compatible
This is a left-over of when I considered generalizing the separate stencil
support. I do prefer the new name since it emphasizes what flushing vs.
non-flushing means from a functional point-of-view, namely special handling
of the texture format.
v2: adjust r600_init_color_surface as well
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeon')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/r600_texture.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h index 1840640e421..d8736c61096 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.h +++ b/src/gallium/drivers/radeon/r600_pipe_common.h @@ -242,12 +242,12 @@ struct r600_texture { uint64_t size; unsigned num_level0_transfers; bool is_depth; + bool db_compatible; bool can_sample_z; bool can_sample_s; unsigned dirty_level_mask; /* each bit says if that mipmap is compressed */ unsigned stencil_dirty_level_mask; /* each bit says if that mipmap is compressed */ struct r600_texture *flushed_depth_texture; - bool is_flushing_texture; struct radeon_surf surface; /* Colorbuffer compression and fast clear. */ diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c index 6b88fc14396..99c7f355daf 100644 --- a/src/gallium/drivers/radeon/r600_texture.c +++ b/src/gallium/drivers/radeon/r600_texture.c @@ -1041,6 +1041,8 @@ r600_texture_create_object(struct pipe_screen *screen, if (!(base->flags & (R600_RESOURCE_FLAG_TRANSFER | R600_RESOURCE_FLAG_FLUSHED_DEPTH))) { + rtex->db_compatible = true; + if (!(rscreen->debug_flags & DBG_NO_HYPERZ)) r600_texture_allocate_htile(rscreen, rtex); } @@ -1298,7 +1300,6 @@ bool r600_init_flushed_depth_texture(struct pipe_context *ctx, return false; } - (*flushed_depth_texture)->is_flushing_texture = true; (*flushed_depth_texture)->non_disp_tiling = false; return true; } |