From 83e93b6008213ad86607027e8434ecaccc8b1a2c Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 18 Nov 2010 16:15:33 -0700 Subject: mesa: pass gl_format to _mesa_init_teximage_fields() This should prevent the field going unset in the future. See bug http://bugs.freedesktop.org/show_bug.cgi?id=31544 for background. Also remove unneeded calls to clear_teximage_fields(). Finally, call _mesa_set_fetch_functions() from the _mesa_init_teximage_fields() function so callers have one less thing to worry about. --- src/mesa/main/teximage.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/mesa/main/teximage.h') diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h index d4317c301b7..5bb9d492e93 100644 --- a/src/mesa/main/teximage.h +++ b/src/mesa/main/teximage.h @@ -33,6 +33,7 @@ #include "mtypes.h" +#include "formats.h" extern void * @@ -69,13 +70,13 @@ extern void _mesa_init_teximage_fields(struct gl_context *ctx, GLenum target, struct gl_texture_image *img, GLsizei width, GLsizei height, GLsizei depth, - GLint border, GLenum internalFormat); + GLint border, GLenum internalFormat, + gl_format format); -extern void +extern gl_format _mesa_choose_texture_format(struct gl_context *ctx, struct gl_texture_object *texObj, - struct gl_texture_image *texImage, GLenum target, GLint level, GLenum internalFormat, GLenum format, GLenum type); -- cgit v1.2.3