[Mesa-dev] [PATCH 06/11] gallium: Remove the now unused gl_vertex_array.
Mathias.Froehlich at gmx.net
Mathias.Froehlich at gmx.net
Sun Apr 1 18:13:06 UTC 2018
From: Mathias Fröhlich <mathias.froehlich at web.de>
Was meant to be temporary in gallium.
Signed-off-by: Mathias Fröhlich <Mathias.Froehlich at web.de>
---
src/mesa/state_tracker/st_cb_feedback.c | 32 ++------------------------------
src/mesa/state_tracker/st_context.c | 3 ---
src/mesa/state_tracker/st_context.h | 3 ---
src/mesa/state_tracker/st_draw.c | 8 --------
4 files changed, 2 insertions(+), 44 deletions(-)
diff --git a/src/mesa/state_tracker/st_cb_feedback.c b/src/mesa/state_tracker/st_cb_feedback.c
index b7a082fca3..6e48be6f5d 100644
--- a/src/mesa/state_tracker/st_cb_feedback.c
+++ b/src/mesa/state_tracker/st_cb_feedback.c
@@ -272,34 +272,6 @@ draw_glselect_stage(struct gl_context *ctx, struct draw_context *draw)
}
-static void
-feedback_draw_vbo(struct gl_context *ctx,
- const struct _mesa_prim *prims,
- GLuint nr_prims,
- const struct _mesa_index_buffer *ib,
- GLboolean index_bounds_valid,
- GLuint min_index,
- GLuint max_index,
- struct gl_transform_feedback_object *tfb_vertcount,
- unsigned stream,
- struct gl_buffer_object *indirect)
-{
- struct st_context *st = st_context(ctx);
-
- /* The initial pushdown of the inputs array into the drivers */
- _mesa_set_drawing_arrays(ctx, st->draw_arrays.inputs);
- _vbo_update_inputs(ctx, &st->draw_arrays);
-
- /* The above needs to happen outside of st_feedback_draw_vbo,
- * since st_RasterPossets _DrawArrays and does not want that to be
- * overwritten by _mesa_set_drawing_arrays.
- */
- st_feedback_draw_vbo(ctx, prims, nr_prims, ib, index_bounds_valid,
- min_index, max_index, tfb_vertcount,
- stream, indirect);
-}
-
-
static void
st_RenderMode(struct gl_context *ctx, GLenum newMode )
{
@@ -318,7 +290,7 @@ st_RenderMode(struct gl_context *ctx, GLenum newMode )
st->selection_stage = draw_glselect_stage(ctx, draw);
draw_set_rasterize_stage(draw, st->selection_stage);
/* Plug in new vbo draw function */
- ctx->Driver.Draw = feedback_draw_vbo;
+ ctx->Driver.Draw = st_feedback_draw_vbo;
}
else {
struct gl_program *vp = st->ctx->VertexProgram._Current;
@@ -327,7 +299,7 @@ st_RenderMode(struct gl_context *ctx, GLenum newMode )
st->feedback_stage = draw_glfeedback_stage(ctx, draw);
draw_set_rasterize_stage(draw, st->feedback_stage);
/* Plug in new vbo draw function */
- ctx->Driver.Draw = feedback_draw_vbo;
+ ctx->Driver.Draw = st_feedback_draw_vbo;
/* need to generate/use a vertex program that emits pos/color/tex */
if (vp)
st->dirty |= ST_NEW_VERTEX_PROGRAM(st, st_vertex_program(vp));
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index a3da0f8f1f..454aba87da 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -550,9 +550,6 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
/* Initialize context's winsys buffers list */
LIST_INITHEAD(&st->winsys_buffers);
- /* Keep our list of gl_vertex_array inputs */
- _vbo_init_inputs(&st->draw_arrays);
-
return st;
}
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 5125fc5839..9f5bfba3fd 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -295,9 +295,6 @@ struct st_context
/* Winsys buffers */
struct list_head winsys_buffers;
-
- /* For the initial pushdown, keep the list of vbo inputs. */
- struct vbo_inputs draw_arrays;
};
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index e9ffc18d91..de7fca682b 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -145,10 +145,6 @@ st_draw_vbo(struct gl_context *ctx,
unsigned i;
unsigned start = 0;
- /* The initial pushdown of the inputs array into the drivers */
- _mesa_set_drawing_arrays(ctx, st->draw_arrays.inputs);
- _vbo_update_inputs(ctx, &st->draw_arrays);
-
prepare_draw(st, ctx);
if (st->vertex_array_out_of_memory)
@@ -247,10 +243,6 @@ st_indirect_draw_vbo(struct gl_context *ctx,
struct pipe_draw_info info;
struct pipe_draw_indirect_info indirect;
- /* The initial pushdown of the inputs array into the drivers */
- _mesa_set_drawing_arrays(ctx, st->draw_arrays.inputs);
- _vbo_update_inputs(ctx, &st->draw_arrays);
-
assert(stride);
prepare_draw(st, ctx);
--
2.14.3
More information about the mesa-dev
mailing list