diff options
| author | Kenneth Graunke <[email protected]> | 2013-07-02 15:06:10 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2013-07-03 10:48:15 -0700 |
| commit | 466aa712b695010371228f6032bbed210ca206b2 (patch) | |
| tree | 661263dbb644f74d41e608fbe30d80815e3293f0 /src/mesa/drivers | |
| parent | c4c3c0dc940fb021cef237451b50fb762a97f792 (diff) | |
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 <[email protected]>
Reviewed-by: Chad Versace <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_tex_layout.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_tex_layout.c b/src/mesa/drivers/dri/i965/brw_tex_layout.c index 6fe43981fbf..f4029c431ab 100644 --- a/src/mesa/drivers/dri/i965/brw_tex_layout.c +++ b/src/mesa/drivers/dri/i965/brw_tex_layout.c @@ -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) { diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index e9b2464b665..bebfe511bb4 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -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; |