r300g: cleanup tiling flags propagation
This commit is contained in:
@@ -528,8 +528,8 @@ static void r300_fb_update_tiling_flags(struct r300_context *r300,
|
||||
if (tex) {
|
||||
r300->rws->buffer_set_tiling(r300->rws, tex->buffer,
|
||||
tex->pitch[0],
|
||||
tex->microtile != 0,
|
||||
tex->macrotile != 0);
|
||||
tex->microtile,
|
||||
tex->macrotile);
|
||||
}
|
||||
}
|
||||
if (old_state->zsbuf &&
|
||||
@@ -540,8 +540,8 @@ static void r300_fb_update_tiling_flags(struct r300_context *r300,
|
||||
if (tex) {
|
||||
r300->rws->buffer_set_tiling(r300->rws, tex->buffer,
|
||||
tex->pitch[0],
|
||||
tex->microtile != 0,
|
||||
tex->macrotile != 0);
|
||||
tex->microtile,
|
||||
tex->macrotile);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -552,8 +552,8 @@ static void r300_fb_update_tiling_flags(struct r300_context *r300,
|
||||
|
||||
r300->rws->buffer_set_tiling(r300->rws, tex->buffer,
|
||||
tex->pitch[level],
|
||||
tex->microtile != 0,
|
||||
tex->mip_macrotile[level] != 0);
|
||||
tex->microtile,
|
||||
tex->mip_macrotile[level]);
|
||||
}
|
||||
if (new_state->zsbuf) {
|
||||
tex = (struct r300_texture*)new_state->zsbuf->texture;
|
||||
@@ -561,8 +561,8 @@ static void r300_fb_update_tiling_flags(struct r300_context *r300,
|
||||
|
||||
r300->rws->buffer_set_tiling(r300->rws, tex->buffer,
|
||||
tex->pitch[level],
|
||||
tex->microtile != 0,
|
||||
tex->mip_macrotile[level] != 0);
|
||||
tex->microtile,
|
||||
tex->mip_macrotile[level]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -777,8 +777,8 @@ static struct pipe_texture* r300_texture_create(struct pipe_screen* screen,
|
||||
tex->size);
|
||||
rws->buffer_set_tiling(rws, tex->buffer,
|
||||
tex->pitch[0],
|
||||
tex->microtile != R300_BUFFER_LINEAR,
|
||||
tex->macrotile != R300_BUFFER_LINEAR);
|
||||
tex->microtile,
|
||||
tex->macrotile);
|
||||
|
||||
if (!tex->buffer) {
|
||||
FREE(tex);
|
||||
|
||||
@@ -148,8 +148,8 @@ struct r300_winsys_screen {
|
||||
void (*buffer_set_tiling)(struct r300_winsys_screen *winsys,
|
||||
struct r300_winsys_buffer *buffer,
|
||||
uint32_t pitch,
|
||||
boolean microtiled,
|
||||
boolean macrotiled);
|
||||
enum r300_buffer_tiling microtiled,
|
||||
enum r300_buffer_tiling macrotiled);
|
||||
|
||||
uint32_t (*get_value)(struct r300_winsys_screen *winsys,
|
||||
enum r300_value_id vid);
|
||||
|
||||
@@ -72,7 +72,10 @@ void radeon_drm_bufmgr_write_reloc(struct pb_buffer *_buf,
|
||||
struct pb_buffer *radeon_drm_bufmgr_create_buffer_from_handle(struct pb_manager *_mgr,
|
||||
uint32_t handle);
|
||||
|
||||
void radeon_drm_bufmgr_set_tiling(struct pb_buffer *_buf, boolean microtiled, boolean macrotiled, uint32_t pitch);
|
||||
void radeon_drm_bufmgr_set_tiling(struct pb_buffer *_buf,
|
||||
enum r300_buffer_tiling microtiled,
|
||||
enum r300_buffer_tiling macrotiled,
|
||||
uint32_t pitch);
|
||||
|
||||
void radeon_drm_bufmgr_flush_maps(struct pb_manager *_mgr);
|
||||
|
||||
|
||||
@@ -306,13 +306,16 @@ boolean radeon_drm_bufmgr_get_handle(struct pb_buffer *_buf,
|
||||
}
|
||||
|
||||
|
||||
void radeon_drm_bufmgr_set_tiling(struct pb_buffer *_buf, boolean microtiled, boolean macrotiled, uint32_t pitch)
|
||||
void radeon_drm_bufmgr_set_tiling(struct pb_buffer *_buf,
|
||||
enum r300_buffer_tiling microtiled,
|
||||
enum r300_buffer_tiling macrotiled,
|
||||
uint32_t pitch)
|
||||
{
|
||||
struct radeon_drm_buffer *buf = get_drm_buffer(_buf);
|
||||
uint32_t flags = 0, old_flags, old_pitch;
|
||||
if (microtiled)
|
||||
if (microtiled == R300_BUFFER_TILED)
|
||||
flags |= RADEON_BO_FLAGS_MICRO_TILE;
|
||||
if (macrotiled)
|
||||
if (macrotiled == R300_BUFFER_TILED)
|
||||
flags |= RADEON_BO_FLAGS_MACRO_TILE;
|
||||
|
||||
radeon_bo_get_tiling(buf->bo, &old_flags, &old_pitch);
|
||||
|
||||
@@ -65,8 +65,8 @@ static void radeon_r300_winsys_buffer_destroy(struct r300_winsys_buffer *buf)
|
||||
static void radeon_r300_winsys_buffer_set_tiling(struct r300_winsys_screen *rws,
|
||||
struct r300_winsys_buffer *buf,
|
||||
uint32_t pitch,
|
||||
boolean microtiled,
|
||||
boolean macrotiled)
|
||||
enum r300_buffer_tiling microtiled,
|
||||
enum r300_buffer_tiling macrotiled)
|
||||
{
|
||||
struct pb_buffer *_buf = radeon_pb_buffer(buf);
|
||||
radeon_drm_bufmgr_set_tiling(_buf, microtiled, macrotiled, pitch);
|
||||
|
||||
Reference in New Issue
Block a user