i965: GC the last two arguments to brw_cache_data.

Now that the binding table is streamed indirect state, they were
always NULL/0.
This commit is contained in:
Eric Anholt 2010-06-09 17:19:40 -07:00
parent 309c011641
commit 8ad3fdc967
7 changed files with 12 additions and 22 deletions

View file

@ -55,8 +55,7 @@ brw_update_cc_vp(struct brw_context *brw)
}
drm_intel_bo_unreference(brw->cc.vp_bo);
brw->cc.vp_bo = brw_cache_data(&brw->cache, BRW_CC_VP, &ccv, sizeof(ccv),
NULL, 0);
brw->cc.vp_bo = brw_cache_data(&brw->cache, BRW_CC_VP, &ccv, sizeof(ccv));
}
struct brw_cc_unit_key {

View file

@ -105,8 +105,7 @@ static void upload_sf_vp(struct brw_context *brw)
}
drm_intel_bo_unreference(brw->sf.vp_bo);
brw->sf.vp_bo = brw_cache_data(&brw->cache, BRW_SF_VP, &sfv, sizeof(sfv),
NULL, 0);
brw->sf.vp_bo = brw_cache_data(&brw->cache, BRW_SF_VP, &sfv, sizeof(sfv));
}
const struct brw_tracked_state brw_sf_vp = {

View file

@ -139,9 +139,7 @@ void brw_clear_validated_bos(struct brw_context *brw);
drm_intel_bo *brw_cache_data(struct brw_cache *cache,
enum brw_cache_id cache_id,
const void *data,
GLuint size,
drm_intel_bo **reloc_bufs,
GLuint nr_reloc_bufs);
GLuint size);
drm_intel_bo *brw_upload_cache(struct brw_cache *cache,
enum brw_cache_id cache_id,

View file

@ -310,9 +310,7 @@ drm_intel_bo *
brw_cache_data(struct brw_cache *cache,
enum brw_cache_id cache_id,
const void *data,
GLuint data_size,
drm_intel_bo **reloc_bufs,
GLuint nr_reloc_bufs)
GLuint data_size)
{
drm_intel_bo *bo;
struct brw_cache_item *item, lookup;
@ -321,8 +319,8 @@ brw_cache_data(struct brw_cache *cache,
lookup.cache_id = cache_id;
lookup.key = data;
lookup.key_size = data_size;
lookup.reloc_bufs = reloc_bufs;
lookup.nr_reloc_bufs = nr_reloc_bufs;
lookup.reloc_bufs = NULL;
lookup.nr_reloc_bufs = 0;
hash = hash_key(&lookup);
lookup.hash = hash;
@ -335,7 +333,7 @@ brw_cache_data(struct brw_cache *cache,
bo = brw_upload_cache(cache, cache_id,
data, data_size,
reloc_bufs, nr_reloc_bufs,
NULL, 0,
data, data_size);
return bo;

View file

@ -74,7 +74,7 @@ static drm_intel_bo *upload_default_color( struct brw_context *brw,
COPY_4V(sdc.color, color);
return brw_cache_data(&brw->cache, BRW_SAMPLER_DEFAULT_COLOR,
&sdc, sizeof(sdc), NULL, 0);
&sdc, sizeof(sdc));
}

View file

@ -63,8 +63,7 @@ prepare_scissor_state(struct brw_context *brw)
drm_intel_bo_unreference(brw->sf.state_bo);
brw->sf.state_bo = brw_cache_data(&brw->cache, BRW_SF_UNIT,
&scissor, sizeof(scissor),
NULL, 0);
&scissor, sizeof(scissor));
}
const struct brw_tracked_state gen6_scissor_state = {

View file

@ -51,8 +51,7 @@ prepare_clip_vp(struct brw_context *brw)
drm_intel_bo_unreference(brw->clip.vp_bo);
brw->clip.vp_bo = brw_cache_data(&brw->cache, BRW_CLIP_VP,
&vp, sizeof(vp),
NULL, 0);
&vp, sizeof(vp));
}
const struct brw_tracked_state gen6_clip_vp = {
@ -95,8 +94,7 @@ prepare_sf_vp(struct brw_context *brw)
drm_intel_bo_unreference(brw->sf.vp_bo);
brw->sf.vp_bo = brw_cache_data(&brw->cache, BRW_SF_VP,
&sfv, sizeof(sfv),
NULL, 0);
&sfv, sizeof(sfv));
}
const struct brw_tracked_state gen6_sf_vp = {
@ -125,8 +123,7 @@ prepare_cc_vp(struct brw_context *brw)
}
drm_intel_bo_unreference(brw->cc.vp_bo);
brw->cc.vp_bo = brw_cache_data(&brw->cache, BRW_CC_VP, &ccv, sizeof(ccv),
NULL, 0);
brw->cc.vp_bo = brw_cache_data(&brw->cache, BRW_CC_VP, &ccv, sizeof(ccv));
}
const struct brw_tracked_state gen6_cc_vp = {