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

r600g: split flushed depth texture creation and flushing

Browse source
This commit is contained in:
Marek Olšák 2012-06-25 12:45:32 +02:00
parent d1056541e2
commit da98bb6fc1
5 changed files with 34 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -988,8 +988,12 @@ static struct pipe_sampler_view *evergreen_create_sampler_view(struct pipe_conte
}
if (tmp->is_depth && !tmp->is_flushing_texture) {
r600_texture_depth_flush(ctx, texture, TRUE);
r600_init_flushed_depth_texture(ctx, texture);
tmp = tmp->flushed_depth_texture;
if (!tmp) {
FREE(view);
return NULL;
}
}
endian = r600_colorformat_endian_swap(format);
@ -1310,8 +1314,9 @@ static void evergreen_cb(struct r600_context *rctx, struct r600_pipe_state *rsta
rctx->have_depth_fb = TRUE;
if (rtex->is_depth && !rtex->is_flushing_texture) {
r600_texture_depth_flush(&rctx->context, state->cbufs[cb]->texture, TRUE);
r600_init_flushed_depth_texture(&rctx->context, state->cbufs[cb]->texture);
rtex = rtex->flushed_depth_texture;
assert(rtex);
}
/* XXX quite sure for dx10+ hw don't need any offset hacks */

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

@ -342,7 +342,7 @@ static void r600_resource_copy_region(struct pipe_context *ctx,
}
if (rsrc->is_depth && !rsrc->is_flushing_texture)
r600_texture_depth_flush(ctx, src, FALSE);
r600_texture_depth_flush(ctx, src);
restore_orig[0] = restore_orig[1] = FALSE;

5
src/gallium/drivers/r600/r600_resource.h
View file

@ -87,7 +87,10 @@ static INLINE struct r600_resource *r600_resource(struct pipe_resource *r)
return (struct r600_resource*)r;
}
int r600_texture_depth_flush(struct pipe_context *ctx, struct pipe_resource *texture, boolean just_create);
void r600_init_flushed_depth_texture(struct pipe_context *ctx,
struct pipe_resource *texture);
void r600_texture_depth_flush(struct pipe_context *ctx,
struct pipe_resource *texture);
/* r600_texture.c texture transfer functions. */
struct pipe_transfer* r600_texture_get_transfer(struct pipe_context *ctx,

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

@ -1000,8 +1000,12 @@ static struct pipe_sampler_view *r600_create_sampler_view(struct pipe_context *c
}
if (tmp->is_depth && !tmp->is_flushing_texture) {
r600_texture_depth_flush(ctx, texture, TRUE);
r600_init_flushed_depth_texture(ctx, texture);
tmp = tmp->flushed_depth_texture;
if (!tmp) {
FREE(view);
return NULL;
}
}
endian = r600_colorformat_endian_swap(format);

28
src/gallium/drivers/r600/r600_texture.c
View file

@ -728,14 +728,14 @@ struct pipe_resource *r600_texture_from_handle(struct pipe_screen *screen,
stride, 0, buf, FALSE, &surface);
}
int r600_texture_depth_flush(struct pipe_context *ctx,
struct pipe_resource *texture, boolean just_create)
void r600_init_flushed_depth_texture(struct pipe_context *ctx,
struct pipe_resource *texture)
{
struct r600_resource_texture *rtex = (struct r600_resource_texture*)texture;
struct pipe_resource resource;
if (rtex->flushed_depth_texture)
goto out;
return; /* it's ready */
resource.target = texture->target;
resource.format = texture->format;
@ -752,18 +752,25 @@ int r600_texture_depth_flush(struct pipe_context *ctx,
rtex->flushed_depth_texture = (struct r600_resource_texture *)ctx->screen->resource_create(ctx->screen, &resource);
if (rtex->flushed_depth_texture == NULL) {
R600_ERR("failed to create temporary texture to hold untiled copy\n");
return -ENOMEM;
return;
}
((struct r600_resource_texture *)rtex->flushed_depth_texture)->is_flushing_texture = TRUE;
out:
if (just_create)
return 0;
}
void r600_texture_depth_flush(struct pipe_context *ctx,
struct pipe_resource *texture)
{
struct r600_resource_texture *rtex = (struct r600_resource_texture*)texture;
r600_init_flushed_depth_texture(ctx, texture);
if (!rtex->flushed_depth_texture)
return; /* error */
/* XXX: only do this if the depth texture has actually changed:
*/
r600_blit_uncompress_depth(ctx, rtex);
return 0;
}
/* Needs adjustment for pixelformat:
@ -783,7 +790,6 @@ struct pipe_transfer* r600_texture_get_transfer(struct pipe_context *ctx,
struct r600_resource_texture *rtex = (struct r600_resource_texture*)texture;
struct pipe_resource resource;
struct r600_transfer *trans;
int r;
boolean use_staging_texture = FALSE;
/* We cannot map a tiled texture directly because the data is
@ -828,8 +834,8 @@ struct pipe_transfer* r600_texture_get_transfer(struct pipe_context *ctx,
*/
/* XXX: when discard is true, no need to read back from depth texture
*/
r = r600_texture_depth_flush(ctx, texture, FALSE);
if (r < 0) {
r600_texture_depth_flush(ctx, texture);
if (!rtex->flushed_depth_texture) {
R600_ERR("failed to create temporary texture to hold untiled copy\n");
pipe_resource_reference(&trans->transfer.resource, NULL);
FREE(trans);