r600g: split flushed depth texture creation and flushing

diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index b618ca881ba0b012adc79a45d7e7e76d56588474..d6ed20d6cf9e94d599e5ae6828f014bbd589cb49 100644 (file)
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -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 */

diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c
index 1122f3ec9ce2545823e745c1021ef09499ddc65d..6437f314ec04d8bd862d7babcc1d37c774dedd87 100644 (file)
--- a/src/gallium/drivers/r600/r600_blit.c
+++ b/src/gallium/drivers/r600/r600_blit.c
@@ -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;
 

diff --git a/src/gallium/drivers/r600/r600_resource.h b/src/gallium/drivers/r600/r600_resource.h
index d401e40c5ba80b8e3f0b9ef577b7cc7a885e79d4..13fce002df50e2af8ce3f81d64b69cba63d61c0c 100644 (file)
--- a/src/gallium/drivers/r600/r600_resource.h
+++ b/src/gallium/drivers/r600/r600_resource.h
@@ -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,

diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index fc757812a86e389f336bbbc484507e051061b81b..3ac9b8d396bb1aa519cc94e514bafb4398f6c7fb 100644 (file)
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -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);

diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index fe9a923b5f84e14fbdd403a3a01d5046468fda35..10f47ec50779e6f38f17d4cad744626f1f730311 100644 (file)
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -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);