[Mesa-dev] [PATCH 1/7] gallium/util: remove unused helper util_draw_texquad

[Brian Paul]

I verified that the removed functions are not needed by our in-house code.

Other than comments on patch 5, the series is

Reviewed-by: Brian Paul <brianp at vmware.com>


On 02/16/2017 05:52 AM, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak at amd.com>
>
> ---
>   src/gallium/auxiliary/util/u_draw_quad.c | 66 --------------------------------
>   src/gallium/auxiliary/util/u_draw_quad.h |  6 ---
>   2 files changed, 72 deletions(-)
>
> diff --git a/src/gallium/auxiliary/util/u_draw_quad.c b/src/gallium/auxiliary/util/u_draw_quad.c
> index fa442af..ce3fa41 100644
> --- a/src/gallium/auxiliary/util/u_draw_quad.c
> +++ b/src/gallium/auxiliary/util/u_draw_quad.c
> @@ -83,76 +83,10 @@ util_draw_user_vertex_buffer(struct cso_context *cso, void *buffer,
>      assert(num_attribs <= PIPE_MAX_ATTRIBS);
>
>      vbuffer.user_buffer = buffer;
>      vbuffer.stride = num_attribs * 4 * sizeof(float);  /* vertex size */
>
>      /* note: vertex elements already set by caller */
>
>      cso_set_vertex_buffers(cso, 0, 1, &vbuffer);
>      cso_draw_arrays(cso, prim_type, 0, num_verts);
>   }
> -
> -
> -/**
> - * Draw screen-aligned textured quad.
> - * Note: this isn't especially efficient.
> - */
> -void
> -util_draw_texquad(struct pipe_context *pipe, struct cso_context *cso,
> -                  uint vbuf_slot,
> -                  float x0, float y0, float x1, float y1, float z)
> -{
> -   uint numAttribs = 2, i, j;
> -   uint vertexBytes = 4 * (4 * numAttribs * sizeof(float));
> -   struct pipe_resource *vbuf = NULL;
> -   float *v = NULL;
> -
> -   v = MALLOC(vertexBytes);
> -   if (!v)
> -      goto out;
> -
> -   /*
> -    * Load vertex buffer
> -    */
> -   for (i = j = 0; i < 4; i++) {
> -      v[j + 2] = z;   /* z */
> -      v[j + 3] = 1.0; /* w */
> -      v[j + 6] = 0.0; /* r */
> -      v[j + 7] = 1.0; /* q */
> -      j += 8;
> -   }
> -
> -   v[0] = x0;
> -   v[1] = y0;
> -   v[4] = 0.0; /*s*/
> -   v[5] = 0.0; /*t*/
> -
> -   v[8] = x1;
> -   v[9] = y0;
> -   v[12] = 1.0;
> -   v[13] = 0.0;
> -
> -   v[16] = x1;
> -   v[17] = y1;
> -   v[20] = 1.0;
> -   v[21] = 1.0;
> -
> -   v[24] = x0;
> -   v[25] = y1;
> -   v[28] = 0.0;
> -   v[29] = 1.0;
> -	
> -   vbuf = pipe_buffer_create(pipe->screen, PIPE_BIND_VERTEX_BUFFER,
> -                             PIPE_USAGE_STAGING, vertexBytes);
> -   if (!vbuf)
> -      goto out;
> -   pipe_buffer_write(pipe, vbuf, 0, vertexBytes, v);
> -
> -   util_draw_vertex_buffer(pipe, cso, vbuf, vbuf_slot, 0,
> -                           PIPE_PRIM_TRIANGLE_FAN, 4, 2);
> -
> -out:
> -   if (vbuf)
> -      pipe_resource_reference(&vbuf, NULL);
> -
> -   FREE(v);
> -}
> diff --git a/src/gallium/auxiliary/util/u_draw_quad.h b/src/gallium/auxiliary/util/u_draw_quad.h
> index 6553d5d..e5b676a 100644
> --- a/src/gallium/auxiliary/util/u_draw_quad.h
> +++ b/src/gallium/auxiliary/util/u_draw_quad.h
> @@ -44,22 +44,16 @@ struct cso_context;
>   extern void
>   util_draw_vertex_buffer(struct pipe_context *pipe, struct cso_context *cso,
>                           struct pipe_resource *vbuf, uint vbuf_slot,
>                           uint offset, uint prim_type, uint num_attribs,
>                           uint num_verts);
>
>   void
>   util_draw_user_vertex_buffer(struct cso_context *cso, void *buffer,
>                                uint prim_type, uint num_verts, uint num_attribs);
>
> -extern void
> -util_draw_texquad(struct pipe_context *pipe, struct cso_context *cso,
> -                  uint vbuf_slot,
> -                  float x0, float y0, float x1, float y1, float z);
> -
> -
>   #ifdef __cplusplus
>   }
>   #endif
>
>
>   #endif
>