Merge branch 'llvm-cliptest-viewport'
[mesa.git] / src / gallium / drivers / r600 / r600_blit.c
index 357776c55ef61ee0e9ee7232c9cf7c555238b8f8..50d47060c1a7da395c004da08245f70a54f2e15c 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 <errno.h>
-#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 pipe_context *ctx)
+static void r600_blitter_begin(struct pipe_context *ctx, enum r600_blitter_op op)
 {
-       struct r600_context *rctx = r600_context(ctx);
+       struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
 
-       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);
+       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->clip) {
-               util_blitter_save_clip(rctx->blitter, &rctx->clip->state.clip);
+       if (rctx->states[R600_PIPE_STATE_CLIP]) {
+               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->clip = NULL;
-       rctx->vs_shader = NULL;
-       rctx->ps_shader = NULL;
-       rctx->rasterizer = NULL;
-       rctx->dsa = NULL;
+       util_blitter_save_vertex_buffers(rctx->blitter, rctx->nvertex_buffer, rctx->vertex_buffer);
+
        rctx->vertex_elements = NULL;
 
-       /* suspend queries */
-       r600_queries_suspend(ctx);
+       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);
+}
+
+int 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;
+       int level = 0;
+       float depth = 1.0f;
+
+       zsurf = ctx->screen->get_tex_surface(ctx->screen, &texture->resource.base.b, 0, level, 0,
+                                            PIPE_BIND_DEPTH_STENCIL);
+
+       cbsurf = ctx->screen->get_tex_surface(ctx->screen,
+                       (struct pipe_resource*)texture->flushed_depth_texture,
+                       0, level, 0, PIPE_BIND_RENDER_TARGET);
+
+       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);
+
+
+       return 0;
 }
 
 static void r600_clear(struct pipe_context *ctx, unsigned buffers,
                        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(ctx);
+       r600_blitter_begin(ctx, R600_CLEAR);
        util_blitter_clear(rctx->blitter, fb->width, fb->height,
                                fb->nr_cbufs, buffers, rgba, depth,
                                stencil);
-       /* resume queries */
-       r600_queries_resume(ctx);
+       r600_blitter_end(ctx);
 }
 
 static void r600_clear_render_target(struct pipe_context *ctx,
@@ -89,16 +126,12 @@ static void r600_clear_render_target(struct pipe_context *ctx,
                                     unsigned dstx, unsigned dsty,
                                     unsigned width, unsigned height)
 {
-       struct r600_context *rctx = r600_context(ctx);
-       struct pipe_framebuffer_state *fb = &rctx->framebuffer->state.framebuffer;
-
-       r600_blitter_save_states(ctx);
-       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);
-       /* resume queries */
-       r600_queries_resume(ctx);
+       r600_blitter_end(ctx);
 }
 
 static void r600_clear_depth_stencil(struct pipe_context *ctx,
@@ -109,19 +142,35 @@ static void r600_clear_depth_stencil(struct pipe_context *ctx,
                                     unsigned dstx, unsigned dsty,
                                     unsigned width, unsigned height)
 {
-       struct r600_context *rctx = r600_context(ctx);
-       struct pipe_framebuffer_state *fb = &rctx->framebuffer->state.framebuffer;
-
-       r600_blitter_save_states(ctx);
-       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);
-       /* resume queries */
-       r600_queries_resume(ctx);
+       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,
+                                struct pipe_subresource subdst,
+                                unsigned dstx, unsigned dsty, unsigned dstz,
+                                struct pipe_resource *src,
+                                struct pipe_subresource subsrc,
+                                unsigned srcx, unsigned srcy, unsigned srcz,
+                                unsigned width, unsigned height)
+{
+       struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
+
+       r600_blitter_begin(ctx, R600_COPY);
+       util_blitter_copy_region(rctx->blitter, dst, subdst, dstx, dsty, dstz,
+                                src, subsrc, srcx, srcy, srcz, width, height,
+                                TRUE);
+       r600_blitter_end(ctx);
+}
+
 static void r600_resource_copy_region(struct pipe_context *ctx,
                                      struct pipe_resource *dst,
                                      struct pipe_subresource subdst,
@@ -131,79 +180,22 @@ static void r600_resource_copy_region(struct pipe_context *ctx,
                                      unsigned srcx, unsigned srcy, unsigned srcz,
                                      unsigned width, unsigned height)
 {
-       util_resource_copy_region(ctx, dst, subdst, dstx, dsty, dstz,
-                                 src, subsrc, srcx, srcy, srcz, width, height);
-}
+       boolean is_depth;
+       /* there is something wrong with depth resource copies at the moment so avoid them for now */
+       is_depth = util_format_get_component_bits(src->format, UTIL_FORMAT_COLORSPACE_ZS, 0) != 0;
+       if (is_depth)
+               util_resource_copy_region(ctx, dst, subdst, dstx, dsty, dstz,
+                                         src, subsrc, srcx, srcy, srcz, width, height);
+       else
+               r600_hw_copy_region(ctx, dst, subdst, dstx, dsty, dstz,
+                                   src, subsrc, srcx, srcy, srcz, width, height);
 
-static void *r600_create_db_flush_dsa(struct r600_context *rctx)
-{
-       struct r600_screen *rscreen = rctx->screen;
-       struct pipe_depth_stencil_alpha_state dsa;
-       struct r600_context_state *state;
-       boolean quirk = false;
-       enum radeon_family family;
-
-       family = radeon_get_family(rscreen->rw);
-       if (family == CHIP_RV610 || family == CHIP_RV630 || family == CHIP_RV620 ||
-           family == CHIP_RV635)
-               quirk = true;
-       
-       memset(&dsa, 0, sizeof(dsa));
-
-       if (quirk) {
-               dsa.depth.enabled = 1;
-               dsa.depth.func = PIPE_FUNC_LEQUAL;
-               dsa.stencil[0].enabled = 1;
-               dsa.stencil[0].func = PIPE_FUNC_ALWAYS;
-               dsa.stencil[0].zpass_op = PIPE_STENCIL_OP_KEEP;
-               dsa.stencil[0].zfail_op = PIPE_STENCIL_OP_INCR;
-               dsa.stencil[0].writemask = 0xff;
-       }
-
-       state = rctx->context.create_depth_stencil_alpha_state(&rctx->context, &dsa);
-       state->flags |= R600_STATE_FLAG_DSA_FLUSH;
-       return state;
-               
 }
 
-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;
        rctx->context.clear_depth_stencil = r600_clear_depth_stencil;
        rctx->context.resource_copy_region = r600_resource_copy_region;
-
-       /* create a custom depth stencil for DB flush */
-       rctx->custom_dsa_flush = r600_create_db_flush_dsa(rctx);
-}
-
-int r600_blit_uncompress_depth(struct pipe_context *ctx, struct r600_resource_texture *texture)
-{
-       struct r600_context *rctx = r600_context(ctx);
-       struct pipe_framebuffer_state *fb = rctx->pframebuffer;
-       struct pipe_surface *zsurf, *cbsurf;
-       int level = 0;
-       float depth = 1.0f;
-
-       zsurf = ctx->screen->get_tex_surface(ctx->screen, &texture->resource.base.b, 0, level, 0,
-                                            PIPE_BIND_DEPTH_STENCIL);
-
-       cbsurf = ctx->screen->get_tex_surface(ctx->screen, texture->flushed_depth_texture, 0, level, 0,
-                                             PIPE_BIND_RENDER_TARGET);
-
-       r600_blitter_save_states(ctx);
-       util_blitter_save_framebuffer(rctx->blitter, fb);
-
-       if (rctx->family == CHIP_RV610 || rctx->family == CHIP_RV630 ||
-               rctx->family == CHIP_RV620 || rctx->family == CHIP_RV635)
-               depth = 0.0f;
-
-       util_blitter_custom_depth_stencil(rctx->blitter, zsurf, cbsurf, rctx->custom_dsa_flush, depth);
-
-       pipe_surface_reference(&zsurf, NULL);
-       pipe_surface_reference(&cbsurf, NULL);
-
-       /* resume queries */
-       r600_queries_resume(ctx);
-       return 0;
 }