i965: Rename max_vs_handles to max_vs_entries for consistency.

The documentation uses the term "vertex URB entries", the code talks
about "entry size", and so on.  Also, handles are just "pointers" to
entries (actually small integers).

Also rename max_gs_handles to max_gs_entries.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index db6466ff1ae2fc2ece2d19b06a3abbdba2b5be92..a4e22776c0c929a4b90aef74e1f6817b17c77a2a 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -187,12 +187,12 @@ GLboolean brwCreateContext( int api,
         brw->wm_max_threads = 40;
         brw->vs_max_threads = 60;
         brw->urb.size = 64;            /* volume 5c.5 section 5.1 */
-        brw->urb.max_vs_handles = 128; /* volume 2a (see 3DSTATE_URB) */
+        brw->urb.max_vs_entries = 128; /* volume 2a (see 3DSTATE_URB) */
       } else {
         brw->wm_max_threads = 40;
         brw->vs_max_threads = 24;
         brw->urb.size = 32;            /* volume 5c.5 section 5.1 */
-        brw->urb.max_vs_handles = 256; /* volume 2a (see 3DSTATE_URB) */
+        brw->urb.max_vs_entries = 256; /* volume 2a (see 3DSTATE_URB) */
       }
    } else if (intel->gen == 5) {
       brw->urb.size = 1024;

diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index 12aae5074739cdd3fa466a1e3901c79729466a85..94108de7af95be3fcca92fcde0b045f9f02d1aa8 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -591,8 +591,8 @@ struct brw_context
 
       GLboolean constrained;
 
-      GLuint max_vs_handles;   /* Maximum number of VS handles */
-      GLuint max_gs_handles;   /* Maximum number of GS handles */
+      GLuint max_vs_entries;   /* Maximum number of VS entries */
+      GLuint max_gs_entries;   /* Maximum number of GS entries */
 
       GLuint nr_vs_entries;
       GLuint nr_gs_entries;

diff --git a/src/mesa/drivers/dri/i965/gen6_urb.c b/src/mesa/drivers/dri/i965/gen6_urb.c
index 909e1bbe9ba8b5e85492adcee0ab068d8c131caa..62645a6a30f64c9824783a3ad1aea0cf0c66c852 100644 (file)
--- a/src/mesa/drivers/dri/i965/gen6_urb.c
+++ b/src/mesa/drivers/dri/i965/gen6_urb.c
@@ -42,8 +42,8 @@ prepare_urb( struct brw_context *brw )
    /* Calculate how many VS URB entries fit in the total URB size */
    nr_vs_entries = (brw->urb.size * 1024) / (brw->urb.vs_size * 128);
 
-   if (nr_vs_entries > brw->urb.max_vs_handles)
-      nr_vs_entries = brw->urb.max_vs_handles;
+   if (nr_vs_entries > brw->urb.max_vs_entries)
+      nr_vs_entries = brw->urb.max_vs_entries;
 
    /* According to volume 2a, nr_vs_entries must be a multiple of 4. */
    brw->urb.nr_vs_entries = ROUND_DOWN_TO(nr_vs_entries, 4);