vbo/i965: move vbo_all_varyings_in_vbos() to brw_draw.c

It's only used in brw_draw_prims().

s/GLboolean/bool/, etc.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>

diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
index dec7b29be9c115c96e0054cda0a636b4a515d085..c94fc55e57c597e75162b9ed47800685f3ad15a6 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -906,6 +906,22 @@ retry:
    return;
 }
 
+
+static bool
+all_varyings_in_vbos(const struct gl_vertex_array *arrays[])
+{
+   GLuint i;
+
+   for (i = 0; i < VERT_ATTRIB_MAX; i++)
+      if (arrays[i]->StrideB &&
+          arrays[i]->BufferObj->Name == 0)
+         return false;
+
+   return true;
+}
+
+
+
 void
 brw_draw_prims(struct gl_context *ctx,
                const struct _mesa_prim *prims,
@@ -951,7 +967,7 @@ brw_draw_prims(struct gl_context *ctx,
     * get the minimum and maximum of their index buffer so we know what range
     * to upload.
     */
-   if (!index_bounds_valid && !vbo_all_varyings_in_vbos(arrays)) {
+   if (!index_bounds_valid && !all_varyings_in_vbos(arrays)) {
       perf_debug("Scanning index buffer to compute index buffer bounds.  "
                  "Use glDrawRangeElements() to avoid this.\n");
       vbo_get_minmax_indices(ctx, prims, ib, &min_index, &max_index, nr_prims);

diff --git a/src/mesa/vbo/vbo.h b/src/mesa/vbo/vbo.h
index 0007029996c5bfd5e2e91a91e8d1b35e803c7577..30c83fc1a2679e81b030bbf805617d45b012b6b6 100644 (file)
--- a/src/mesa/vbo/vbo.h
+++ b/src/mesa/vbo/vbo.h
@@ -153,8 +153,6 @@ void vbo_split_prims( struct gl_context *ctx,
                      const struct split_limits *limits );
 
 
-GLboolean vbo_all_varyings_in_vbos( const struct gl_vertex_array *arrays[] );
-
 void vbo_rebase_prims( struct gl_context *ctx,
                       const struct gl_vertex_array *arrays[],
                       const struct _mesa_prim *prim,

diff --git a/src/mesa/vbo/vbo_rebase.c b/src/mesa/vbo/vbo_rebase.c
index a9d8ff93e93cae9f5b83f29fe60f8a568ba325da..02dbc68dcb509ee8fdae9226ea301586dc1458a3 100644 (file)
--- a/src/mesa/vbo/vbo_rebase.c
+++ b/src/mesa/vbo/vbo_rebase.c
@@ -79,17 +79,6 @@ REBASE(GLuint)
 REBASE(GLushort)
 REBASE(GLubyte)
 
-GLboolean vbo_all_varyings_in_vbos( const struct gl_vertex_array *arrays[] )
-{
-   GLuint i;
-   
-   for (i = 0; i < VERT_ATTRIB_MAX; i++)
-      if (arrays[i]->StrideB &&
-         arrays[i]->BufferObj->Name == 0)
-        return GL_FALSE;
-
-   return GL_TRUE;
-}
 
 
 /* Adjust primitives, indices and vertex definitions so that min_index