-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 This series is huge, so I'm going to review it in batches. I've reviewed 01/37 through 10/37, inclusive. I'm sending replies with comments to 01/37 and 05/37. The rest look good and get my R-b.
On 08/15/2011 11:53 AM, Eric Anholt wrote: > From: Brian Paul <bri...@vmware.com> > > Several drivers have these fields in their subclasses of gl_texture_image. > They'll be useful for core Mesa too... > --- > src/mesa/main/mtypes.h | 2 ++ > src/mesa/main/teximage.c | 2 ++ > 2 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h > index 2d5f44c..12120a9 100644 > --- a/src/mesa/main/mtypes.h > +++ b/src/mesa/main/mtypes.h > @@ -1279,6 +1279,8 @@ struct gl_texture_image > GLboolean _IsPowerOfTwo; /**< Are all dimensions powers of two? */ > > struct gl_texture_object *TexObject; /**< Pointer back to parent object > */ > + GLuint Level; /**< Which mipmap level am I? */ > + GLuint Face; /**< Which cube face am I? */ Is Face a value [0,5] or is it one of the GL_TEXTURE_CUBE_MAP_*_* enums? If it's the later, then the field should be a GLenum for clarity. If it's the former, some description of the mapping (or a real enum) would be nice. > > FetchTexelFuncC FetchTexelc; /**< GLchan texel fetch function > pointer */ > FetchTexelFuncF FetchTexelf; /**< Float texel fetch function pointer > */ > diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c > index 27717cf..a005d29 100644 > --- a/src/mesa/main/teximage.c > +++ b/src/mesa/main/teximage.c > @@ -571,6 +571,8 @@ _mesa_set_tex_image(struct gl_texture_object *tObj, > > /* Set the 'back' pointer */ > texImage->TexObject = tObj; > + texImage->Level = level; > + texImage->Face = face; > } > > -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/ iEYEARECAAYFAk5JkwgACgkQX1gOwKyEAw+K/QCgnthKDXrC5ZbLVxViE75ZNBlz aWMAn3dnuDl1ZgvPbrirY9PJ5lmblWsT =BS1T -----END PGP SIGNATURE----- _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev