r600g: fix depth hw resource copies.
[mesa.git] / src / gallium / drivers / r600 / r600_blit.c
index f4eedfe4cb1f4df0f187f1d496e3f744babf4a66..c200dd7305bf8949cd0b72b4748a0d911ce86e26 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Marek Olšák <maraeo@gmail.com>
+ * Copyright 2010 Jerome Glisse <glisse@freedesktop.org>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *      Jerome Glisse
- *      Marek Olšák
  */
-#include <pipe/p_screen.h>
+#include <util/u_surface.h>
 #include <util/u_blitter.h>
-#include <util/u_inlines.h>
-#include <util/u_memory.h>
-#include "util/u_surface.h"
-#include "r600_screen.h"
-#include "r600_context.h"
+#include <util/u_format.h>
+#include "r600_pipe.h"
+
+enum r600_blitter_op /* bitmask */
+{
+       R600_CLEAR         = 1,
+       R600_CLEAR_SURFACE = 2,
+       R600_COPY          = 4
+};
 
-static void r600_blitter_save_states(struct r600_context *rctx)
+static void r600_blitter_begin(struct pipe_context *ctx, enum r600_blitter_op op)
 {
-       util_blitter_save_blend(rctx->blitter, rctx->blend);
-       util_blitter_save_depth_stencil_alpha(rctx->blitter, rctx->dsa);
-       if (rctx->stencil_ref) {
-               util_blitter_save_stencil_ref(rctx->blitter,
-                                       &rctx->stencil_ref->state.stencil_ref);
+       struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
+
+       rctx->blit = true;
+       r600_context_queries_suspend(&rctx->ctx);
+
+       util_blitter_save_blend(rctx->blitter, rctx->states[R600_PIPE_STATE_BLEND]);
+       util_blitter_save_depth_stencil_alpha(rctx->blitter, rctx->states[R600_PIPE_STATE_DSA]);
+       if (rctx->states[R600_PIPE_STATE_STENCIL_REF]) {
+               util_blitter_save_stencil_ref(rctx->blitter, &rctx->stencil_ref);
        }
-       util_blitter_save_rasterizer(rctx->blitter, rctx->rasterizer);
+       util_blitter_save_rasterizer(rctx->blitter, rctx->states[R600_PIPE_STATE_RASTERIZER]);
        util_blitter_save_fragment_shader(rctx->blitter, rctx->ps_shader);
        util_blitter_save_vertex_shader(rctx->blitter, rctx->vs_shader);
        util_blitter_save_vertex_elements(rctx->blitter, rctx->vertex_elements);
-       if (rctx->viewport) {
-               util_blitter_save_viewport(rctx->blitter, &rctx->viewport->state.viewport);
+       if (rctx->states[R600_PIPE_STATE_VIEWPORT]) {
+               util_blitter_save_viewport(rctx->blitter, &rctx->viewport);
+       }
+       if (rctx->states[R600_PIPE_STATE_CLIP]) {
+               util_blitter_save_clip(rctx->blitter, &rctx->clip);
+       }
+       util_blitter_save_vertex_buffers(rctx->blitter, rctx->nvertex_buffers, rctx->vertex_buffer);
+
+       if (op & (R600_CLEAR_SURFACE | R600_COPY))
+               util_blitter_save_framebuffer(rctx->blitter, &rctx->framebuffer);
+
+       if (op & R600_COPY) {
+               util_blitter_save_fragment_sampler_states(
+                       rctx->blitter, rctx->ps_samplers.n_samplers,
+                       (void**)rctx->ps_samplers.samplers);
+
+               util_blitter_save_fragment_sampler_views(
+                       rctx->blitter, rctx->ps_samplers.n_views,
+                       (struct pipe_sampler_view**)rctx->ps_samplers.views);
+       }
+
+}
+
+static void r600_blitter_end(struct pipe_context *ctx)
+{
+       struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
+       r600_context_queries_resume(&rctx->ctx);
+       rctx->blit = false;
+}
+
+void r600_blit_uncompress_depth(struct pipe_context *ctx, struct r600_resource_texture *texture)
+{
+       struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
+       struct pipe_surface *zsurf, *cbsurf, surf_tmpl;
+       int level = 0;
+       float depth = 1.0f;
+
+       if (!texture->dirty_db)
+               return;
+
+       surf_tmpl.format = texture->resource.base.b.format;
+       surf_tmpl.u.tex.level = level;
+       surf_tmpl.u.tex.first_layer = 0;
+       surf_tmpl.u.tex.last_layer = 0;
+       surf_tmpl.usage = PIPE_BIND_DEPTH_STENCIL;
+
+       zsurf = ctx->create_surface(ctx, &texture->resource.base.b, &surf_tmpl);
+
+       surf_tmpl.format = ((struct pipe_resource*)texture->flushed_depth_texture)->format;
+       surf_tmpl.usage = PIPE_BIND_RENDER_TARGET;
+       cbsurf = ctx->create_surface(ctx,
+                       (struct pipe_resource*)texture->flushed_depth_texture, &surf_tmpl);
+
+       if (rctx->family == CHIP_RV610 || rctx->family == CHIP_RV630 ||
+           rctx->family == CHIP_RV620 || rctx->family == CHIP_RV635)
+               depth = 0.0f;
+
+       r600_blitter_begin(ctx, R600_CLEAR_SURFACE);
+       util_blitter_custom_depth_stencil(rctx->blitter, zsurf, cbsurf, rctx->custom_dsa_flush, depth);
+       r600_blitter_end(ctx);
+
+       pipe_surface_reference(&zsurf, NULL);
+       pipe_surface_reference(&cbsurf, NULL);
+
+       texture->dirty_db = FALSE;
+}
+
+void r600_flush_depth_textures(struct r600_pipe_context *rctx)
+{
+       unsigned int i;
+
+       if (rctx->blit) return;
+
+       /* FIXME: This handles fragment shader textures only. */
+
+       for (i = 0; i < rctx->ps_samplers.n_views; ++i) {
+               struct r600_pipe_sampler_view *view;
+               struct r600_resource_texture *tex;
+
+               view = rctx->ps_samplers.views[i];
+               if (!view) continue;
+
+               tex = (struct r600_resource_texture *)view->base.texture;
+               if (!tex->depth)
+                       continue;
+
+               r600_blit_uncompress_depth(&rctx->context, tex);
        }
-       /* XXX util_blitter_save_clip(rctx->blitter, &rctx->clip); */
-       util_blitter_save_vertex_buffers(rctx->blitter, rctx->nvertex_buffer,
-                                       rctx->vertex_buffer);
-
-       /* remove ptr so they don't get deleted */
-       rctx->blend = NULL;
-       rctx->vs_shader = NULL;
-       rctx->ps_shader = NULL;
-       rctx->rasterizer = NULL;
-       rctx->dsa = NULL;
-       rctx->vertex_elements = NULL;
 }
 
 static void r600_clear(struct pipe_context *ctx, unsigned buffers,
-                      const float *rgba, double depth, unsigned stencil)
+                       const float *rgba, double depth, unsigned stencil)
 {
-       struct r600_context *rctx = r600_context(ctx);
-       struct pipe_framebuffer_state *fb = &rctx->framebuffer->state.framebuffer;
+       struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
+       struct pipe_framebuffer_state *fb = &rctx->framebuffer;
 
-       r600_blitter_save_states(rctx);
+       r600_blitter_begin(ctx, R600_CLEAR);
        util_blitter_clear(rctx->blitter, fb->width, fb->height,
                                fb->nr_cbufs, buffers, rgba, depth,
                                stencil);
+       r600_blitter_end(ctx);
 }
 
-static void r600_clear_render_target(struct pipe_context *pipe,
+static void r600_clear_render_target(struct pipe_context *ctx,
                                     struct pipe_surface *dst,
                                     const float *rgba,
                                     unsigned dstx, unsigned dsty,
                                     unsigned width, unsigned height)
 {
-       struct r600_context *rctx = r600_context(pipe);
-       struct pipe_framebuffer_state *fb = &rctx->framebuffer->state.framebuffer;
-
-       r600_blitter_save_states(rctx);
-       util_blitter_save_framebuffer(rctx->blitter, fb);
+       struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
 
+       r600_blitter_begin(ctx, R600_CLEAR_SURFACE);
        util_blitter_clear_render_target(rctx->blitter, dst, rgba,
                                         dstx, dsty, width, height);
+       r600_blitter_end(ctx);
 }
 
-static void r600_clear_depth_stencil(struct pipe_context *pipe,
+static void r600_clear_depth_stencil(struct pipe_context *ctx,
                                     struct pipe_surface *dst,
                                     unsigned clear_flags,
                                     double depth,
@@ -96,30 +173,46 @@ static void r600_clear_depth_stencil(struct pipe_context *pipe,
                                     unsigned dstx, unsigned dsty,
                                     unsigned width, unsigned height)
 {
-       struct r600_context *rctx = r600_context(pipe);
-       struct pipe_framebuffer_state *fb = &rctx->framebuffer->state.framebuffer;
-
-       r600_blitter_save_states(rctx);
-       util_blitter_save_framebuffer(rctx->blitter, fb);
+       struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
 
+       r600_blitter_begin(ctx, R600_CLEAR_SURFACE);
        util_blitter_clear_depth_stencil(rctx->blitter, dst, clear_flags, depth, stencil,
                                         dstx, dsty, width, height);
+       r600_blitter_end(ctx);
+}
+
+
+
+/* Copy a block of pixels from one surface to another using HW. */
+static void r600_hw_copy_region(struct pipe_context *ctx,
+                               struct pipe_resource *dst,
+                               unsigned dst_level,
+                               unsigned dstx, unsigned dsty, unsigned dstz,
+                               struct pipe_resource *src,
+                               unsigned src_level,
+                               const struct pipe_box *src_box)
+{
+       struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
+
+       r600_blitter_begin(ctx, R600_COPY);
+       util_blitter_copy_region(rctx->blitter, dst, dst_level, dstx, dsty, dstz,
+                                src, src_level, src_box, TRUE);
+       r600_blitter_end(ctx);
 }
 
-static void r600_resource_copy_region(struct pipe_context *pipe,
+static void r600_resource_copy_region(struct pipe_context *ctx,
                                      struct pipe_resource *dst,
-                                     struct pipe_subresource subdst,
+                                     unsigned dst_level,
                                      unsigned dstx, unsigned dsty, unsigned dstz,
                                      struct pipe_resource *src,
-                                     struct pipe_subresource subsrc,
-                                     unsigned srcx, unsigned srcy, unsigned srcz,
-                                     unsigned width, unsigned height)
+                                     unsigned src_level,
+                                     const struct pipe_box *src_box)
 {
-       util_resource_copy_region(pipe, dst, subdst, dstx, dsty, dstz,
-                                 src, subsrc, srcx, srcy, srcz, width, height);
+       r600_hw_copy_region(ctx, dst, dst_level, dstx, dsty, dstz,
+                           src, src_level, src_box);
 }
 
-void r600_init_blit_functions(struct r600_context *rctx)
+void r600_init_blit_functions(struct r600_pipe_context *rctx)
 {
        rctx->context.clear = r600_clear;
        rctx->context.clear_render_target = r600_clear_render_target;