summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2017-08-17 03:35:13 +0200
committerMarek Olšák <[email protected]>2017-08-22 15:16:44 +0200
commit8f75a6f1af0bdc71a257b48bf65501cb4cd54065 (patch)
tree23a61afbed6ed03b4afb34d62619c577bd1fe3e5
parente2f3cfead92dacbfd24c597034301c713775a138 (diff)
gallium/u_blitter: remove get_next_surface_layer callback
Reviewed-by: Nicolai Hähnle <[email protected]> Tested-by: Brian Paul <[email protected]>
-rw-r--r--src/gallium/auxiliary/util/u_blitter.c7
-rw-r--r--src/gallium/auxiliary/util/u_blitter.h9
2 files changed, 1 insertions, 15 deletions
diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c
index 5c826773d15..630fe1102e8 100644
--- a/src/gallium/auxiliary/util/u_blitter.c
+++ b/src/gallium/auxiliary/util/u_blitter.c
@@ -147,10 +147,6 @@ struct blitter_context_priv
void (*delete_fs_state)(struct pipe_context *, void *);
};
-static struct pipe_surface *
-util_blitter_get_next_surface_layer(struct pipe_context *pipe,
- struct pipe_surface *surf);
-
struct blitter_context *util_blitter_create(struct pipe_context *pipe)
{
struct blitter_context_priv *ctx;
@@ -167,7 +163,6 @@ struct blitter_context *util_blitter_create(struct pipe_context *pipe)
ctx->base.pipe = pipe;
ctx->base.draw_rectangle = util_blitter_draw_rectangle;
- ctx->base.get_next_surface_layer = util_blitter_get_next_surface_layer;
ctx->bind_fs_state = pipe->bind_fs_state;
ctx->delete_fs_state = pipe->delete_fs_state;
@@ -1730,7 +1725,7 @@ static void do_blits(struct blitter_context_priv *ctx,
* just unreference the last one. */
old = dst;
if (dst_z < dstbox->depth-1) {
- dst = ctx->base.get_next_surface_layer(ctx->base.pipe, dst);
+ dst = util_blitter_get_next_surface_layer(ctx->base.pipe, dst);
}
if (dst_z) {
pipe_surface_reference(&old, NULL);
diff --git a/src/gallium/auxiliary/util/u_blitter.h b/src/gallium/auxiliary/util/u_blitter.h
index 912af831f3f..2174f9d9910 100644
--- a/src/gallium/auxiliary/util/u_blitter.h
+++ b/src/gallium/auxiliary/util/u_blitter.h
@@ -77,15 +77,6 @@ struct blitter_context
enum blitter_attrib_type type,
const union pipe_color_union *color);
- /**
- * Get the next surface layer for the pipe surface, i.e. make a copy
- * of the surface and increment the first and last layer by 1.
- *
- * This callback is exposed, so that drivers can override it if needed.
- */
- struct pipe_surface *(*get_next_surface_layer)(struct pipe_context *pipe,
- struct pipe_surface *surf);
-
/* Whether the blitter is running. */
boolean running;