On Fri, 10 Jun 2011 18:10:13 -0700, Ian Romanick <i...@freedesktop.org> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 06/10/2011 01:38 PM, Eric Anholt wrote:
> > ---
> > src/mesa/drivers/dri/intel/intel_tex_layout.c | 4 ++--
> > 1 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/src/mesa/drivers/dri/intel/intel_tex_layout.c
> > b/src/mesa/drivers/dri/intel/intel_tex_layout.c
> > index 7493b42..2002777 100644
> > --- a/src/mesa/drivers/dri/intel/intel_tex_layout.c
> > +++ b/src/mesa/drivers/dri/intel/intel_tex_layout.c
> > @@ -57,7 +57,7 @@ void i945_miptree_layout_2d(struct intel_context *intel,
> > struct intel_mipmap_tree *mt,
> > uint32_t tiling, int nr_images)
> > {
> > - GLuint align_h = 2, align_w = 4;
> > + GLuint align_h, align_w;
> > GLuint level;
> > GLuint x = 0;
> > GLuint y = 0;
> > @@ -101,7 +101,7 @@ void i945_miptree_layout_2d(struct intel_context *intel,
> > height, 1);
> >
> > if (mt->compressed)
> > - img_height = MAX2(1, height/4);
> > + img_height = MAX2(1, height + 3/4);
>
> Is this hunk accidental or just missing from the commit message? I'm
> guessing the later.Accidental -- the correct fix (without the obvious bug) appears in the next commit.
pgpjFKedI1ZHY.pgp
Description: PGP signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
