From 7f0bf00dc9f0740dc20ba6ab365456105d7de20a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 15 Feb 2017 14:50:16 +0100 Subject: [PATCH] gallium/util: remove unused helper util_draw_texquad MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Nicolai Hähnle --- 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 fa442aff38f..ce3fa41d9b0 100644 --- a/src/gallium/auxiliary/util/u_draw_quad.c +++ b/src/gallium/auxiliary/util/u_draw_quad.c @@ -90,69 +90,3 @@ util_draw_user_vertex_buffer(struct cso_context *cso, void *buffer, 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 6553d5d7b6b..e5b676a5a23 100644 --- a/src/gallium/auxiliary/util/u_draw_quad.h +++ b/src/gallium/auxiliary/util/u_draw_quad.h @@ -51,12 +51,6 @@ 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 -- 2.30.2