summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-09-28 21:55:47 -0600
committerBrian Paul <brianp@vmware.com>2009-09-28 21:55:47 -0600
commite2e7bd6c1f979179e6840cf0e8db72fc72751650 (patch)
treec874886b2d5d31f52de100f844880a83e4b88535
parent0a306daf71588fc4ccfdc14450f8cd4ce00f9833 (diff)
mesa: move StoreTexImageFunc typedef to .c file
-rw-r--r--src/mesa/main/texstore.c8
-rw-r--r--src/mesa/main/texstore.h14
2 files changed, 9 insertions, 13 deletions
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index e8c3e23b5b..ca298bb237 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -77,6 +77,12 @@ enum {
/**
+ * Texture image storage function.
+ */
+typedef GLboolean (*StoreTexImageFunc)(TEXSTORE_PARAMS);
+
+
+/**
* Return GL_TRUE if the given image format is one that be converted
* to another format by swizzling.
*/
@@ -3250,7 +3256,7 @@ texstore_funcs[MESA_FORMAT_COUNT] =
/**
* Return the StoreTexImageFunc pointer to store an image in the given format.
*/
-StoreTexImageFunc
+static StoreTexImageFunc
_mesa_get_texstore_func(gl_format format)
{
GLuint i;
diff --git a/src/mesa/main/texstore.h b/src/mesa/main/texstore.h
index ad4773533e..4a217df103 100644
--- a/src/mesa/main/texstore.h
+++ b/src/mesa/main/texstore.h
@@ -68,11 +68,8 @@
const struct gl_pixelstore_attrib *srcPacking
-
-/**
- * Texture image storage function.
- */
-typedef GLboolean (*StoreTexImageFunc)(TEXSTORE_PARAMS);
+extern GLboolean
+_mesa_texstore(TEXSTORE_PARAMS);
extern GLchan *
@@ -148,13 +145,6 @@ _mesa_store_texsubimage3d(GLcontext *ctx, GLenum target, GLint level,
struct gl_texture_image *texImage);
-extern StoreTexImageFunc
-_mesa_get_texstore_func(gl_format format);
-
-extern GLboolean
-_mesa_texstore(TEXSTORE_PARAMS);
-
-
extern void
_mesa_store_compressed_teximage1d(GLcontext *ctx, GLenum target, GLint level,
GLint internalFormat,