diff options
| author | Francisco Jerez <[email protected]> | 2016-08-18 22:08:10 -0700 |
|---|---|---|
| committer | Francisco Jerez <[email protected]> | 2016-08-25 18:36:07 -0700 |
| commit | 49ea2bd17500cbe3cc5f39b59162eaae1278167d (patch) | |
| tree | acff17a0337366b660aa6b8e191542b84d569cb1 /src | |
| parent | 74e4baec59a5697ec2511733f16421bfd32f4145 (diff) | |
i965: Massage argument list of brw_emit_surface_state().
This commit does three different things in a single pass in order to
keep the amount of churn low: Remove the for_gather boolean argument
which was unused, pass the isl_view argument by value rather than by
reference since I'll have to modify it from within the function, and
add a target argument to allow callers to bind textures using a target
other than the original. The prototype of the function now looks
like:
void brw_emit_surface_state(struct brw_context *brw,
struct intel_mipmap_tree *mt,
GLenum target, struct isl_view view,
uint32_t mocs, uint32_t *surf_offset, int surf_index,
unsigned read_domains, unsigned write_domains);
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c index 2bafe9172f9..15ff1423453 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -75,11 +75,11 @@ static const struct surface_state_info surface_state_infos[] = { static void brw_emit_surface_state(struct brw_context *brw, struct intel_mipmap_tree *mt, - const struct isl_view *view, - uint32_t mocs, bool for_gather, - uint32_t *surf_offset, int surf_index, + GLenum target, struct isl_view view, + uint32_t mocs, uint32_t *surf_offset, int surf_index, unsigned read_domains, unsigned write_domains) { + assert(mt->target == target); const struct surface_state_info ss_info = surface_state_infos[brw->gen]; struct isl_surf surf; @@ -91,7 +91,7 @@ brw_emit_surface_state(struct brw_context *brw, uint64_t aux_offset = 0; enum isl_aux_usage aux_usage = ISL_AUX_USAGE_NONE; if (mt->mcs_mt && - ((view->usage & ISL_SURF_USAGE_RENDER_TARGET_BIT) || + ((view.usage & ISL_SURF_USAGE_RENDER_TARGET_BIT) || mt->fast_clear_state != INTEL_FAST_CLEAR_STATE_RESOLVED)) { intel_miptree_get_aux_isl_surf(brw, mt, &aux_surf_s, &aux_usage); aux_surf = &aux_surf_s; @@ -108,7 +108,7 @@ brw_emit_surface_state(struct brw_context *brw, ss_info.num_dwords * 4, ss_info.ss_align, surf_index, surf_offset); - isl_surf_fill_state(&brw->isl_dev, dw, .surf = &surf, .view = view, + isl_surf_fill_state(&brw->isl_dev, dw, .surf = &surf, .view = &view, .address = mt->bo->offset64 + mt->offset, .aux_surf = aux_surf, .aux_usage = aux_usage, .aux_address = aux_offset, @@ -174,8 +174,8 @@ brw_update_renderbuffer_surface(struct brw_context *brw, }; uint32_t offset; - brw_emit_surface_state(brw, mt, &view, - surface_state_infos[brw->gen].rb_mocs, false, + brw_emit_surface_state(brw, mt, mt->target, view, + surface_state_infos[brw->gen].rb_mocs, &offset, surf_index, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER); @@ -479,8 +479,8 @@ brw_update_texture_surface(struct gl_context *ctx, obj->Target == GL_TEXTURE_CUBE_MAP_ARRAY) view.usage |= ISL_SURF_USAGE_CUBE_BIT; - brw_emit_surface_state(brw, mt, &view, - surface_state_infos[brw->gen].tex_mocs, for_gather, + brw_emit_surface_state(brw, mt, mt->target, view, + surface_state_infos[brw->gen].tex_mocs, surf_offset, surf_index, I915_GEM_DOMAIN_SAMPLER, 0); } @@ -1515,8 +1515,8 @@ update_image_surface(struct brw_context *brw, const int surf_index = surf_offset - &brw->wm.base.surf_offset[0]; - brw_emit_surface_state(brw, mt, &view, - surface_state_infos[brw->gen].tex_mocs, false, + brw_emit_surface_state(brw, mt, mt->target, view, + surface_state_infos[brw->gen].tex_mocs, surf_offset, surf_index, I915_GEM_DOMAIN_SAMPLER, access == GL_READ_ONLY ? 0 : |