diff options
| author | Kenneth Graunke <[email protected]> | 2011-05-14 23:42:46 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2011-05-17 23:32:58 -0700 |
| commit | d55471768e308853432de7d18f663034ddbc8599 (patch) | |
| tree | eada3d070ee3c4944d0a52059c98a3aa71e54ce6 /src/mesa | |
| parent | d0f0d064825c457964614bee8fedcf31526a0775 (diff) | |
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 <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.h | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_urb.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index db6466ff1ae..a4e22776c0c 100644 --- 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 12aae507473..94108de7af9 100644 --- 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 909e1bbe9ba..62645a6a30f 100644 --- 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); |