util: Move u_debug to utils

[mesa.git] / src / gallium / auxiliary / util / u_blit.c

diff --git a/src/gallium/auxiliary/util/u_blit.c b/src/gallium/auxiliary/util/u_blit.c
index de39422e329195351705177f8530ce94fde64625..15edf2f48dc1d6e0f717637028ff6ddf3290d1db 100644 (file)
--- a/src/gallium/auxiliary/util/u_blit.c
+++ b/src/gallium/auxiliary/util/u_blit.c
@@ -28,7 +28,7 @@
 /**
  * @file
  * Copy/blit pixel rect between surfaces
- *  
+ *
  * @author Brian Paul
  */
 
@@ -98,7 +98,8 @@ util_create_blit(struct pipe_context *pipe, struct cso_context *cso)
    ctx->rasterizer.cull_face = PIPE_FACE_NONE;
    ctx->rasterizer.half_pixel_center = 1;
    ctx->rasterizer.bottom_edge_rule = 1;
-   ctx->rasterizer.depth_clip = 1;
+   ctx->rasterizer.depth_clip_near = 1;
+   ctx->rasterizer.depth_clip_far = 1;
 
    /* samplers */
    ctx->sampler.wrap_s = PIPE_TEX_WRAP_CLAMP_TO_EDGE;
@@ -112,7 +113,7 @@ util_create_blit(struct pipe_context *pipe, struct cso_context *cso)
    for (i = 0; i < 2; i++) {
       ctx->velem[i].src_offset = i * 4 * sizeof(float);
       ctx->velem[i].instance_divisor = 0;
-      ctx->velem[i].vertex_buffer_index = cso_get_aux_vertex_buffer_slot(cso);
+      ctx->velem[i].vertex_buffer_index = 0;
       ctx->velem[i].src_format = PIPE_FORMAT_R32G32B32A32_FLOAT;
    }
 
@@ -180,14 +181,14 @@ set_fragment_shader(struct blit_state *ctx,
       assert(stype == TGSI_RETURN_TYPE_FLOAT);
       idx = 3;
       if (!ctx->fs[pipe_tex][idx]) {
-         enum tgsi_texture_type tgsi_tex = util_pipe_tex_to_tgsi_tex(pipe_tex, 0);
+         enum tgsi_texture_type tgsi_tex =
+            util_pipe_tex_to_tgsi_tex(pipe_tex, 0);
          ctx->fs[pipe_tex][idx] =
             util_make_fragment_tex_shader_xrbias(ctx->pipe, tgsi_tex);
       }
    }
-
    else if (!ctx->fs[pipe_tex][idx]) {
-      unsigned tgsi_tex = util_pipe_tex_to_tgsi_tex(pipe_tex, 0);
+      enum tgsi_texture_type tgsi_tex = util_pipe_tex_to_tgsi_tex(pipe_tex, 0);
 
       /* OpenGL does not allow blits from signed to unsigned integer
        * or vice versa. */
@@ -228,7 +229,7 @@ set_vertex_shader(struct blit_state *ctx)
  * Get offset of next free slot in vertex buffer for quad vertices.
  */
 static unsigned
-get_next_slot( struct blit_state *ctx )
+get_next_slot(struct blit_state *ctx)
 {
    const unsigned max_slots = 4096 / sizeof ctx->vertices;
 
@@ -243,7 +244,7 @@ get_next_slot( struct blit_state *ctx )
                                      PIPE_USAGE_STREAM,
                                      max_slots * sizeof ctx->vertices);
    }
-   
+
    return ctx->vbuf_slot++ * sizeof ctx->vertices;
 }
 
@@ -259,7 +260,7 @@ get_next_slot( struct blit_state *ctx )
  */
 static unsigned
 setup_vertex_data_tex(struct blit_state *ctx,
-                      unsigned src_target,
+                      enum pipe_texture_target src_target,
                       unsigned src_face,
                       float x0, float y0, float x1, float y1,
                       float s0, float t0, float s1, float t1,
@@ -298,14 +299,15 @@ setup_vertex_data_tex(struct blit_state *ctx,
    if (src_target == PIPE_TEXTURE_CUBE ||
        src_target == PIPE_TEXTURE_CUBE_ARRAY) {
       /* Map cubemap texture coordinates inplace. */
-      const unsigned stride = sizeof ctx->vertices[0] / sizeof ctx->vertices[0][0][0];
+      const unsigned stride =
+         sizeof ctx->vertices[0] / sizeof ctx->vertices[0][0][0];
       util_map_texcoords2d_onto_cubemap(src_face,
                                         &ctx->vertices[0][1][0], stride,
                                         &ctx->vertices[0][1][0], stride,
                                         TRUE);
    }
 
-   offset = get_next_slot( ctx );
+   offset = get_next_slot(ctx);
 
    if (ctx->vbuf) {
       pipe_buffer_write_nooverlap(ctx->pipe, ctx->vbuf,
@@ -380,7 +382,8 @@ util_blit_pixels(struct blit_state *ctx,
                  struct pipe_surface *dst,
                  int dstX0, int dstY0,
                  int dstX1, int dstY1,
-                 MAYBE_UNUSED float z, uint filter,
+                 MAYBE_UNUSED float z,
+                 enum pipe_tex_filter filter,
                  uint writemask)
 {
    struct pipe_context *pipe = ctx->pipe;
@@ -514,7 +517,7 @@ util_blit_pixels_tex(struct blit_state *ctx,
                      struct pipe_surface *dst,
                      int dstX0, int dstY0,
                      int dstX1, int dstY1,
-                     float z, uint filter,
+                     float z, enum pipe_tex_filter filter,
                      boolean src_xrbias)
 {
    boolean normalized = src_sampler_view->texture->target != PIPE_TEXTURE_RECT;
@@ -535,8 +538,7 @@ util_blit_pixels_tex(struct blit_state *ctx,
    t0 = (float) srcY0;
    t1 = (float) srcY1;
 
-   if(normalized)
-   {
+   if (normalized) {
       /* normalize according to the mipmap level's size */
       int level = src_sampler_view->u.tex.first_level;
       float w = (float) u_minify(tex->width0, level);
@@ -550,6 +552,7 @@ util_blit_pixels_tex(struct blit_state *ctx,
    assert(ctx->pipe->screen->is_format_supported(ctx->pipe->screen, dst->format,
                                                  PIPE_TEXTURE_2D,
                                                  dst->texture->nr_samples,
+                                                 dst->texture->nr_storage_samples,
                                                  PIPE_BIND_RENDER_TARGET));
 
    /* save state (restored below) */
@@ -630,8 +633,7 @@ util_blit_pixels_tex(struct blit_state *ctx,
                                   s0, t0, s1, t1,
                                   z);
 
-   util_draw_vertex_buffer(ctx->pipe, ctx->cso, ctx->vbuf,
-                           cso_get_aux_vertex_buffer_slot(ctx->cso),
+   util_draw_vertex_buffer(ctx->pipe, ctx->cso, ctx->vbuf, 0,
                            offset,
                            PIPE_PRIM_TRIANGLE_FAN,
                            4,  /* verts */