From: Brian Paul Date: Fri, 15 Jul 2011 02:57:34 +0000 (-0600) Subject: mesa: add gl_texture_image::Face, Level fields X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a231d245514b43cf547ccb996b68efc0186e6821;p=mesa.git mesa: add gl_texture_image::Face, Level fields Several drivers have these fields in their subclasses of gl_texture_image. They'll be useful for core Mesa too... Reviewed-by: Ian Romanick --- diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 8b3650321db..f2eb889feb4 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1279,6 +1279,9 @@ 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? */ + /** Cube map face: index into gl_texture_object::Image[] array */ + GLuint Face; 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 27717cfb0f5..a005d2935fa 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; }