diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-06-07 16:51:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-06-07 16:51:32 +1000 |
| commit | 545e574cd9a2a659cd9a93879dff8884bd247558 (patch) | |
| tree | f56d65eaa851edfb1248a6fc8ac0bae4cc98eff5 /src/mesa/drivers/dri/intel/intel_mipmap_tree.h | |
| parent | e2aedfa62079ff1a333e1f4e56faea303cc36edb (diff) | |
| parent | f1edfa09ea50e8833ddbf241da4d36fd38685e9d (diff) | |
Merge remote branch 'origin/master' into radeon-rewrite
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_mipmap_tree.h')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_mipmap_tree.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.h b/src/mesa/drivers/dri/intel/intel_mipmap_tree.h index 4060b9df78..3af9966827 100644 --- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.h +++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.h @@ -148,6 +148,7 @@ intel_miptree_create_for_region(struct intel_context *intel, int intel_miptree_pitch_align (struct intel_context *intel, struct intel_mipmap_tree *mt, + uint32_t tiling, int pitch); void intel_miptree_reference(struct intel_mipmap_tree **dst, @@ -218,10 +219,13 @@ void intel_miptree_image_copy(struct intel_context *intel, /* i915_mipmap_tree.c: */ GLboolean i915_miptree_layout(struct intel_context *intel, - struct intel_mipmap_tree *mt); + struct intel_mipmap_tree *mt, + uint32_t tiling); GLboolean i945_miptree_layout(struct intel_context *intel, - struct intel_mipmap_tree *mt); + struct intel_mipmap_tree *mt, + uint32_t tiling); GLboolean brw_miptree_layout(struct intel_context *intel, - struct intel_mipmap_tree *mt); + struct intel_mipmap_tree *mt, + uint32_t tiling); #endif |