Mesa (master): st/mesa: make st_draw_vbo static
Marek Olšák
mareko at kemper.freedesktop.org
Wed May 10 17:30:28 UTC 2017
Module: Mesa
Branch: master
Commit: f60f14bdb3ecb3327b964f74de794c4d04ab194e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f60f14bdb3ecb3327b964f74de794c4d04ab194e
Author: Marek Olšák <marek.olsak at amd.com>
Date: Mon May 8 02:08:17 2017 +0200
st/mesa: make st_draw_vbo static
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
---
src/mesa/state_tracker/st_cb_feedback.c | 2 +-
src/mesa/state_tracker/st_draw.c | 2 +-
src/mesa/state_tracker/st_draw.h | 12 ------------
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 2ca2defc0f..436062b1f8 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 8b657be6bc..78aabb0896 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 2c69ca4c47..12a30eecbb 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,
More information about the mesa-commit
mailing list