Mesa (master): vbo: add a prefix to count_tessellated_primitives

Dave Airlie airlied at kemper.freedesktop.org
Sat Sep 15 08:04:41 UTC 2012


Module: Mesa
Branch: master
Commit: 72f657c95056ef9848ffd28b17c9b4c026470a60
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=72f657c95056ef9848ffd28b17c9b4c026470a60

Author: Dave Airlie <airlied at gmail.com>
Date:   Sat Sep 15 13:22:30 2012 +1000

vbo: add a prefix to count_tessellated_primitives

Just to make it consistent with the rest of vbo, since it would
be an exported symbol anyways.

Reviewed-by: Matt Turner <mattst88 at gmail.com>
Acked-by: Kenneth Graunke <kenneth at whitecape.org>
Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/mesa/drivers/dri/i965/brw_draw.c |    2 +-
 src/mesa/vbo/vbo.h                   |    2 +-
 src/mesa/vbo/vbo_exec.c              |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
index 4365770..a09f555 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -381,7 +381,7 @@ static void
 brw_update_primitive_count(struct brw_context *brw,
                            const struct _mesa_prim *prim)
 {
-   uint32_t count = count_tessellated_primitives(prim);
+   uint32_t count = vbo_count_tessellated_primitives(prim);
    brw->sol.primitives_generated += count;
    if (brw->intel.ctx.TransformFeedback.CurrentObject->Active &&
        !brw->intel.ctx.TransformFeedback.CurrentObject->Paused) {
diff --git a/src/mesa/vbo/vbo.h b/src/mesa/vbo/vbo.h
index eb06bf9..e058497 100644
--- a/src/mesa/vbo/vbo.h
+++ b/src/mesa/vbo/vbo.h
@@ -156,7 +156,7 @@ void vbo_check_buffers_are_unmapped(struct gl_context *ctx);
 void vbo_bind_arrays(struct gl_context *ctx);
 
 size_t
-count_tessellated_primitives(const struct _mesa_prim *prim);
+vbo_count_tessellated_primitives(const struct _mesa_prim *prim);
 
 void
 vbo_sw_primitive_restart(struct gl_context *ctx,
diff --git a/src/mesa/vbo/vbo_exec.c b/src/mesa/vbo/vbo_exec.c
index fd5e0f8..0763f0d 100644
--- a/src/mesa/vbo/vbo_exec.c
+++ b/src/mesa/vbo/vbo_exec.c
@@ -105,7 +105,7 @@ void vbo_exec_invalidate_state( struct gl_context *ctx, GLuint new_state )
  * PRIMITIVES_GENERATED and TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN queries.
  */
 size_t
-count_tessellated_primitives(const struct _mesa_prim *prim)
+vbo_count_tessellated_primitives(const struct _mesa_prim *prim)
 {
    size_t num_primitives;
    switch (prim->mode) {




More information about the mesa-commit mailing list