i965: Push intel_get_texture_alignment_unit call into brw_miptree_layout

intel_miptree_create_layout() calls intel_get_texture_alignment_unit()
and then immediately calls brw_miptree_layout().  There are no other
callers.

intel_get_texture_alignment_unit() populates the miptree's alignment
unit fields, which are used by brw_miptree_layout() to determine where
to place each miplevel.  Since brw_miptree_layout() needs those to be
present, it makes sense to have it initialize them as the first step.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
This commit is contained in:
Kenneth Graunke 2013-07-02 15:06:10 -07:00
parent c4c3c0dc94
commit 466aa712b6
2 changed files with 3 additions and 3 deletions

View file

@ -212,6 +212,9 @@ brw_miptree_layout_texture_3d(struct intel_context *intel,
void
brw_miptree_layout(struct intel_context *intel, struct intel_mipmap_tree *mt)
{
intel_get_texture_alignment_unit(intel, mt->format,
&mt->align_w, &mt->align_h);
switch (mt->target) {
case GL_TEXTURE_CUBE_MAP:
if (intel->gen == 4) {

View file

@ -400,9 +400,6 @@ intel_miptree_create_layout(struct intel_context *intel,
}
}
intel_get_texture_alignment_unit(intel, mt->format,
&mt->align_w, &mt->align_h);
brw_miptree_layout(intel, mt);
return mt;