summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2017-05-08 02:08:17 +0200
committerMarek Olšák <[email protected]>2017-05-10 19:29:08 +0200
commitf60f14bdb3ecb3327b964f74de794c4d04ab194e (patch)
tree3449a713a3c5314f38114d7d90e19367bf5d957d /src
parent740ef228f735724f9d223e8160533c702337393e (diff)
st/mesa: make st_draw_vbo static
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/state_tracker/st_cb_feedback.c2
-rw-r--r--src/mesa/state_tracker/st_draw.c2
-rw-r--r--src/mesa/state_tracker/st_draw.h12
3 files changed, 2 insertions, 14 deletions
diff --git a/src/mesa/state_tracker/st_cb_feedback.c b/src/mesa/state_tracker/st_cb_feedback.c
index 2ca2defc0f1..436062b1f85 100644
--- a/src/mesa/state_tracker/st_cb_feedback.c
+++ b/src/mesa/state_tracker/st_cb_feedback.c
@@ -282,7 +282,7 @@ st_RenderMode(struct gl_context *ctx, GLenum newMode )
if (newMode == GL_RENDER) {
/* restore normal VBO draw function */
- vbo_set_draw_func(ctx, st_draw_vbo);
+ st_init_draw(st);
}
else if (newMode == GL_SELECT) {
if (!st->selection_stage)
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index 8b657be6bc0..78aabb08962 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -130,7 +130,7 @@ translate_prim(const struct gl_context *ctx, unsigned prim)
* we have something to render.
* Basically, translate the information into the format expected by gallium.
*/
-void
+static void
st_draw_vbo(struct gl_context *ctx,
const struct _mesa_prim *prims,
GLuint nr_prims,
diff --git a/src/mesa/state_tracker/st_draw.h b/src/mesa/state_tracker/st_draw.h
index 2c69ca4c478..12a30eecbbc 100644
--- a/src/mesa/state_tracker/st_draw.h
+++ b/src/mesa/state_tracker/st_draw.h
@@ -50,18 +50,6 @@ void st_destroy_draw( struct st_context *st );
struct draw_context *st_get_draw_context(struct st_context *st);
extern void
-st_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);
-
-extern void
st_feedback_draw_vbo(struct gl_context *ctx,
const struct _mesa_prim *prims,
GLuint nr_prims,