From ae799a4948ac1becb48568a274c2ada5d77aa07c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= <maraeo@gmail.com>
Date: Wed, 11 Apr 2012 15:56:59 +0200
Subject: [PATCH] u_vbuf: pull u_vbuf_draw_max_vertex_count into r300g

---
 src/gallium/auxiliary/util/u_vbuf.c    | 50 ---------------------------------
 src/gallium/auxiliary/util/u_vbuf.h    |  1 -
 src/gallium/drivers/r300/r300_render.c | 51 +++++++++++++++++++++++++++++++++-
 3 files changed, 50 insertions(+), 52 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_vbuf.c b/src/gallium/auxiliary/util/u_vbuf.c
index f0601bd..653f71e 100644
--- a/src/gallium/auxiliary/util/u_vbuf.c
+++ b/src/gallium/auxiliary/util/u_vbuf.c
@@ -859,56 +859,6 @@ u_vbuf_upload_buffers(struct u_vbuf_priv *mgr,
    }
 }
 
-unsigned u_vbuf_draw_max_vertex_count(struct u_vbuf *mgrb)
-{
-   struct u_vbuf_priv *mgr = (struct u_vbuf_priv*)mgrb;
-   unsigned i, nr = mgr->ve->count;
-   struct pipe_vertex_element *velems =
-         mgr->fallback_ve ? mgr->fallback_velems : mgr->ve->ve;
-   unsigned result = ~0;
-
-   for (i = 0; i < nr; i++) {
-      struct pipe_vertex_buffer *vb =
-            &mgr->real_vertex_buffer[velems[i].vertex_buffer_index];
-      unsigned size, max_count, value;
-
-      /* We're not interested in constant and per-instance attribs. */
-      if (!vb->buffer ||
-          !vb->stride ||
-          velems[i].instance_divisor) {
-         continue;
-      }
-
-      size = vb->buffer->width0;
-
-      /* Subtract buffer_offset. */
-      value = vb->buffer_offset;
-      if (value >= size) {
-         return 0;
-      }
-      size -= value;
-
-      /* Subtract src_offset. */
-      value = velems[i].src_offset;
-      if (value >= size) {
-         return 0;
-      }
-      size -= value;
-
-      /* Subtract format_size. */
-      value = mgr->ve->native_format_size[i];
-      if (value >= size) {
-         return 0;
-      }
-      size -= value;
-
-      /* Compute the max count. */
-      max_count = 1 + size / vb->stride;
-      result = MIN2(result, max_count);
-   }
-   return result;
-}
-
 static boolean u_vbuf_need_minmax_index(struct u_vbuf_priv *mgr)
 {
    unsigned i, nr = mgr->ve->count;
diff --git a/src/gallium/auxiliary/util/u_vbuf.h b/src/gallium/auxiliary/util/u_vbuf.h
index 1c05629..80983f7 100644
--- a/src/gallium/auxiliary/util/u_vbuf.h
+++ b/src/gallium/auxiliary/util/u_vbuf.h
@@ -90,6 +90,5 @@ u_vbuf_create(struct pipe_context *pipe,
 
 void u_vbuf_destroy(struct u_vbuf *mgr);
 
-unsigned u_vbuf_draw_max_vertex_count(struct u_vbuf *mgr);
 
 #endif
diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c
index d5ba4fa..830b0d9 100644
--- a/src/gallium/drivers/r300/r300_render.c
+++ b/src/gallium/drivers/r300/r300_render.c
@@ -740,6 +740,55 @@ static void r300_draw_elements_instanced(struct r300_context *r300,
         r300_draw_elements(r300, info, i);
 }
 
+static unsigned r300_max_vertex_count(struct r300_context *r300)
+{
+   unsigned i, nr = r300->velems->count;
+   struct pipe_vertex_element *velems = r300->velems->velem;
+   unsigned result = ~0;
+
+   for (i = 0; i < nr; i++) {
+      struct pipe_vertex_buffer *vb =
+            &r300->vertex_buffer[velems[i].vertex_buffer_index];
+      unsigned size, max_count, value;
+
+      /* We're not interested in constant and per-instance attribs. */
+      if (!vb->buffer ||
+          !vb->stride ||
+          velems[i].instance_divisor) {
+         continue;
+      }
+
+      size = vb->buffer->width0;
+
+      /* Subtract buffer_offset. */
+      value = vb->buffer_offset;
+      if (value >= size) {
+         return 0;
+      }
+      size -= value;
+
+      /* Subtract src_offset. */
+      value = velems[i].src_offset;
+      if (value >= size) {
+         return 0;
+      }
+      size -= value;
+
+      /* Subtract format_size. */
+      value = r300->velems->format_size[i];
+      if (value >= size) {
+         return 0;
+      }
+      size -= value;
+
+      /* Compute the max count. */
+      max_count = 1 + size / vb->stride;
+      result = MIN2(result, max_count);
+   }
+   return result;
+}
+
+
 static void r300_draw_vbo(struct pipe_context* pipe,
                           const struct pipe_draw_info *dinfo)
 {
@@ -757,7 +806,7 @@ static void r300_draw_vbo(struct pipe_context* pipe,
 
     /* Draw. */
     if (info.indexed) {
-        unsigned max_count = u_vbuf_draw_max_vertex_count(r300->vbuf_mgr);
+        unsigned max_count = r300_max_vertex_count(r300);
 
         if (!max_count) {
            fprintf(stderr, "r300: Skipping a draw command. There is a buffer "
-- 
2.7.4